Update app.py

app.py

@@ -1932,104 +1932,234 @@ 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
+    from pathlib import Path
+    
+    # ensure base paths are normalized 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()
+    
     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_path_p = Path(matched_image_path)
+        matched_folder_p = matched_path_p.parent.resolve(strict=False)
+        matched_filename = matched_path_p.name
+    
         print(f"Processing matched image: {matched_image_path}")
-        print(f"  - Folder: {matched_folder}")
-        print(f"  - Sprite path: {sprite_base_path}")
-        print(f"  - Backdrop path: {backdrop_base_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"  - 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
+    
         # 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:
-            print(f"Processing SPRITE folder: {matched_folder}")
-            copied_sprite_folders.add(matched_folder)
-            sprite_json_path = os.path.join(matched_folder, "sprite.json")
-            print("sprite_json_path----------------------->",sprite_json_path)
-            print("copied sprite folder----------------------->",copied_sprite_folders)
-            if os.path.exists(sprite_json_path):
+        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():
                 try:
-                    with open(sprite_json_path, "r", encoding="utf-8") as f:
+                    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}")
+                    print(f"  ✓ Successfully read sprite.json from {matched_folder_p}")
                 except Exception as e:
-                    print(f"  ✗ Failed to read sprite.json in {matched_folder}: {e}")
+                    print(f"  ✗ Failed to read sprite.json in {matched_folder_p}: {repr(e)}")
             else:
-                print(f"  ⚠ No sprite.json in {matched_folder}")
-            
+                print(f"  ⚠ No sprite.json in {matched_folder_p}")
+    
             # copy non-matching files from the sprite folder (except the matched image and sprite.json)
-            sprite_files = os.listdir(matched_folder)
-            print(f"  Files in sprite folder: {sprite_files}")
-            for fname in sprite_files:
+            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"  Files in sprite folder: {[p.name for p in sprite_files]}")
+            for p in sprite_files:
+                fname = p.name
                 if fname in (matched_filename, "sprite.json"):
                     print(f"    Skipping {fname} (matched image or sprite.json)")
                     continue
-                src = os.path.join(matched_folder, fname)
-                dst = os.path.join(project_folder, fname)
-                if os.path.isfile(src):
+                if p.is_file():
+                    dst = project_folder_p / fname
                     try:
-                        shutil.copy2(src, dst)
-                        print(f"    ✓ Copied sprite asset: {src} -> {dst}")
+                        shutil.copy2(str(p), str(dst))
+                        print(f"    ✓ Copied sprite asset: {p} -> {dst}")
                     except Exception as e:
-                        print(f"    ✗ Failed to copy sprite asset {src}: {e}")
+                        print(f"    ✗ Failed to copy sprite asset {p}: {repr(e)}")
                 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 matched_folder.startswith(backdrop_base_path) and matched_folder not in copied_backdrop_folders:
-            print(f"Processing BACKDROP folder: {matched_folder}")
-            copied_backdrop_folders.add(matched_folder)
-            print("backdrop_base_path----------------------->",backdrop_base_path)
-            print("copied backdrop folder----------------------->",copied_backdrop_folders)
+        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)
+            print("copied backdrop folder----------------------->", copied_backdrop_folders)
             # copy matched backdrop image
-            backdrop_dst = os.path.join(project_folder, matched_filename)
+            backdrop_src = matched_folder_p / matched_filename
+            backdrop_dst = project_folder_p / matched_filename
             try:
-                shutil.copy2(matched_image_path, backdrop_dst)
-                print(f"  ✓ Copied matched backdrop image: {matched_image_path} -> {backdrop_dst}")
+                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 {matched_image_path}: {e}")
-
+                print(f"  ✗ Failed to copy matched backdrop image {backdrop_src}: {repr(e)}")
+    
             # copy other files from folder (skip project.json and matched image)
-            backdrop_files = os.listdir(matched_folder)
-            print(f"  Files in backdrop folder: {backdrop_files}")
-            for fname in backdrop_files:
+            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"  Files in backdrop folder: {[p.name for p in backdrop_files]}")
+            for p in backdrop_files:
+                fname = p.name
                 if fname in (matched_filename, "project.json"):
                     print(f"    Skipping {fname} (matched image or project.json)")
                     continue
-                src = os.path.join(matched_folder, fname)
-                dst = os.path.join(project_folder, fname)
-                if os.path.isfile(src):
+                if p.is_file():
+                    dst = project_folder_p / fname
                     try:
-                        shutil.copy2(src, dst)
-                        print(f"    ✓ Copied backdrop asset: {src} -> {dst}")
+                        shutil.copy2(str(p), str(dst))
+                        print(f"    ✓ Copied backdrop asset: {p} -> {dst}")
                     except Exception as e:
-                        print(f"    ✗ Failed to copy backdrop asset {src}: {e}")
+                        print(f"    ✗ Failed to copy backdrop asset {p}: {repr(e)}")
                 else:
                     print(f"    Skipping {fname} (not a file)")
-
+    
             # read project.json to extract Stage/targets
-            pj = os.path.join(matched_folder, "project.json")
-            if os.path.exists(pj):
+            pj = matched_folder_p / "project.json"
+            if pj.exists():
                 try:
-                    with open(pj, "r", encoding="utf-8") as f:
+                    with pj.open("r", encoding="utf-8") as f:
                         bd_json = json.load(f)
                     stage_count = 0
                     for tgt in bd_json.get("targets", []):
                         if tgt.get("isStage"):
                             backdrop_data.append(tgt)
                             stage_count += 1
-                    print(f"  ✓ Successfully read project.json from {matched_folder}, found {stage_count} stage(s)")
+                    print(f"  ✓ Successfully read project.json from {matched_folder_p}, found {stage_count} stage(s)")
                 except Exception as e:
-                    print(f"  ✗ Failed to read project.json in {matched_folder}: {e}")
+                    print(f"  ✗ Failed to read project.json in {matched_folder_p}: {repr(e)}")
             else:
-                print(f"  ⚠ No project.json in {matched_folder}")
-        
+                print(f"  ⚠ No project.json in {matched_folder_p}")
+    
         print("---")
+                
+    # 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)
+        
+    #     print(f"Processing matched image: {matched_image_path}")
+    #     print(f"  - Folder: {matched_folder}")
+    #     print(f"  - Sprite path: {sprite_base_path}")
+    #     print(f"  - Backdrop path: {backdrop_base_path}")
+    #     print(f"  - Filename: {matched_filename}")
+        
+    #     # 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:
+    #         print(f"Processing SPRITE folder: {matched_folder}")
+    #         copied_sprite_folders.add(matched_folder)
+    #         sprite_json_path = os.path.join(matched_folder, "sprite.json")
+    #         print("sprite_json_path----------------------->",sprite_json_path)
+    #         print("copied sprite folder----------------------->",copied_sprite_folders)
+    #         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"  ✓ Successfully read sprite.json from {matched_folder}")
+    #             except Exception as e:
+    #                 print(f"  ✗ Failed to read sprite.json in {matched_folder}: {e}")
+    #         else:
+    #             print(f"  ⚠ No sprite.json in {matched_folder}")
+            
+    #         # copy non-matching files from the sprite folder (except the matched image and sprite.json)
+    #         sprite_files = os.listdir(matched_folder)
+    #         print(f"  Files in sprite folder: {sprite_files}")
+    #         for fname in sprite_files:
+    #             if fname in (matched_filename, "sprite.json"):
+    #                 print(f"    Skipping {fname} (matched image or 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)
+    #                     print(f"    ✓ Copied sprite asset: {src} -> {dst}")
+    #                 except Exception as e:
+    #                     print(f"    ✗ Failed to copy sprite asset {src}: {e}")
+    #             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 matched_folder.startswith(backdrop_base_path) and matched_folder not in copied_backdrop_folders:
+    #         print(f"Processing BACKDROP folder: {matched_folder}")
+    #         copied_backdrop_folders.add(matched_folder)
+    #         print("backdrop_base_path----------------------->",backdrop_base_path)
+    #         print("copied backdrop folder----------------------->",copied_backdrop_folders)
+    #         # copy matched backdrop image
+    #         backdrop_dst = os.path.join(project_folder, matched_filename)
+    #         try:
+    #             shutil.copy2(matched_image_path, backdrop_dst)
+    #             print(f"  ✓ Copied matched backdrop image: {matched_image_path} -> {backdrop_dst}")
+    #         except Exception as e:
+    #             print(f"  ✗ Failed to copy matched backdrop image {matched_image_path}: {e}")
+
+    #         # copy other files from folder (skip project.json and matched image)
+    #         backdrop_files = os.listdir(matched_folder)
+    #         print(f"  Files in backdrop folder: {backdrop_files}")
+    #         for fname in backdrop_files:
+    #             if fname in (matched_filename, "project.json"):
+    #                 print(f"    Skipping {fname} (matched image or project.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)
+    #                     print(f"    ✓ Copied backdrop asset: {src} -> {dst}")
+    #                 except Exception as e:
+    #                     print(f"    ✗ Failed to copy backdrop asset {src}: {e}")
+    #             else:
+    #                 print(f"    Skipping {fname} (not a file)")
+
+    #         # read project.json to extract Stage/targets
+    #         pj = os.path.join(matched_folder, "project.json")
+    #         if os.path.exists(pj):
+    #             try:
+    #                 with open(pj, "r", encoding="utf-8") as f:
+    #                     bd_json = json.load(f)
+    #                 stage_count = 0
+    #                 for tgt in bd_json.get("targets", []):
+    #                     if tgt.get("isStage"):
+    #                         backdrop_data.append(tgt)
+    #                         stage_count += 1
+    #                 print(f"  ✓ Successfully read project.json from {matched_folder}, found {stage_count} stage(s)")
+    #             except Exception as e:
+    #                 print(f"  ✗ Failed to read project.json in {matched_folder}: {e}")
+    #         else:
+    #             print(f"  ⚠ No project.json in {matched_folder}")
+        
+    #     print("---")
 
     # --- Merge into final Scratch project.json (identical logic to before)
     final_project = {