Update engine.py

engine.py

@@ -1,136 +1,111 @@
 import os
 import shutil
-import json
+import sqlite3
 from PIL import Image
 from io import BytesIO
 
 class SorterEngine:
-    CONFIG_PATH = "/app/favorites.json"
+    DB_PATH = "/app/sorter_database.db"
 
+    @staticmethod
+    def init_db():
+        """Initializes SQLite tables for Profiles, Folder IDs, and Categories."""
+        conn = sqlite3.connect(SorterEngine.DB_PATH)
+        cursor = conn.cursor()
+        # Profiles: Stores Discovery and Review paths
+        cursor.execute('''CREATE TABLE IF NOT EXISTS profiles 
+            (name TEXT PRIMARY KEY, disc_t TEXT, rev_t TEXT, rev_c TEXT, path_out TEXT, mode TEXT)''')
+        # Folder IDs: Maps source folders to unique numeric IDs
+        cursor.execute('''CREATE TABLE IF NOT EXISTS folder_ids (path TEXT PRIMARY KEY, folder_id INTEGER)''')
+        # Categories: Stores the list of sorting categories from your script
+        cursor.execute('''CREATE TABLE IF NOT EXISTS categories (name TEXT PRIMARY KEY)''')
+        
+        # Seed default categories if empty
+        cursor.execute("SELECT COUNT(*) FROM categories")
+        if cursor.fetchone()[0] == 0:
+            for cat in ["_TRASH", "Default", "Action", "Solo"]:
+                cursor.execute("INSERT INTO categories VALUES (?)", (cat,))
+        
+        conn.commit()
+        conn.close()
+
+    @staticmethod
+    def get_folder_id(source_path):
+        """Retrieves or generates a unique ID for a folder."""
+        conn = sqlite3.connect(SorterEngine.DB_PATH)
+        cursor = conn.cursor()
+        cursor.execute("SELECT folder_id FROM folder_ids WHERE path = ?", (source_path,))
+        result = cursor.fetchone()
+        if result:
+            fid = result[0]
+        else:
+            cursor.execute("SELECT MAX(folder_id) FROM folder_ids")
+            row = cursor.fetchone()
+            fid = (row[0] + 1) if row[0] else 1
+            cursor.execute("INSERT INTO folder_ids VALUES (?, ?)", (source_path, fid))
+            conn.commit()
+        conn.close()
+        return fid
+
+    @staticmethod
+    def get_categories():
+        conn = sqlite3.connect(SorterEngine.DB_PATH)
+        cursor = conn.cursor()
+        cursor.execute("SELECT name FROM categories ORDER BY name ASC")
+        cats = [r[0] for r in cursor.fetchall()]
+        conn.close()
+        return cats
+
+    @staticmethod
+    def add_category(name):
+        conn = sqlite3.connect(SorterEngine.DB_PATH)
+        cursor = conn.cursor()
+        cursor.execute("INSERT OR IGNORE INTO categories VALUES (?)", (name,))
+        conn.commit()
+        conn.close()
+
+    @staticmethod
+    def save_profile(name, disc_t, rev_t, rev_c, path_out, mode):
+        conn = sqlite3.connect(SorterEngine.DB_PATH)
+        cursor = conn.cursor()
+        cursor.execute("INSERT OR REPLACE INTO profiles VALUES (?, ?, ?, ?, ?, ?)", 
+                       (name, disc_t, rev_t, rev_c, path_out, mode))
+        conn.commit()
+        conn.close()
+
+    @staticmethod
+    def load_profiles():
+        conn = sqlite3.connect(SorterEngine.DB_PATH)
+        cursor = conn.cursor()
+        cursor.execute("SELECT * FROM profiles")
+        rows = cursor.fetchall()
+        conn.close()
+        return {r[0]: {"disc_t": r[1], "rev_t": r[2], "rev_c": r[3], "path_out": r[4], "mode": r[5]} for r in rows}
+
+    @staticmethod
+    def delete_profile(name):
+        conn = sqlite3.connect(SorterEngine.DB_PATH)
+        cursor = conn.cursor()
+        cursor.execute("DELETE FROM profiles WHERE name = ?", (name,))
+        conn.commit()
+        conn.close()
+
+    # --- Standard File Operations ---
     @staticmethod
     def get_images(path):
         exts = ('.jpg', '.jpeg', '.png', '.webp', '.bmp', '.tiff')
         if not path or not os.path.exists(path): return []
-        try:
+        return sorted([f for f in os.listdir(path) if f.lower().endswith(exts)])
-            return sorted([f for f in os.listdir(path) if f.lower().endswith(exts)])
-        except: return []
 
     @staticmethod
