Update app.py

app.py

@@ -1829,49 +1829,18 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
     # Flatten unique matched indices to process copying once per folder
     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:
         matched_image_path = paths_list[matched_idx]
-        
-        # --- Change 1: Convert path to absolute path for reliable comparison
-        matched_image_path = os.path.abspath(matched_image_path)
-        
         matched_folder = os.path.dirname(matched_image_path)
         matched_filename = os.path.basename(matched_image_path)
-        # --- Minimal diagnostics (drop these in prod) ---
-        try:
-            # Normalize many forms so we can compare apples-to-apples
-            # --- Change 2: Use the already normalized matched_image_path for consistency
-            mf_abs = os.path.normpath(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
-            # --- Change 3: Use os.path.commonpath for reliable cross-platform checks
-            starts_with_backdrop = (os.path.commonpath([mf_abs, bb]) == bb)
-            starts_with_sprite = (os.path.commonpath([mf_abs, sb]) == sb)
-    
-            print("DEBUG matched_idx:", matched_idx)
-            print("DEBUG matched_image_path:", matched_image_path)
-            print("DEBUG matched_folder (raw):", mf_repr)
-            print("DEBUG matched_folder (abs):", mf_abspath_repr)
-            print("DEBUG backdrop_base_path (raw):", repr(backdrop_base_path))
-            print("DEBUG backdrop_base_path (abs):", repr(bb))
-            print("DEBUG sprite_base_path (raw):", repr(sprite_base_path))
-            print("DEBUG sprite_base_path (abs):", repr(sb))
-            print("DEBUG starts_with_backdrop:", starts_with_backdrop, " starts_with_sprite:", starts_with_sprite)
-            print("DEBUG common_with_backdrop:", common_with_backdrop, " common_with_sprite:", common_with_sprite)
-            # Show a short sample of the reference path for matched index
-            print("DEBUG sample paths_list entry:", repr(paths_list[matched_idx])[:400])
-        except Exception as _e:
-            print("DEBUG diagnostics failed:", _e)
+        
+        print(f"Processing matched image: {matched_image_path}")
+        print(f"  - Folder: {matched_folder}")
+        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:
-        if is_subpath(matched_folder, sprite_base_path) and matched_folder not in copied_sprite_folders:
+        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")
             if os.path.exists(sprite_json_path):
@@ -1879,44 +1848,60 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
                     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("Failed to read sprite.json in %s: %s", matched_folder, e)
+                    print(f"  ✗ Failed to read sprite.json in {matched_folder}: {e}")
             else:
-                print("No sprite.json in %s", matched_folder)
+                print(f"  ⚠ No sprite.json in {matched_folder}")
+            
             # copy non-matching files from the sprite folder (except the matched image and sprite.json)
-            for fname in os.listdir(matched_folder):
+            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("Failed to copy sprite asset %s: %s", src, 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:
-        if is_subpath(matched_folder, backdrop_base_path) and matched_folder not in copied_backdrop_folders:
+        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)
+            
             # copy matched backdrop image
+            backdrop_dst = os.path.join(project_folder, matched_filename)
             try:
-                shutil.copy2(matched_image_path, os.path.join(project_folder, matched_filename))
-                print("Copied matched backdrop image %s", matched_filename)
+                shutil.copy2(matched_image_path, backdrop_dst)
+                print(f"  ✓ Copied matched backdrop image: {matched_image_path} -> {backdrop_dst}")
             except Exception as e:
-                print("Failed to copy matched backdrop image %s: %s", matched_image_path, e)
+                print(f"  ✗ Failed to copy matched backdrop image {matched_image_path}: {e}")
 
             # copy other files from folder (skip project.json and matched image)
-            for fname in os.listdir(matched_folder):
+            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("Failed to copy backdrop asset %s: %s", src, 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")
@@ -1924,13 +1909,18 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
                 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("Failed to read project.json in %s: %s", matched_folder, e)
+                    print(f"  ✗ Failed to read project.json in {matched_folder}: {e}")
             else:
-                print("No project.json in %s", matched_folder)
+                print(f"  ⚠ No project.json in {matched_folder}")
+        
+        print("---")
 
     # --- Merge into final Scratch project.json (identical logic to before)
     final_project = {