Update app.py

app.py

@@ -1830,37 +1830,23 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
     print("matched_indices=========================>",matched_indices)
     for matched_idx in matched_indices:
         matched_image_path = paths_list[matched_idx]
-        # matched_folder = os.path.dirname(matched_image_path)
-        # matched_filename = os.path.basename(matched_image_path)
-        # matched_image_path = paths_list[matched_idx]
-        # # Normalize Windows-style backslashes to the platform separator, then normpath
-        # matched_image_path = os.path.normpath(str(matched_image_path).replace('\\', os.sep))
-        # matched_folder = os.path.dirname(matched_image_path)
-        # matched_filename = os.path.basename(matched_image_path)
-        mp = str(matched_image_path).replace('\\', os.sep)           # convert Windows backslashes -> platform sep
-        if not os.path.isabs(mp):
-            mp = os.path.normpath(os.path.join(str(BLOCKS_DIR), mp))  # turn relative -> absolute under BLOCKS_DIR
-        else:
-            mp = os.path.normpath(mp)                                 # already absolute: just normalize
-        
-        matched_image_path = os.path.abspath(mp)   # final absolute path
         matched_folder = os.path.dirname(matched_image_path)
         matched_filename = os.path.basename(matched_image_path)
-        print("NORM matched_image_path:", matched_image_path, " matched_folder:", matched_folder)
+        # --- Minimal diagnostics (drop these in prod) ---
         try:
             # Normalize many forms so we can compare apples-to-apples
             mf_abs = os.path.normpath(os.path.abspath(matched_folder))
             mf_repr = repr(matched_folder)
             mf_abspath_repr = repr(mf_abs)
-        
+
             # backdrop / sprite base (may be pathlib.Path in prod)
             bb = os.path.normpath(os.path.abspath(str(backdrop_base_path)))
             sb = os.path.normpath(os.path.abspath(str(sprite_base_path)))
-        
+
             # quick membership tests
             starts_with_backdrop = matched_folder.startswith(backdrop_base_path) or mf_abs.startswith(bb)
             starts_with_sprite = matched_folder.startswith(sprite_base_path) or mf_abs.startswith(sb)
-        
+
             # cross-platform commonpath test
             try:
                 common_with_backdrop = (os.path.commonpath([mf_abs, bb]) == bb)
@@ -1870,7 +1856,7 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
                 common_with_sprite = (os.path.commonpath([mf_abs, sb]) == sb)
             except Exception:
                 common_with_sprite = False
-        
+
             print("DEBUG matched_idx:", matched_idx)
             print("DEBUG matched_image_path:", matched_image_path)
             print("DEBUG matched_folder (raw):", mf_repr)
@@ -1885,94 +1871,32 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
             print("DEBUG sample paths_list entry:", repr(paths_list[matched_idx])[:400])
         except Exception as _e:
             print("DEBUG diagnostics failed:", _e)
-
+        # --- end diagnostics ---
         # If it's a sprite (under SPRITE_DIR) -> copy sprite assets and read sprite.json
         # if matched_folder.startswith(sprite_base_path) and matched_folder not in copied_sprite_folders:
-        # if is_subpath(matched_folder, sprite_base_path) and matched_folder not in copied_sprite_folders:
-        #     copied_sprite_folders.add(matched_folder)
-        #     sprite_json_path = os.path.join(matched_folder, "sprite.json")
-        #     if os.path.exists(sprite_json_path):
-        #         try:
-        #             with open(sprite_json_path, "r", encoding="utf-8") as f:
-        #                 sprite_info = json.load(f)
-        #             project_data.append(sprite_info)
-        #         except Exception as e:
-        #             print("Failed to read sprite.json in %s: %s", matched_folder, e)
-        #     else:
-        #         print("No sprite.json in %s", matched_folder)
-        #     # copy non-matching files from the sprite folder (except the matched image and sprite.json)
-        #     for fname in os.listdir(matched_folder):
-        #         if fname in (matched_filename, "sprite.json"):
-        #             continue
-        #         src = os.path.join(matched_folder, fname)
-        #         dst = os.path.join(project_folder, fname)
-        #         if os.path.isfile(src):
-        #             try:
-        #                 shutil.copy2(src, dst)
-        #             except Exception as e:
-        #                 print("Failed to copy sprite asset %s: %s", src, e)
         if is_subpath(matched_folder, sprite_base_path) and matched_folder not in copied_sprite_folders:
             copied_sprite_folders.add(matched_folder)
             sprite_json_path = os.path.join(matched_folder, "sprite.json")
