Ethanfel/sorting-sorted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update engine.py

Browse Source
This commit is contained in:
Ethanfel
2026-01-22 15:14:43 +01:00
parent 7349015177
commit 9418661be9
1 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
engine.py
View File

@@ -295,13 +295,13 @@ class SorterEngine:
return {r[0]: {"cat": r[1], "name": r[2], "marked": r[3]} for r in rows} return {r[0]: {"cat": r[1], "name": r[2], "marked": r[3]} for r in rows}
@staticmethod @staticmethod
def commit_global(output_root, cleanup_mode, operation="Copy", source_root=None): def commit_global(output_root, cleanup_mode, operation="Copy", source_root=None, profile=None):
"""Commits ALL staged files and fixes permissions.""" """Commits ALL staged files and fixes permissions."""
data = SorterEngine.get_staged_data() data = SorterEngine.get_staged_data()
# Save folder tags BEFORE processing (so we can restore them later) # Save folder tags BEFORE processing (so we can restore them later)
if source_root: if source_root:
SorterEngine.save_folder_tags(source_root) SorterEngine.save_folder_tags(source_root, profile)
conn = sqlite3.connect(SorterEngine.DB_PATH) conn = sqlite3.connect(SorterEngine.DB_PATH)
cursor = conn.cursor() cursor = conn.cursor()
@@ -569,7 +569,7 @@ class SorterEngine:
# --- 7. FOLDER TAG PERSISTENCE --- # --- 7. FOLDER TAG PERSISTENCE ---
@staticmethod @staticmethod
def save_folder_tags(folder_path): def save_folder_tags(folder_path, profile=None):
""" """
Saves current staging data associated with a folder for later restoration. Saves current staging data associated with a folder for later restoration.
Call this BEFORE clearing the staging area. Call this BEFORE clearing the staging area.
@@ -582,11 +582,22 @@ class SorterEngine:
conn = sqlite3.connect(SorterEngine.DB_PATH) conn = sqlite3.connect(SorterEngine.DB_PATH)
cursor = conn.cursor() cursor = conn.cursor()
# Ensure table exists (for existing databases) # Ensure table exists with profile column
cursor.execute('''CREATE TABLE IF NOT EXISTS folder_tags cursor.execute('''CREATE TABLE IF NOT EXISTS folder_tags
(folder_path TEXT, filename TEXT, category TEXT, tag_index INTEGER, (profile TEXT, folder_path TEXT, filename TEXT, category TEXT, tag_index INTEGER,
PRIMARY KEY (folder_path, filename))''') PRIMARY KEY (profile, folder_path, filename))''')
# Check if old schema (without profile) - migrate if needed
cursor.execute("PRAGMA table_info(folder_tags)")
columns = [row[1] for row in cursor.fetchall()]
if 'profile' not in columns:
cursor.execute("DROP TABLE folder_tags")
cursor.execute('''CREATE TABLE folder_tags
(profile TEXT, folder_path TEXT, filename TEXT, category TEXT, tag_index INTEGER,
PRIMARY KEY (profile, folder_path, filename))''')
conn.commit()
profile = profile or "Default"
saved_count = 0 saved_count = 0
for orig_path, info in staged.items(): for orig_path, info in staged.items():
# Only save tags for files that are in this folder (or subfolders) # Only save tags for files that are in this folder (or subfolders)
@@ -600,8 +611,8 @@ class SorterEngine:
tag_index = int(match.group(1)) if match else 0 tag_index = int(match.group(1)) if match else 0
cursor.execute( cursor.execute(
"INSERT OR REPLACE INTO folder_tags VALUES (?, ?, ?, ?)", "INSERT OR REPLACE INTO folder_tags VALUES (?, ?, ?, ?, ?)",
(folder_path, filename, category, tag_index) (profile, folder_path, filename, category, tag_index)
) )
saved_count += 1 saved_count += 1
@@ -610,7 +621,7 @@ class SorterEngine:
return saved_count return saved_count
@staticmethod @staticmethod
def restore_folder_tags(folder_path, all_images): def restore_folder_tags(folder_path, all_images, profile=None):
""" """
Restores previously saved tags for a folder back into the staging area. Restores previously saved tags for a folder back into the staging area.
Call this when loading/reloading a folder. Call this when loading/reloading a folder.
@@ -620,27 +631,27 @@ class SorterEngine:
conn = sqlite3.connect(SorterEngine.DB_PATH) conn = sqlite3.connect(SorterEngine.DB_PATH)
cursor = conn.cursor() cursor = conn.cursor()
# Check if table exists and has correct schema # Ensure table exists with profile column
cursor.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='folder_tags'")
if cursor.fetchone():
# Table exists - check if it has the filename column
cursor.execute("PRAGMA table_info(folder_tags)")
columns = [row[1] for row in cursor.fetchall()]
if 'filename' not in columns:
# Wrong schema - drop and recreate
cursor.execute("DROP TABLE folder_tags")
conn.commit()
# Create table with correct schema
cursor.execute('''CREATE TABLE IF NOT EXISTS folder_tags cursor.execute('''CREATE TABLE IF NOT EXISTS folder_tags
(folder_path TEXT, filename TEXT, category TEXT, tag_index INTEGER, (profile TEXT, folder_path TEXT, filename TEXT, category TEXT, tag_index INTEGER,
PRIMARY KEY (folder_path, filename))''') PRIMARY KEY (profile, folder_path, filename))''')
conn.commit()
# Get saved tags for this folder # Check if old schema (without profile) - migrate if needed
cursor.execute("PRAGMA table_info(folder_tags)")
columns = [row[1] for row in cursor.fetchall()]
if 'profile' not in columns:
cursor.execute("DROP TABLE folder_tags")
cursor.execute('''CREATE TABLE folder_tags
(profile TEXT, folder_path TEXT, filename TEXT, category TEXT, tag_index INTEGER,
PRIMARY KEY (profile, folder_path, filename))''')
conn.commit()
profile = profile or "Default"
# Get saved tags for this folder and profile
cursor.execute( cursor.execute(
"SELECT filename, category, tag_index FROM folder_tags WHERE folder_path = ?", "SELECT filename, category, tag_index FROM folder_tags WHERE profile = ? AND folder_path = ?",
(folder_path,) (profile, folder_path)
) )
saved_tags = {row[0]: {"cat": row[1], "index": row[2]} for row in cursor.fetchall()} saved_tags = {row[0]: {"cat": row[1], "index": row[2]} for row in cursor.fetchall()}
@@ -652,7 +663,6 @@ class SorterEngine:
filename_to_path = {} filename_to_path = {}
for img_path in all_images: for img_path in all_images:
fname = os.path.basename(img_path) fname = os.path.basename(img_path)
# Only map files that haven't been mapped yet (handles duplicates by using first occurrence)
if fname not in filename_to_path: if fname not in filename_to_path:
filename_to_path[fname] = img_path filename_to_path[fname] = img_path
@@ -661,7 +671,6 @@ class SorterEngine:
for filename, tag_info in saved_tags.items(): for filename, tag_info in saved_tags.items():
if filename in filename_to_path: if filename in filename_to_path:
full_path = filename_to_path[filename] full_path = filename_to_path[filename]
# Check if not already staged
cursor.execute("SELECT 1 FROM staging_area WHERE original_path = ?", (full_path,)) cursor.execute("SELECT 1 FROM staging_area WHERE original_path = ?", (full_path,))
if not cursor.fetchone(): if not cursor.fetchone():
ext = os.path.splitext(filename)[1] ext = os.path.splitext(filename)[1]