-    def get_id_mapping(path):
-        """Maps idXXX prefixes to a LIST of filenames to handle collisions."""
-        mapping = {}
-        for f in SorterEngine.get_images(path):
-            if f.startswith("id") and "_" in f:
-                prefix = f.split('_')[0]
-                if prefix not in mapping:
-                    mapping[prefix] = []
-                mapping[prefix].append(f)
-        return mapping
-
-    @staticmethod
-    def get_max_id_number(target_path):
-        max_id = 0
-        search_paths = [target_path, os.path.join(target_path, "selected_target")]
-        for p in search_paths:
-            if not os.path.exists(p): continue
-            for f in os.listdir(p):
-                if f.startswith("id") and "_" in f:
-                    try:
-                        num = int(f[2:].split('_')[0])
-                        if num > max_id: max_id = num
-                    except: continue
-        return max_id
-
-    @staticmethod
-    def get_sibling_controls(target_path):
-        parent = os.path.dirname(target_path)
-        if not parent: return []
-        try:
-            return [os.path.join(parent, d) for d in os.listdir(parent) 
-                    if os.path.isdir(os.path.join(parent, d)) and 
-                    os.path.abspath(os.path.join(parent, d)) != os.path.abspath(target_path)]
-        except: return []
-
-    @staticmethod
-    def restore_from_unused(t_p, c_p, t_root, c_root):
-        """Moves files from 'unused' folders back to 'selected' folders."""
-        t_name = os.path.basename(t_p)
-        # Define destination folders
-        t_dst_dir = os.path.join(t_root, "selected_target")
-        c_dst_dir = os.path.join(c_root, "selected_control")
-        
-        os.makedirs(t_dst_dir, exist_ok=True)
-        os.makedirs(c_dst_dir, exist_ok=True)
-        
-        t_dst = os.path.join(t_dst_dir, t_name)
-        c_dst = os.path.join(c_dst_dir, t_name) # Ensure synced name on restore
-        
-        shutil.move(t_p, t_dst)
-        shutil.move(c_p, c_dst)
-        return t_dst, c_dst
-    @staticmethod
     def harmonize_names(t_p, c_p):
-        """Renames control to match target. Adds suffix if collision exists."""
         t_name = os.path.basename(t_p)
-        c_dir = os.path.dirname(c_p)
+        new_c_p = os.path.join(os.path.dirname(c_p), t_name)
-        new_c_p = os.path.join(c_dir, t_name)
         if os.path.exists(new_c_p) and c_p != new_c_p:
-            base, ext = os.path.splitext(t_name)
+            root, ext = os.path.splitext(t_name)
-            new_c_p = os.path.join(c_dir, f"{base}_collision_{ext}")
+            new_c_p = os.path.join(os.path.dirname(c_p), f"{root}_alt{ext}")
-        if c_p != new_c_p:
+        os.rename(c_p, new_c_p)
-            os.rename(c_p, new_c_p)
+        return new_c_p
-            return new_c_p
-        return c_p
-
-    @staticmethod
-    def re_id_file(old_path, new_id_prefix):
-        """Changes the idXXX_ part of a filename."""
-        dir_name = os.path.dirname(old_path)
-        old_name = os.path.basename(old_path)
-        # Strip old ID if it exists
-        name_no_id = old_name.split('_', 1)[1] if '_' in old_name else old_name
-        new_name = f"{new_id_prefix}{name_no_id}"
-        new_path = os.path.join(dir_name, new_name)
-        os.rename(old_path, new_path)
-        return new_path
-
-    @staticmethod
-    def move_to_unused_synced(t_p, c_p, t_root, c_root):
-        t_name = os.path.basename(t_p)
-        t_un = os.path.join(t_root, "unused", t_name)
-        c_un = os.path.join(c_root, "unused", t_name)
-        os.makedirs(os.path.dirname(t_un), exist_ok=True)
-        os.makedirs(os.path.dirname(c_un), exist_ok=True)
-        shutil.move(t_p, t_un)
-        shutil.move(c_p, c_un)
-        return t_un, c_un
-
-    @staticmethod
-    def execute_match(t_path, c_path, target_root, prefix, mode="standard"):
-        target_base = os.path.basename(t_path)
-        new_name = f"{prefix}{target_base}"
-        folders = {"standard": ("selected_target", "selected_control"), "solo": ("selected_target_solo_woman", "control_selected_solo_woman")}
-        t_sub, c_sub = folders[mode]
-        t_dst, c_dst = os.path.join(target_root, t_sub, new_name), os.path.join(target_root, c_sub, new_name)
-        os.makedirs(os.path.dirname(t_dst), exist_ok=True)
-        os.makedirs(os.path.dirname(c_dst), exist_ok=True)
-        shutil.move(t_path, t_dst)
-        shutil.copy2(c_path, c_dst)
-        return t_dst, c_dst
-
-    @staticmethod
-    def save_favorite(name, disc_t, rev_t, rev_c):
-        favs = SorterEngine.load_favorites()
-        favs[name] = {"disc_t": disc_t, "rev_t": rev_t, "rev_c": rev_c}
-        with open(SorterEngine.CONFIG_PATH, 'w') as f: json.dump(favs, f, indent=4)
-
-    @staticmethod
-    def load_favorites():
-        if os.path.exists(SorterEngine.CONFIG_PATH):
-            try:
-                with open(SorterEngine.CONFIG_PATH, 'r') as f: return json.load(f)
-            except: return {}
-        return {}
 
     @staticmethod
     def compress_for_web(path, quality):