-        
-            # Debug: existence & listing
-            try:
-                exists = os.path.exists(matched_folder)
-                entries = os.listdir(matched_folder) if exists else []
-            except Exception as e:
-                exists = False
-                entries = []
-                print(f"DEBUG: cannot list '{matched_folder}': {e}")
-        
-            print(f"DEBUG: processing sprite folder: {matched_folder}  exists={exists}  entries_count={len(entries)}")
-            if len(entries) > 0:
-                print("DEBUG: sample entries:", entries[:20])
-        
-            # Read sprite.json if present
             if os.path.exists(sprite_json_path):
                 try:
                     with open(sprite_json_path, "r", encoding="utf-8") as f:
                         sprite_info = json.load(f)
                     project_data.append(sprite_info)
-                    print(f"DEBUG: loaded sprite.json from {sprite_json_path}")
                 except Exception as e:
-                    print(f"DEBUG: Failed to read sprite.json in {matched_folder}: {e}")
+                    print("Failed to read sprite.json in %s: %s", matched_folder, e)
             else:
-                print(f"DEBUG: No sprite.json in {matched_folder}")
-        
-            # Recursively copy everything under matched_folder (preserve structure) EXCEPT matched image and sprite.json
-            dst_base = os.path.join(project_folder, os.path.basename(matched_folder))
-            os.makedirs(dst_base, exist_ok=True)
-        
-            copied_count = 0
-            for root, dirs, files in os.walk(matched_folder):
-                rel = os.path.relpath(root, matched_folder)
-                dest_dir = dst_base if rel == "." else os.path.join(dst_base, rel)
-                os.makedirs(dest_dir, exist_ok=True)
-                for fname in files:
-                    if fname in (matched_filename, "sprite.json"):
-                        continue
-                    src = os.path.join(root, fname)
-                    dst = os.path.join(dest_dir, fname)
+                print("No sprite.json in %s", matched_folder)
+            # copy non-matching files from the sprite folder (except the matched image and sprite.json)
+            for fname in os.listdir(matched_folder):
+                if fname in (matched_filename, "sprite.json"):
+                    continue
+                src = os.path.join(matched_folder, fname)
+                dst = os.path.join(project_folder, fname)
+                if os.path.isfile(src):
                     try:
                         shutil.copy2(src, dst)
-                        copied_count += 1
                     except Exception as e:
-                        print(f"DEBUG: Failed to copy sprite asset {src} -> {dst}: {e}")
-        
-            print(f"DEBUG: copied {copied_count} asset files from sprite folder {matched_folder} -> {dst_base}")
-        
-            # Fallback: if nothing was copied, copy the matched image (at least)
-            if copied_count == 0:
-                try:
-                    src_img = os.path.join(matched_folder, matched_filename)
-                    if os.path.exists(src_img):
-                        shutil.copy2(src_img, os.path.join(project_folder, matched_filename))
-                        print(f"DEBUG: fallback copied matched sprite image to project root: {matched_filename}")
-                    else:
-                        print(f"DEBUG: fallback: matched image not found at {src_img}")
-                except Exception as e:
-                    print(f"DEBUG: fallback copy failed for {matched_filename}: {e}")
+                        print("Failed to copy sprite asset %s: %s", src, e)
 
         # If it's a backdrop (under BACKDROP_DIR) -> copy backdrop assets and read project.json for stage
         # if matched_folder.startswith(backdrop_base_path) and matched_folder not in copied_backdrop_folders: