Update app.py

app.py

@@ -1932,72 +1932,92 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
     #             print(f"  ⚠ No project.json in {matched_folder}")
     
     #     print("---")
-    # add at top of file
+        # add at top of file
+    import shutil
+    import json
+    import os
     from pathlib import Path
     
-    # ensure base paths are normalized once before the loop
+    # normalize base paths once before the loop
     sprite_base_p = Path(sprite_base_path).resolve(strict=False)
     backdrop_base_p = Path(backdrop_base_path).resolve(strict=False)
     project_folder_p = Path(project_folder)
     project_folder_p.mkdir(parents=True, exist_ok=True)
     
-    # convert copied sets to use resolved strings
     copied_sprite_folders = set()
     copied_backdrop_folders = set()
     
+    def display_like_windows_no_lead(p: Path) -> str:
+        """
+        For human-readable logs only — convert Path to a string like:
+        "app\\blocks\\Backdrops\\Castle 2.sb3" (no leading slash).
+        """
+        s = p.as_posix()           # forward-slash string, safe for Path objects
+        if s.startswith("/"):
+            s = s[1:]
+        return s.replace("/", "\\")
+    
+    def is_subpath(child: Path, parent: Path) -> bool:
+        """Robust membership test: is child under parent?"""
+        try:
+            # use non-strict resolve only if needed, but avoid exceptions
+            child.relative_to(parent)
+            return True
+        except Exception:
+            return False
+    
+    # Flatten unique matched indices (if not already)
+    matched_indices = sorted({idx for lst in per_sprite_matched_indices for idx in lst})
+    print("matched_indices------------------>", matched_indices)
+    
     for matched_idx in matched_indices:
+        # defensive check
+        if not (0 <= matched_idx < len(paths_list)):
+            print(f"  ⚠ matched_idx {matched_idx} out of range, skipping")
+            continue
+    
         matched_image_path = paths_list[matched_idx]
-        matched_path_p = Path(matched_image_path)
-        matched_folder_p = matched_path_p.parent.resolve(strict=False)
+        matched_path_p = Path(matched_image_path).resolve(strict=False)   # keep as Path
+        matched_folder_p = matched_path_p.parent                        # Path object
         matched_filename = matched_path_p.name
-
-        def to_no_leading_and_backslashes(p):
-            # Accept either a str or pathlib.Path
-            s = str(p).replace("\\", "/")
-            if s.startswith("/"):
-                s = s[1:]
-            return s.replace("/", "\\")
-        
-        matched_folder_p = to_no_leading_and_backslashes(matched_folder_p)
+    
+        # Prepare display-only string (do NOT reassign matched_folder_p)
+        matched_folder_display = display_like_windows_no_lead(matched_folder_p)
     
         print(f"Processing matched image: {matched_image_path}")
-        print(f"  - Folder: {matched_folder_p}")   # now resolved
-        print(f"  - Sprite path: {sprite_base_p}")
-        print(f"  - Backdrop path: {backdrop_base_p}")
+        print(f"  - Folder: {matched_folder_display}")
+        print(f"  - Sprite path: {display_like_windows_no_lead(sprite_base_p)}")
+        print(f"  - Backdrop path: {display_like_windows_no_lead(backdrop_base_p)}")
         print(f"  - Filename: {matched_filename}")
     
-        # helper: robust subpath check
-        def is_subpath(child: Path, parent: Path) -> bool:
-            try:
-                child.relative_to(parent)
-                return True
-            except Exception:
-                return False
+        # Use a canonical string to store in the copied set (POSIX absolute-ish)
+        folder_key = matched_folder_p.as_posix()
+    
+        # ---------- SPRITE ----------
+        if is_subpath(matched_folder_p, sprite_base_p) and folder_key not in copied_sprite_folders:
+            print(f"Processing SPRITE folder: {matched_folder_display}")
+            copied_sprite_folders.add(folder_key)
     
-        # If it's a sprite (under SPRITE_DIR) -> copy sprite assets and read sprite.json
-        if is_subpath(matched_folder_p, sprite_base_p) and str(matched_folder_p) not in copied_sprite_folders:
-            print(f"Processing SPRITE folder: {matched_folder_p}")
-            copied_sprite_folders.add(str(matched_folder_p))
             sprite_json_path = matched_folder_p / "sprite.json"
             print("sprite_json_path----------------------->", sprite_json_path)
             print("copied sprite folder----------------------->", copied_sprite_folders)
-            if sprite_json_path.exists():
+            if sprite_json_path.exists() and sprite_json_path.is_file():
                 try:
                     with sprite_json_path.open("r", encoding="utf-8") as f:
                         sprite_info = json.load(f)
                     project_data.append(sprite_info)
-                    print(f"  ✓ Successfully read sprite.json from {matched_folder_p}")
+                    print(f"  ✓ Successfully read sprite.json from {matched_folder_display}")
                 except Exception as e:
-                    print(f"  ✗ Failed to read sprite.json in {matched_folder_p}: {repr(e)}")
+                    print(f"  ✗ Failed to read sprite.json in {matched_folder_display}: {repr(e)}")
             else:
-                print(f"  ⚠ No sprite.json in {matched_folder_p}")
+                print(f"  ⚠ No sprite.json in {matched_folder_display}")
     
-            # copy non-matching files from the sprite folder (except the matched image and sprite.json)
+            # copy non-matching files from the sprite folder (except matched image and sprite.json)
             try:
                 sprite_files = list(matched_folder_p.iterdir())
             except Exception as e:
                 sprite_files = []
-                print(f"  ✗ Failed to list files in {matched_folder_p}: {repr(e)}")
+                print(f"  ✗ Failed to list files in {matched_folder_display}: {repr(e)}")
     
             print(f"  Files in sprite folder: {[p.name for p in sprite_files]}")
             for p in sprite_files:
@@ -2015,27 +2035,31 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
                 else:
                     print(f"    Skipping {fname} (not a file)")
     
-        # If it's a backdrop (under BACKDROP_DIR) -> copy backdrop assets and read project.json for stage
-        if is_subpath(matched_folder_p, backdrop_base_p) and str(matched_folder_p) not in copied_backdrop_folders:
-            print(f"Processing BACKDROP folder: {matched_folder_p}")
-            copied_backdrop_folders.add(str(matched_folder_p))
-            print("backdrop_base_path----------------------->", backdrop_base_p)
+        # ---------- BACKDROP ----------
+        if is_subpath(matched_folder_p, backdrop_base_p) and folder_key not in copied_backdrop_folders:
+            print(f"Processing BACKDROP folder: {matched_folder_display}")
+            copied_backdrop_folders.add(folder_key)
+            print("backdrop_base_path----------------------->", display_like_windows_no_lead(backdrop_base_p))
             print("copied backdrop folder----------------------->", copied_backdrop_folders)
+    
             # copy matched backdrop image
             backdrop_src = matched_folder_p / matched_filename
             backdrop_dst = project_folder_p / matched_filename
-            try:
-                shutil.copy2(str(backdrop_src), str(backdrop_dst))
-                print(f"  ✓ Copied matched backdrop image: {backdrop_src} -> {backdrop_dst}")
-            except Exception as e:
-                print(f"  ✗ Failed to copy matched backdrop image {backdrop_src}: {repr(e)}")
+            if backdrop_src.exists() and backdrop_src.is_file():
+                try:
+                    shutil.copy2(str(backdrop_src), str(backdrop_dst))
+                    print(f"  ✓ Copied matched backdrop image: {backdrop_src} -> {backdrop_dst}")
+                except Exception as e:
+                    print(f"  ✗ Failed to copy matched backdrop image {backdrop_src}: {repr(e)}")
+            else:
+                print(f"  ⚠ Matched backdrop source not found: {backdrop_src}")
     
             # copy other files from folder (skip project.json and matched image)
             try:
                 backdrop_files = list(matched_folder_p.iterdir())
             except Exception as e:
                 backdrop_files = []
-                print(f"  ✗ Failed to list files in {matched_folder_p}: {repr(e)}")
+                print(f"  ✗ Failed to list files in {matched_folder_display}: {repr(e)}")
     
             print(f"  Files in backdrop folder: {[p.name for p in backdrop_files]}")
             for p in backdrop_files:
@@ -2055,7 +2079,7 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
     
             # read project.json to extract Stage/targets
             pj = matched_folder_p / "project.json"
-            if pj.exists():
+            if pj.exists() and pj.is_file():
                 try:
                     with pj.open("r", encoding="utf-8") as f:
                         bd_json = json.load(f)
@@ -2064,14 +2088,13 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
                         if tgt.get("isStage"):
                             backdrop_data.append(tgt)
                             stage_count += 1
-                    print(f"  ✓ Successfully read project.json from {matched_folder_p}, found {stage_count} stage(s)")
+                    print(f"  ✓ Successfully read project.json from {matched_folder_display}, found {stage_count} stage(s)")
                 except Exception as e:
-                    print(f"  ✗ Failed to read project.json in {matched_folder_p}: {repr(e)}")
+                    print(f"  ✗ Failed to read project.json in {matched_folder_display}: {repr(e)}")
             else:
-                print(f"  ⚠ No project.json in {matched_folder_p}")
+                print(f"  ⚠ No project.json in {matched_folder_display}")
     
         print("---")
-                
     # for matched_idx in matched_indices:
     #     matched_image_path = paths_list[matched_idx]
     #     matched_folder = os.path.dirname(matched_image_path)