Added printed information for loading exported changes and saving crop changes to the file | release v2.7.0

Author: BobJr23

main.py

@@ -440,7 +440,7 @@ def get_resource_path(relative_path: str) -> str:
             continue
 
         # Create crop editor window (it handles its own event loop)
-        create_crop_editor_window(database_file_path, database_cursor)
+        create_crop_editor_window(database_file_path, database_cursor, str(user_save_changes_path))
 
     # Handle Set Swapper functionality
     if event == "-SET_SWAPPER-":

src/crop_editor.py

@@ -34,6 +34,7 @@
 import FreeSimpleGUI as sg
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple
+import json
 
 
 class ArtCropData:
@@ -229,16 +230,168 @@ def filter_crops_by_art_id(
     return [entry for entry in crop_data if art_id.zfill(6) in entry.path]
 
 
+def extract_art_id_from_path(path: str) -> Optional[str]:
+    """
+    Extract ArtId from a crop path.
+    Path format: Assets/Core/CardArt/001000/001155_AIF
+
+    Args:
+        path: The crop entry path
+
+    Returns:
+        ArtId as string, or None if not found
+    """
+    try:
+        # Split the path and look for the numeric part
+        parts = path.split("/")
+        art_id = parts[-1].split("_")[0].lstrip("0")
+        return art_id
+    except Exception as e:
+        print(f"Error extracting ArtId from path {path}: {e}")
+    return None
+
+
+def save_crop_change_to_json(entry: ArtCropData, changes_file_path: str) -> bool:
+    """
+    Save crop change to the changes.json file based on ArtId.
+
+    Args:
+        entry: The crop entry that was modified
+        changes_file_path: Path to the changes.json file
+
+    Returns:
+        True if successful, False otherwise
+    """
+    try:
+        # Extract ArtId from path
+        art_id = extract_art_id_from_path(entry.path)
+        if not art_id:
+            print(f"Could not extract ArtId from path: {entry.path}")
+            return False
+
+        # Load existing changes
+        if os.path.exists(changes_file_path):
+            with open(changes_file_path, "r") as f:
+                changes_data = json.load(f)
+        else:
+            changes_data = {}
+
+        # Initialize crops structure if not exists
+        if "crops" not in changes_data:
+            changes_data["crops"] = {}
+
+        # Store crop change under ArtId
+        if art_id not in changes_data["crops"]:
+            changes_data["crops"][art_id] = []
+
+        # Create crop entry dict
+        crop_dict = {
+            "path": entry.path,
+            "format": entry.format_type,
+            "x": entry.x,
+            "y": entry.y,
+            "z": entry.z,
+            "w": entry.w,
+            "generated": entry.generated,
+        }
+
+        # Check if this crop already exists (by path and format)
+        existing_crops = changes_data["crops"][art_id]
+        existing_index = None
+        for i, crop in enumerate(existing_crops):
+            if crop["path"] == entry.path and crop["format"] == entry.format_type:
+                existing_index = i
+                break
+
+        if existing_index is not None:
+            # Update existing
+            existing_crops[existing_index] = crop_dict
+        else:
+            # Add new
+            existing_crops.append(crop_dict)
+
+        # Save back to file
+        with open(changes_file_path, "w") as f:
+            json.dump(changes_data, f, indent=4)
+
+        return True
+
+    except Exception as e:
+        print(f"Error saving crop change to JSON: {e}")
+        return False
+
+
+def remove_crop_change_from_json(entry: ArtCropData, changes_file_path: str) -> bool:
+    """
+    Remove crop change from the changes.json file.
+
+    Args:
+        entry: The crop entry to remove
+        changes_file_path: Path to the changes.json file
+
+    Returns:
+        True if successful, False otherwise
+    """
+    try:
+        # Extract ArtId from path
+        art_id = extract_art_id_from_path(entry.path)
+        if not art_id:
+            return False
+
+        # Load existing changes
+        if not os.path.exists(changes_file_path):
+            return True  # Nothing to remove
+
+        with open(changes_file_path, "r") as f:
+            changes_data = json.load(f)
+
+        # Check if crops section exists
+        if "crops" not in changes_data or art_id not in changes_data["crops"]:
+            return True  # Nothing to remove
+
+        # Remove the matching crop entry
+        changes_data["crops"][art_id] = [
+            crop
+            for crop in changes_data["crops"][art_id]
+            if not (crop["path"] == entry.path and crop["format"] == entry.format_type)
+        ]
+
+        # Clean up empty entries
+        if not changes_data["crops"][art_id]:
+            del changes_data["crops"][art_id]
+
+        if not changes_data["crops"]:
+            del changes_data["crops"]
+
+        # Save back to file
+        with open(changes_file_path, "w") as f:
+            json.dump(changes_data, f, indent=4)
+
+        return True
+
+    except Exception as e:
+        print(f"Error removing crop change from JSON: {e}")
+        return False
+
+
 def create_crop_editor_window(
-    database_file_path: str, database_cursor: sqlite3.Cursor
+    database_file_path: str,
+    database_cursor: sqlite3.Cursor,
+    changes_file_path: str = None,
 ) -> None:
     """
     Create and display the crop editor window.
 
     Args:
         database_file_path: Path to the Raw_CardDatabase file
         database_cursor: SQLite cursor for querying card data
+        changes_file_path: Path to the changes.json file (optional)
     """
+    # Set default changes file path if not provided
+    if changes_file_path is None:
+        user_config_directory = Path.home() / ".mtga_swapper"
+        changes_file_path = str(user_config_directory / "changes.json")
+
     # Determine the crop database path
     db_dir = os.path.dirname(database_file_path)
     crop_db_path = None
@@ -453,6 +606,9 @@ def load_entry_to_edit(entry: ArtCropData):
 
                     # Update in the database (without committing yet)
                     if update_crop_entry(crop_cursor, entry, commit=False):
+                        # Save to changes.json
+                        save_crop_change_to_json(entry, changes_file_path)
+
                         # Update the display
                         update_crop_table(filtered_crops)
 
@@ -588,6 +744,9 @@ def load_entry_to_edit(entry: ArtCropData):
                                     new_entry.to_tuple(),
                                 )
 
