Update app.py

app.py

@@ -1843,110 +1843,6 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
     matched_indices = sorted({idx for lst in per_sprite_matched_indices for idx in lst})
     print("matched_indices------------------>",matched_indices)
 
-    # from pathlib import Path
-    
-    # # normalize & resolve once at top of function
-    # sprite_base_p = Path(sprite_base_path).resolve()
-    # backdrop_base_p = Path(backdrop_base_path).resolve()
-    # project_folder_p = Path(project_folder).resolve()
-    # project_folder_p.mkdir(parents=True, exist_ok=True)   # ensure dest exists
-    
-    # for matched_idx in matched_indices:
-    #     matched_image_path = paths_list[matched_idx]
-    #     print("matched_image_path ---1-->",matched_image_path)
-    #     matched_folder = Path(matched_image_path).parent
-    #     print("matched_folder ---2-->",matched_folder)
-    #     matched_filename = Path(matched_image_path).name
-    #     print("matched_filename ---3-->",matched_filename)
-        
-    
-    #     # resolve matched_folder (safe even if it's already absolute)
-    #     try:
-    #         matched_folder_p = matched_folder.resolve()
-    #     except Exception:
-    #         # fallback to absolute path join if resolve fails
-    #         matched_folder_p = (Path.cwd() / matched_folder).resolve()
-    
-    #     # print(f"Processing matched image: {matched_image_path}")
-    #     # print(f"  matched_folder_p = {matched_folder_p}")
-    #     # print(f"  sprite_base_p    = {sprite_base_p}")
-    #     # print(f"  backdrop_base_p  = {backdrop_base_p}")
-    
-    #     # Check if matched_folder is under sprite_base_p
-    #     is_sprite = False
-    #     try:
-    #         matched_folder_p.relative_to(sprite_base_p)
-    #         is_sprite = True
-    #         print("matched_folder_p--------->",matched_folder_p)
-    #         print("is_sprite---------->",is_sprite)
-    #     except Exception:
-    #         is_sprite = False
-    #         print("is_sprite---------->",is_sprite)
-                
-    #     if is_sprite and str(matched_folder) not in copied_sprite_folders:
-    #         print(f"Processing SPRITE folder: {matched_folder}")
-    #         copied_sprite_folders.add(str(matched_folder))
-    #         sprite_json_path = matched_folder / "sprite.json"
-    #         # ... (rest of your logic, but use Path objects)
-    #         sprite_files = list(matched_folder.iterdir())
-    #         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
-    #             if p.is_file():
-    #                 dst = project_folder_p / fname
-    #                 try:
-    #                     shutil.copy2(str(p), str(dst))
-    #                     print(f"    ✓ Copied sprite asset: {p} -> {dst}")
-    #                 except Exception as e:
-    #                     print(f"    ✗ Failed to copy sprite asset {p}: {e}")
-    #             else:
-    #                 print(f"    Skipping {fname} (not a file)")
-    
-    #     # Check if matched_folder is under backdrop_base_p
-    #     is_backdrop = False
-    #     try:
-    #         matched_folder.relative_to(backdrop_base_p)
-    #         print("matched_folder_p--------->",matched_folder_p)
-    #         is_backdrop = True
-    #         print("is_backdrop---------->",is_backdrop)
-    #     except Exception:
-    #         is_backdrop = False
-    #         print("is_backdrop---------->",is_backdrop)
-    
-    #     if is_backdrop and str(matched_folder) not in copied_backdrop_folders:
-    #         print(f"Processing BACKDROP folder: {matched_folder}")
-    #         copied_backdrop_folders.add(str(matched_folder))
-    #         # copy matched backdrop image
-    #         backdrop_dst = project_folder_p / matched_filename
-    #         try:
-    #             shutil.copy2(str(matched_folder / matched_filename), str(backdrop_dst))
-    #             print(f"  ✓ Copied matched backdrop image: {matched_folder / matched_filename} -> {backdrop_dst}")
-    #         except Exception as e:
-    #             print(f"  ✗ Failed to copy matched backdrop image {matched_folder / matched_filename}: {e}")
-    
-    #         # copy other files similarly using Path.iterdir()
-    #         # read project.json at matched_folder / "project.json"
-    #         pj = matched_folder / "project.json"
-    #         if pj.exists():
-    #             try:
-    #                 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)")
-    #             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("---")
-        # add at top of file
     import shutil
     import json
     import os
@@ -2109,105 +2005,7 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
                 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)
-    #     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 = {
         "targets": [], "monitors": [], "extensions": [],
         "meta": {
@@ -2217,6 +2015,12 @@ def similarity_matching(sprites_data: dict, project_folder: str, top_k: int = 1,
         }
     }
 
+    
+    # Add sprite targets (non-stage)
+    for spr in project_data:
+        if not spr.get("isStage", False):
+            final_project["targets"].append(spr)
+
     # then backdrop as the Stage
     if backdrop_data:
         all_costumes, sounds = [], []