Update app_main.py

app_main.py

@@ -317,12 +317,12 @@ def similarity_matching(input_json_path: str) -> str:
     # # ========================================= #
     # #  Walk folders to collect all image paths  #
     # # ========================================= #
-    # folder_image_paths = []
-    # for image_dir in image_dirs:
-    #     for root, _, files in os.walk(image_dir):
-    #         for fname in files:
-    #             if fname.lower().endswith((".png", ".jpg", ".jpeg")):
-    #                 folder_image_paths.append(os.path.join(root, fname))
+    folder_image_paths = []
+    for image_dir in image_dirs:
+        for root, _, files in os.walk(image_dir):
+            for fname in files:
+                if fname.lower().endswith((".png", ".jpg", ".jpeg")):
+                    folder_image_paths.append(os.path.join(root, fname))
 
     # # ============================== #
     # #   EMBED FOLDER IMAGES (REF)    #
@@ -377,43 +377,115 @@ def similarity_matching(input_json_path: str) -> str:
     most_similar_indices = np.argmax(similarity, axis=1)
 
     # ============= Match and copy ================
-    project_data, backdrop_data = [], []
+    project_data = []
     copied_folders = set()
-    start_time = time.perf_counter()
+
+    # =============================================================== #
+    #   Loop through most similar images from Sprites folder          #
+    #   → Copy sprite assets (excluding matched image + sprite.json)  #
+    #   → Load sprite.json and append its data to project_data        #
+    # =============================================================== #
     for sprite_idx, matched_idx in enumerate(most_similar_indices):
-        matched_entry = embedding_json[matched_idx]
-        # matched_image_path = os.path.normpath(folder_image_paths[matched_idx])
-        matched_image_path = os.path.normpath(matched_entry["file-path"])
+        matched_image_path = folder_image_paths[matched_idx]
+        matched_image_path = os.path.normpath(matched_image_path)
+
         matched_folder = os.path.dirname(matched_image_path)
+        folder_name = os.path.basename(matched_folder)
+
         if matched_folder in copied_folders:
             continue
         copied_folders.add(matched_folder)
+        logger.info(f"Matched image path: {matched_image_path}")
 
-        # Sprite
         sprite_json_path = os.path.join(matched_folder, 'sprite.json')
-        if os.path.exists(sprite_json_path):
-            with open(sprite_json_path, 'r') as f:
-                sprite_data = json.load(f)
-                project_data.append(sprite_data)
+        if not os.path.exists(sprite_json_path):
+            logger.warning(f"sprite.json not found in: {matched_folder}")
+            continue
 
-            for fname in os.listdir(matched_folder):
-                if fname not in {os.path.basename(matched_image_path), 'sprite.json'}:
-                    shutil.copy2(os.path.join(
-                        matched_folder, fname), project_folder)
+        with open(sprite_json_path, 'r') as f:
+            sprite_data = json.load(f)
+            print(f"SPRITE DATA: \n{sprite_data}")
+        # Copy only non-matched files
+        for fname in os.listdir(matched_folder):
+            fpath = os.path.join(matched_folder, fname)
+            if os.path.isfile(fpath) and fname not in {os.path.basename(matched_image_path), 'sprite.json'}:
+                shutil.copy2(fpath, os.path.join(project_folder, fname))
+                logger.info(f"Copied Sprite asset: {fname}")
+        project_data.append(sprite_data)
+        
+    # ================================================================== #
+    #   Loop through most similar images from Backdrops folder           #
+    #   → Copy Backdrop assets (excluding matched image + project.json)  #
+    #   → Load project.json and append its data to project_data          #
+    # ================================================================== #
+    backdrop_data = []  # for backdrop-related entries
+
+    for backdrop_idx, matched_idx in enumerate(most_similar_indices):
+        matched_image_path = os.path.normpath(folder_image_paths[matched_idx])
 
-        # Backdrop
+        # Check if the match is from the Backdrops folder
         if matched_image_path.startswith(os.path.normpath(backdrop_images_path)):
+            matched_folder = os.path.dirname(matched_image_path)
+            folder_name = os.path.basename(matched_folder)
+
+            logger.info(f"Backdrop matched image: {matched_image_path}")
+
+            # Copy only non-matched files
+            for fname in os.listdir(matched_folder):
+                fpath = os.path.join(matched_folder, fname)
+                if os.path.isfile(fpath) and fname not in {os.path.basename(matched_image_path), 'project.json'}:
+                    shutil.copy2(fpath, os.path.join(project_folder, fname))
+                    logger.info(f"Copied Backdrop asset: {fname}")
+
+            # Append backdrop's project.json
             backdrop_json_path = os.path.join(matched_folder, 'project.json')
             if os.path.exists(backdrop_json_path):
                 with open(backdrop_json_path, 'r') as f:
                     backdrop_json_data = json.load(f)
-                for target in backdrop_json_data.get("targets", []):
-                    if target.get("isStage"):
-                        backdrop_data.append(target)
-                for fname in os.listdir(matched_folder):
-                    if fname not in {os.path.basename(matched_image_path), 'project.json'}:
-                        shutil.copy2(os.path.join(
-                            matched_folder, fname), project_folder)
+                    print(f"SPRITE DATA: \n{backdrop_json_data}")
+                if "targets" in backdrop_json_data:
+                    for target in backdrop_json_data["targets"]:
+                        if target.get("isStage") == True:
+                            backdrop_data.append(target)
+            else:
+                logger.warning(f"project.json not found in: {matched_folder}")
+    # project_data, backdrop_data = [], []
+    # copied_folders = set()
+    # start_time = time.perf_counter()
+    # for sprite_idx, matched_idx in enumerate(most_similar_indices):
+    #     matched_entry = embedding_json[matched_idx]
+    #     # matched_image_path = os.path.normpath(folder_image_paths[matched_idx])
+    #     matched_image_path = os.path.normpath(matched_entry["file-path"])
+    #     matched_folder = os.path.dirname(matched_image_path)
+    #     if matched_folder in copied_folders:
+    #         continue
+    #     copied_folders.add(matched_folder)
+
+    #     # Sprite
+    #     sprite_json_path = os.path.join(matched_folder, 'sprite.json')
+    #     if os.path.exists(sprite_json_path):
+    #         with open(sprite_json_path, 'r') as f:
+    #             sprite_data = json.load(f)
+    #             project_data.append(sprite_data)
+
+    #         for fname in os.listdir(matched_folder):
+    #             if fname not in {os.path.basename(matched_image_path), 'sprite.json'}:
+    #                 shutil.copy2(os.path.join(
+    #                     matched_folder, fname), project_folder)
+
+    #     # Backdrop
+    #     if matched_image_path.startswith(os.path.normpath(backdrop_images_path)):
+    #         backdrop_json_path = os.path.join(matched_folder, 'project.json')
+    #         if os.path.exists(backdrop_json_path):
+    #             with open(backdrop_json_path, 'r') as f:
+    #                 backdrop_json_data = json.load(f)
+    #             for target in backdrop_json_data.get("targets", []):
+    #                 if target.get("isStage"):
+    #                     backdrop_data.append(target)
+    #             for fname in os.listdir(matched_folder):
+    #                 if fname not in {os.path.basename(matched_image_path), 'project.json'}:
+    #                     shutil.copy2(os.path.join(
+    #                         matched_folder, fname), project_folder)
 
     # Merge JSON structure
     final_project = {