+                                # Save to changes.json
+                                save_crop_change_to_json(new_entry, changes_file_path)
+
                                 # Add to our data structures
                                 crop_data.append(new_entry)
                                 filtered_crops.append(new_entry)
@@ -650,6 +809,9 @@ def load_entry_to_edit(entry: ArtCropData):
                             (entry.path, entry.format_type),
                         )
 
+                        # Remove from changes.json
+                        remove_crop_change_from_json(entry, changes_file_path)
+
                         # Remove from our data structures
                         crop_data.remove(entry)
                         filtered_crops.remove(entry)

src/load_preset.py

@@ -6,6 +6,81 @@
 import shutil
 
 
+def apply_crop_changes(crop_changes: dict, asset_bundle_path: str) -> None:
+    """
+    Apply crop changes from the changes.json file to the Art Crop Database.
+
+    Args:
+        crop_changes: Dictionary of crop changes keyed by ArtId
+        asset_bundle_path: Path to the MTGA asset bundle directory
+    """
+    try:
+        # Find the Raw_ArtCropDatabase file
+        crop_db_path = None
+        raw_path = Path(asset_bundle_path).parent / "Raw"
+        for file in os.listdir(raw_path):
+            if file.startswith("Raw_ArtCropDatabase") and file.endswith(".mtga"):
+                crop_db_path = os.path.join(raw_path, file)
+                break
+
+        if not crop_db_path or not os.path.exists(crop_db_path):
+            print(
+                "Warning: Could not find Raw_ArtCropDatabase file, skipping crop changes"
+            )
+            return
+
+        # Connect to the crop database
+        conn = sqlite3.connect(crop_db_path)
+        cursor = conn.cursor()
+
+        # Apply each crop change
+        for art_id, crops in crop_changes.items():
+            for crop in crops:
+                try:
+                    path = crop["path"]
+                    format_type = crop["format"]
+                    x = crop["x"]
+                    y = crop["y"]
+                    z = crop["z"]
+                    w = crop["w"]
+                    generated = crop["generated"]
+
+                    # Check if entry exists
+                    cursor.execute(
+                        "SELECT COUNT(*) FROM Crops WHERE Path = ? AND Format = ?",
+                        (path, format_type),
+                    )
+                    exists = cursor.fetchone()[0] > 0
+
+                    if exists:
+                        # Update existing entry
+                        cursor.execute(
+                            "UPDATE Crops SET X = ?, Y = ?, Z = ?, W = ?, Generated = ? WHERE Path = ? AND Format = ?",
+                            (x, y, z, w, generated, path, format_type),
+                        )
+                    else:
+                        # Insert new entry
+                        cursor.execute(
+                            "INSERT INTO Crops (Path, Format, X, Y, Z, W, Generated) VALUES (?, ?, ?, ?, ?, ?, ?)",
+                            (path, format_type, x, y, z, w, generated),
+                        )
+
+                    print(
+                        f"Applied crop change for ArtId {art_id}: {path} ({format_type})"
+                    )
+
+                except Exception as e:
+                    print(f"Error applying crop change for ArtId {art_id}: {e}")
+
+        # Commit all changes
+        conn.commit()
+        conn.close()
+        print(f"Successfully applied {len(crop_changes)} crop change(s)")
+
+    except Exception as e:
+        print(f"Error applying crop changes: {e}")
+
+
 def save_grp_id_info(
     grp_id: list[str],
     user_save_changes_path: str,
@@ -90,12 +165,25 @@ def change_grp_id(
             list(json_manual.values()) + [grp_id],
         )
     else:
+        print(f"Loading changes from: {change_path}")
         with open(change_path, "r") as changes_file:
             changes_data = json.load(changes_file)
         changes_file.close()
+
+        # Handle crop changes if present
+        crop_changes = changes_data.pop("crops", None)
+        if crop_changes and asset_bundle_path:
+            print(f"Found {len(crop_changes)} ArtId(s) with crop changes")
+            apply_crop_changes(crop_changes, asset_bundle_path)
+        elif crop_changes:
+            print(
+                "Warning: Crop changes found but asset_bundle_path not provided, skipping crop changes"
+            )
+
         available_backups = Path.home() / "MTGA_Swapper_Backups"
         backups = list(available_backups.glob("MOD_*.mtga"))
         backups.sort(key=os.path.getmtime)
+        restored_count = 0
         for art in backups:
             matching_files = [
                 filename
@@ -108,6 +196,13 @@ def change_grp_id(
                     art,
                     os.path.join(asset_bundle_path, matching_files[0]),
                 )
+                restored_count += 1
+        if restored_count > 0:
+            print(f"Restored {restored_count} backup file(s)")
+
+        card_count = len(changes_data)
+        total_localizations = 0
+        print(f"Applying changes to {card_count} card(s)...")
         for grp_id, new_values in changes_data.items():
 
             localizations = new_values.pop("Localizations_enUS", None)
@@ -122,8 +217,12 @@ def change_grp_id(
                     f"UPDATE Localizations_enUS SET Loc = ? WHERE LocId = ?",
                     [(text, loc_id) for loc_id, text in localizations.items()],
                 )
+                total_localizations += len(localizations)
 
     connection.commit()
+    if total_localizations > 0:
+        print(f"Updated {total_localizations} localization(s)")
+    print("Changes applied successfully!")
 
 
 def save_loc_id_info(