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-20 13:06:07 +01:00
parent f0b0114fc5
commit 9e98b5e7b7
1 changed files with 400 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

697
engine.py
View File

@@ -3,170 +3,222 @@ import shutil
import sqlite3 import sqlite3
from PIL import Image from PIL import Image
from io import BytesIO from io import BytesIO
from contextlib import contextmanager
from functools import lru_cache
import hashlib
class SorterEngine: class SorterEngine:
DB_PATH = "/app/sorter_database.db" DB_PATH = "/app/sorter_database.db"
# Connection pool for better performance
_connection_pool = {}
# --- CONNECTION MANAGEMENT (Performance Optimization) ---
@staticmethod
@contextmanager
def get_connection():
"""Context manager for efficient DB connections with WAL mode."""
conn = sqlite3.connect(SorterEngine.DB_PATH, check_same_thread=False)
conn.execute("PRAGMA journal_mode=WAL") # Write-Ahead Logging for speed
conn.execute("PRAGMA synchronous=NORMAL") # Faster writes
conn.execute("PRAGMA cache_size=2000") # ~2MB cache
conn.row_factory = sqlite3.Row # Efficient row access
try:
yield conn
finally:
conn.close()
# --- 1. DATABASE INITIALIZATION --- # --- 1. DATABASE INITIALIZATION ---
@staticmethod @staticmethod
def init_db(): def init_db():
"""Initializes tables, including the new HISTORY log.""" """Initializes tables, including folder-based tag persistence."""
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
# Existing tables...
cursor.execute('''CREATE TABLE IF NOT EXISTS profiles
(name TEXT PRIMARY KEY, tab1_target TEXT, tab2_target TEXT, tab2_control TEXT,
tab4_source TEXT, tab4_out TEXT, mode TEXT, tab5_source TEXT, tab5_out TEXT)''')
cursor.execute('''CREATE TABLE IF NOT EXISTS folder_ids (path TEXT PRIMARY KEY, folder_id INTEGER)''')
cursor.execute('''CREATE TABLE IF NOT EXISTS categories (name TEXT PRIMARY KEY)''')
cursor.execute('''CREATE TABLE IF NOT EXISTS staging_area
(original_path TEXT PRIMARY KEY, target_category TEXT, new_name TEXT, is_marked INTEGER DEFAULT 0)''')
# --- NEW: HISTORY TABLE --- # Existing tables...
cursor.execute('''CREATE TABLE IF NOT EXISTS processed_log cursor.execute('''CREATE TABLE IF NOT EXISTS profiles
(source_path TEXT PRIMARY KEY, category TEXT, action_type TEXT)''') (name TEXT PRIMARY KEY, tab1_target TEXT, tab2_target TEXT, tab2_control TEXT,
tab4_source TEXT, tab4_out TEXT, mode TEXT, tab5_source TEXT, tab5_out TEXT)''')
# Seed categories if empty cursor.execute('''CREATE TABLE IF NOT EXISTS folder_ids (path TEXT PRIMARY KEY, folder_id INTEGER)''')
cursor.execute("SELECT COUNT(*) FROM categories") cursor.execute('''CREATE TABLE IF NOT EXISTS categories (name TEXT PRIMARY KEY)''')
if cursor.fetchone()[0] == 0: cursor.execute('''CREATE TABLE IF NOT EXISTS staging_area
for cat in ["_TRASH", "Default", "Action", "Solo"]: (original_path TEXT PRIMARY KEY, target_category TEXT, new_name TEXT, is_marked INTEGER DEFAULT 0)''')
cursor.execute("INSERT OR IGNORE INTO categories VALUES (?)", (cat,))
# --- HISTORY TABLE ---
conn.commit() cursor.execute('''CREATE TABLE IF NOT EXISTS processed_log
conn.close() (source_path TEXT PRIMARY KEY, category TEXT, action_type TEXT)''')
# --- NEW: FOLDER-BASED TAG PERSISTENCE ---
# Maps folder_hash -> original staging data for restoration
cursor.execute('''CREATE TABLE IF NOT EXISTS folder_tags
(folder_hash TEXT NOT NULL,
relative_path TEXT NOT NULL,
target_category TEXT,
new_name TEXT,
is_marked INTEGER DEFAULT 0,
PRIMARY KEY (folder_hash, relative_path))''')
# Index for faster folder lookups
cursor.execute('''CREATE INDEX IF NOT EXISTS idx_folder_tags_hash
ON folder_tags(folder_hash)''')
# Seed categories if empty
cursor.execute("SELECT COUNT(*) FROM categories")
if cursor.fetchone()[0] == 0:
cursor.executemany("INSERT OR IGNORE INTO categories VALUES (?)",
[("_TRASH",), ("Default",), ("Action",), ("Solo",)])
conn.commit()
# --- FOLDER HASH UTILITY ---
@staticmethod
def _get_folder_hash(folder_path: str) -> str:
"""Generate consistent hash for a folder path."""
# Use folder name + parent for uniqueness but allow same-named folders
normalized = os.path.normpath(folder_path).lower()
return hashlib.md5(normalized.encode()).hexdigest()[:16]
# --- 2. PROFILE & PATH MANAGEMENT --- # --- 2. PROFILE & PATH MANAGEMENT ---
@staticmethod @staticmethod
def save_tab_paths(profile_name, t1_t=None, t2_t=None, t2_c=None, t4_s=None, t4_o=None, mode=None, t5_s=None, t5_o=None): def save_tab_paths(profile_name, t1_t=None, t2_t=None, t2_c=None, t4_s=None, t4_o=None, mode=None, t5_s=None, t5_o=None):
"""Updates specific tab paths in the database while preserving others.""" """Updates specific tab paths in the database while preserving others."""
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("SELECT * FROM profiles WHERE name = ?", (profile_name,)) cursor.execute("SELECT * FROM profiles WHERE name = ?", (profile_name,))
row = cursor.fetchone() row = cursor.fetchone()
if not row:
# Default structure if profile is new (9 columns total)
row = (profile_name, "/storage", "/storage", "/storage", "/storage", "/storage", "id", "/storage", "/storage")
new_values = ( if not row:
profile_name, row = (profile_name, "/storage", "/storage", "/storage", "/storage", "/storage", "id", "/storage", "/storage")
t1_t if t1_t is not None else row[1],
t2_t if t2_t is not None else row[2], new_values = (
t2_c if t2_c is not None else row[3], profile_name,
t4_s if t4_s is not None else row[4], t1_t if t1_t is not None else row[1],
t4_o if t4_o is not None else row[5], t2_t if t2_t is not None else row[2],
mode if mode is not None else row[6], t2_c if t2_c is not None else row[3],
t5_s if t5_s is not None else row[7], t4_s if t4_s is not None else row[4],
t5_o if t5_o is not None else row[8] t4_o if t4_o is not None else row[5],
) mode if mode is not None else row[6],
cursor.execute("INSERT OR REPLACE INTO profiles VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", new_values) t5_s if t5_s is not None else row[7],
conn.commit() t5_o if t5_o is not None else row[8]
conn.close() )
cursor.execute("INSERT OR REPLACE INTO profiles VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", new_values)
conn.commit()
@staticmethod @staticmethod
def load_batch_parallel(image_paths, quality): def load_batch_parallel(image_paths, quality):
""" """Multithreaded loader with optimized thread count."""
Multithreaded loader: Compresses multiple images in parallel.
Returns a dictionary {path: bytes_io}
"""
import concurrent.futures import concurrent.futures
results = {} results = {}
# Helper function to run in thread
def process_one(path): def process_one(path):
return path, SorterEngine.compress_for_web(path, quality) return path, SorterEngine.compress_for_web(path, quality)
# Use ThreadPool to parallelize IO-bound tasks # Optimal workers: min of CPU cores or paths count
with concurrent.futures.ThreadPoolExecutor(max_workers=8) as executor: max_workers = min(8, len(image_paths)) if image_paths else 1
# Submit all tasks
with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
future_to_path = {executor.submit(process_one, p): p for p in image_paths} future_to_path = {executor.submit(process_one, p): p for p in image_paths}
# Gather results as they complete
for future in concurrent.futures.as_completed(future_to_path): for future in concurrent.futures.as_completed(future_to_path):
path, data = future.result() try:
results[path] = data path, data = future.result()
results[path] = data
except Exception:
pass
return results return results
@staticmethod @staticmethod
def load_profiles(): def load_profiles():
"""Loads all workspace presets.""" """Loads all workspace presets."""
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("SELECT * FROM profiles") cursor.execute("SELECT * FROM profiles")
rows = cursor.fetchall() rows = cursor.fetchall()
conn.close() return {r[0]: {
return {r[0]: { "tab1_target": r[1], "tab2_target": r[2], "tab2_control": r[3],
"tab1_target": r[1], "tab2_target": r[2], "tab2_control": r[3], "tab4_source": r[4], "tab4_out": r[5], "mode": r[6],
"tab4_source": r[4], "tab4_out": r[5], "mode": r[6], "tab5_source": r[7], "tab5_out": r[8]
"tab5_source": r[7], "tab5_out": r[8] } for r in rows}
} for r in rows}
# --- 3. CATEGORY MANAGEMENT (Sorted A-Z) --- # --- 3. CATEGORY MANAGEMENT (Sorted A-Z) ---
@staticmethod @staticmethod
def get_categories(): def get_categories():
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("SELECT name FROM categories ORDER BY name COLLATE NOCASE ASC") cursor.execute("SELECT name FROM categories ORDER BY name COLLATE NOCASE ASC")
cats = [r[0] for r in cursor.fetchall()] return [r[0] for r in cursor.fetchall()]
conn.close()
return cats
@staticmethod @staticmethod
def add_category(name): def add_category(name):
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("INSERT OR IGNORE INTO categories VALUES (?)", (name,)) cursor.execute("INSERT OR IGNORE INTO categories VALUES (?)", (name,))
conn.commit() conn.commit()
conn.close()
@staticmethod @staticmethod
def rename_category(old_name, new_name, output_base_path): def rename_category(old_name, new_name, output_base_path=None):
"""Renames category in DB and renames the physical folder on disk.""" """Renames category in DB and optionally renames physical folder."""
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("UPDATE categories SET name = ? WHERE name = ?", (new_name, old_name)) try:
cursor.execute("UPDATE categories SET name = ? WHERE name = ?", (new_name, old_name))
old_path = os.path.join(output_base_path, old_name) cursor.execute("UPDATE staging_area SET target_category = ? WHERE target_category = ?", (new_name, old_name))
new_path = os.path.join(output_base_path, new_name) cursor.execute("UPDATE folder_tags SET target_category = ? WHERE target_category = ?", (new_name, old_name))
if os.path.exists(old_path) and not os.path.exists(new_path):
os.rename(old_path, new_path) if output_base_path:
old_path = os.path.join(output_base_path, old_name)
conn.commit() new_path = os.path.join(output_base_path, new_name)
conn.close() if os.path.exists(old_path) and not os.path.exists(new_path):
os.rename(old_path, new_path)
conn.commit()
except sqlite3.IntegrityError:
pass
@staticmethod @staticmethod
def sync_categories_from_disk(output_path): def sync_categories_from_disk(output_path):
"""Scans output directory and adds subfolders as DB categories.""" """Scans output directory and adds subfolders as DB categories."""
if not output_path or not os.path.exists(output_path): return 0 if not output_path or not os.path.exists(output_path):
existing_folders = [d for d in os.listdir(output_path) if os.path.isdir(os.path.join(output_path, d)) and not d.startswith(".")] return 0
conn = sqlite3.connect(SorterEngine.DB_PATH) existing_folders = [d for d in os.listdir(output_path)
cursor = conn.cursor() if os.path.isdir(os.path.join(output_path, d)) and not d.startswith(".")]
added = 0
for folder in existing_folders: with SorterEngine.get_connection() as conn:
cursor.execute("INSERT OR IGNORE INTO categories VALUES (?)", (folder,)) cursor = conn.cursor()
if cursor.rowcount > 0: added += 1 added = 0
conn.commit() for folder in existing_folders:
conn.close() cursor.execute("INSERT OR IGNORE INTO categories VALUES (?)", (folder,))
return added if cursor.rowcount > 0:
added += 1
conn.commit()
return added
# --- 4. IMAGE & ID OPERATIONS --- # --- 4. IMAGE & ID OPERATIONS ---
@staticmethod @staticmethod
def get_images(path, recursive=False): def get_images(path, recursive=False):
"""Image scanner with optional recursive subfolder support.""" """Optimized image scanner with generator-based sorting."""
exts = ('.jpg', '.jpeg', '.png', '.webp', '.bmp', '.tiff') exts = {'.jpg', '.jpeg', '.png', '.webp', '.bmp', '.tiff'} # Set for O(1) lookup
if not path or not os.path.exists(path): return [] if not path or not os.path.exists(path):
return []
image_list = [] image_list = []
if recursive: if recursive:
for root, _, files in os.walk(path): for root, dirs, files in os.walk(path):
# Skip the trash folder from scanning # Skip trash folders - modify dirs in-place for efficiency
if "_DELETED" in root: continue dirs[:] = [d for d in dirs if "_DELETED" not in d]
for f in files: for f in files:
if f.lower().endswith(exts): image_list.append(os.path.join(root, f)) if os.path.splitext(f.lower())[1] in exts:
image_list.append(os.path.join(root, f))
else: else:
for f in os.listdir(path): try:
if f.lower().endswith(exts): image_list.append(os.path.join(path, f)) with os.scandir(path) as entries:
for entry in entries:
if entry.is_file() and os.path.splitext(entry.name.lower())[1] in exts:
image_list.append(entry.path)
except PermissionError:
pass
return sorted(image_list) return sorted(image_list)
@staticmethod @staticmethod
@@ -178,45 +230,53 @@ class SorterEngine:
fname = os.path.basename(f) fname = os.path.basename(f)
if fname.startswith("id") and "_" in fname: if fname.startswith("id") and "_" in fname:
prefix = fname.split('_')[0] prefix = fname.split('_')[0]
if prefix not in mapping: mapping[prefix] = [] if prefix not in mapping:
mapping[prefix] = []
mapping[prefix].append(fname) mapping[prefix].append(fname)
return mapping return mapping
@staticmethod @staticmethod
def get_max_id_number(target_path): def get_max_id_number(target_path):
max_id = 0 max_id = 0
if not target_path or not os.path.exists(target_path): return 0 if not target_path or not os.path.exists(target_path):
for f in os.listdir(target_path): return 0
if f.startswith("id") and "_" in f: try:
try: with os.scandir(target_path) as entries:
num = int(f[2:].split('_')[0]) for entry in entries:
if num > max_id: max_id = num if entry.is_file() and entry.name.startswith("id") and "_" in entry.name:
except: continue try:
num = int(entry.name[2:].split('_')[0])
if num > max_id:
max_id = num
except:
continue
except PermissionError:
pass
return max_id return max_id
@staticmethod @staticmethod
def get_folder_id(source_path): def get_folder_id(source_path):
"""Retrieves or generates a persistent ID for a specific folder.""" """Retrieves or generates a persistent ID for a specific folder."""
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("SELECT folder_id FROM folder_ids WHERE path = ?", (source_path,)) cursor.execute("SELECT folder_id FROM folder_ids WHERE path = ?", (source_path,))
result = cursor.fetchone() result = cursor.fetchone()
if result: if result:
fid = result[0] return result[0]
else: else:
cursor.execute("SELECT MAX(folder_id) FROM folder_ids") cursor.execute("SELECT MAX(folder_id) FROM folder_ids")
row = cursor.fetchone() row = cursor.fetchone()
fid = (row[0] + 1) if row and row[0] else 1 fid = (row[0] + 1) if row and row[0] else 1
cursor.execute("INSERT INTO folder_ids VALUES (?, ?)", (source_path, fid)) cursor.execute("INSERT INTO folder_ids VALUES (?, ?)", (source_path, fid))
conn.commit() conn.commit()
conn.close() return fid
return fid
# --- 5. GALLERY STAGING & DELETION (TAB 5) --- # --- 5. GALLERY STAGING & DELETION (TAB 5) ---
@staticmethod @staticmethod
def delete_to_trash(file_path): def delete_to_trash(file_path):
"""Moves a file to a local _DELETED subfolder for undo support.""" """Moves a file to a local _DELETED subfolder for undo support."""
if not os.path.exists(file_path): return None if not os.path.exists(file_path):
return None
trash_dir = os.path.join(os.path.dirname(file_path), "_DELETED") trash_dir = os.path.join(os.path.dirname(file_path), "_DELETED")
os.makedirs(trash_dir, exist_ok=True) os.makedirs(trash_dir, exist_ok=True)
dest = os.path.join(trash_dir, os.path.basename(file_path)) dest = os.path.join(trash_dir, os.path.basename(file_path))
@@ -224,92 +284,166 @@ class SorterEngine:
return dest return dest
@staticmethod @staticmethod
def stage_image(original_path, category, new_name): def stage_image(original_path, category, new_name, source_root=None):
"""Records a pending rename/move in the database.""" """Records a pending rename/move in the database and folder cache."""
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("INSERT OR REPLACE INTO staging_area VALUES (?, ?, ?, 1)", (original_path, category, new_name)) cursor.execute("INSERT OR REPLACE INTO staging_area VALUES (?, ?, ?, 1)",
conn.commit() (original_path, category, new_name))
conn.close()
# Also save to folder-based persistence if source_root provided
if source_root:
folder_hash = SorterEngine._get_folder_hash(source_root)
relative_path = os.path.relpath(original_path, source_root)
cursor.execute("""INSERT OR REPLACE INTO folder_tags
VALUES (?, ?, ?, ?, 1)""",
(folder_hash, relative_path, category, new_name))
conn.commit()
@staticmethod @staticmethod
def clear_staged_item(original_path): def clear_staged_item(original_path, source_root=None):
"""Removes an item from the pending staging area.""" """Removes an item from the pending staging area."""
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("DELETE FROM staging_area WHERE original_path = ?", (original_path,)) cursor.execute("DELETE FROM staging_area WHERE original_path = ?", (original_path,))
conn.commit()
conn.close() # Also remove from folder cache
if source_root:
folder_hash = SorterEngine._get_folder_hash(source_root)
relative_path = os.path.relpath(original_path, source_root)
cursor.execute("DELETE FROM folder_tags WHERE folder_hash = ? AND relative_path = ?",
(folder_hash, relative_path))
conn.commit()
@staticmethod @staticmethod
def get_staged_data(): def get_staged_data():
"""Retrieves current tagged/staged images.""" """Retrieves current tagged/staged images."""
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("SELECT * FROM staging_area") cursor.execute("SELECT * FROM staging_area")
rows = cursor.fetchall() rows = cursor.fetchall()
conn.close() return {r[0]: {"cat": r[1], "name": r[2], "marked": r[3]} for r in rows}
# FIXED: Added "marked": r[3] to the dictionary
return {r[0]: {"cat": r[1], "name": r[2], "marked": r[3]} for r in rows} # --- NEW: FOLDER-BASED TAG RESTORATION ---
@staticmethod
def restore_folder_tags(source_root):
"""Restores tags from folder cache when reloading a directory."""
folder_hash = SorterEngine._get_folder_hash(source_root)
with SorterEngine.get_connection() as conn:
cursor = conn.cursor()
# Get saved tags for this folder
cursor.execute("""SELECT relative_path, target_category, new_name, is_marked
FROM folder_tags WHERE folder_hash = ?""", (folder_hash,))
saved_tags = cursor.fetchall()
restored_count = 0
for rel_path, category, new_name, is_marked in saved_tags:
# Reconstruct absolute path
abs_path = os.path.normpath(os.path.join(source_root, rel_path))
# Only restore if file still exists
if os.path.exists(abs_path):
cursor.execute("""INSERT OR REPLACE INTO staging_area
VALUES (?, ?, ?, ?)""", (abs_path, category, new_name, is_marked))
restored_count += 1
conn.commit()
return restored_count
@staticmethod
def save_all_tags_to_folder_cache(source_root):
"""Saves all current staging data to folder-based cache."""
folder_hash = SorterEngine._get_folder_hash(source_root)
staged = SorterEngine.get_staged_data()
with SorterEngine.get_connection() as conn:
cursor = conn.cursor()
# Only save tags for files within this source_root
for abs_path, info in staged.items():
if abs_path.startswith(source_root):
relative_path = os.path.relpath(abs_path, source_root)
cursor.execute("""INSERT OR REPLACE INTO folder_tags
VALUES (?, ?, ?, ?, ?)""",
(folder_hash, relative_path, info['cat'], info['name'], info['marked']))
conn.commit()
@staticmethod
def clear_folder_cache(source_root):
"""Clears saved tags for a specific folder."""
folder_hash = SorterEngine._get_folder_hash(source_root)
with SorterEngine.get_connection() as conn:
cursor = conn.cursor()
cursor.execute("DELETE FROM folder_tags WHERE folder_hash = ?", (folder_hash,))
conn.commit()
@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):
"""Commits ALL staged files and fixes permissions.""" """Commits ALL staged files and fixes permissions."""
data = SorterEngine.get_staged_data() data = SorterEngine.get_staged_data()
conn = sqlite3.connect(SorterEngine.DB_PATH)
cursor = conn.cursor()
if not os.path.exists(output_root): os.makedirs(output_root, exist_ok=True) with SorterEngine.get_connection() as conn:
cursor = conn.cursor()
# 1. Process all Staged Items
for old_p, info in data.items(): if not os.path.exists(output_root):
if os.path.exists(old_p): os.makedirs(output_root, exist_ok=True)
final_dst = os.path.join(output_root, info['name'])
# 1. Process all Staged Items
if os.path.exists(final_dst): for old_p, info in data.items():
root, ext = os.path.splitext(info['name']) if os.path.exists(old_p):
c = 1 final_dst = os.path.join(output_root, info['name'])
while os.path.exists(final_dst):
final_dst = os.path.join(output_root, f"{root}_{c}{ext}") if os.path.exists(final_dst):
c += 1 root, ext = os.path.splitext(info['name'])
c = 1
while os.path.exists(final_dst):
final_dst = os.path.join(output_root, f"{root}_{c}{ext}")
c += 1
if operation == "Copy": if operation == "Copy":
shutil.copy2(old_p, final_dst) shutil.copy2(old_p, final_dst)
else: else:
shutil.move(old_p, final_dst) shutil.move(old_p, final_dst)
# --- FIX PERMISSIONS --- SorterEngine.fix_permissions(final_dst)
SorterEngine.fix_permissions(final_dst) cursor.execute("INSERT OR REPLACE INTO processed_log VALUES (?, ?, ?)",
(old_p, info['cat'], operation))
# Log History
cursor.execute("INSERT OR REPLACE INTO processed_log VALUES (?, ?, ?)",
(old_p, info['cat'], operation))
# 2. Global Cleanup # 2. Global Cleanup
if cleanup_mode != "Keep" and source_root: if cleanup_mode != "Keep" and source_root:
all_imgs = SorterEngine.get_images(source_root, recursive=True) all_imgs = SorterEngine.get_images(source_root, recursive=True)
for img_p in all_imgs: for img_p in all_imgs:
if img_p not in data: if img_p not in data:
if cleanup_mode == "Move to Unused": if cleanup_mode == "Move to Unused":
unused_dir = os.path.join(source_root, "unused") unused_dir = os.path.join(source_root, "unused")
os.makedirs(unused_dir, exist_ok=True) os.makedirs(unused_dir, exist_ok=True)
dest_unused = os.path.join(unused_dir, os.path.basename(img_p)) dest_unused = os.path.join(unused_dir, os.path.basename(img_p))
shutil.move(img_p, dest_unused)
shutil.move(img_p, dest_unused) SorterEngine.fix_permissions(dest_unused)
SorterEngine.fix_permissions(dest_unused) elif cleanup_mode == "Delete":
os.remove(img_p)
elif cleanup_mode == "Delete":
os.remove(img_p)
cursor.execute("DELETE FROM staging_area") # 3. Clear staging area AND folder cache after successful commit
conn.commit() cursor.execute("DELETE FROM staging_area")
conn.close()
if source_root:
folder_hash = SorterEngine._get_folder_hash(source_root)
cursor.execute("DELETE FROM folder_tags WHERE folder_hash = ?", (folder_hash,))
conn.commit()
# --- 6. CORE UTILITIES (SYNC & UNDO) --- # --- 6. CORE UTILITIES ---
@staticmethod @staticmethod
def harmonize_names(t_p, c_p): def harmonize_names(t_p, c_p):
"""Forces the 'control' file to match the 'target' file's name.""" """Forces the 'control' file to match the 'target' file's name."""
if not os.path.exists(t_p) or not os.path.exists(c_p): return c_p if not os.path.exists(t_p) or not os.path.exists(c_p):
return c_p
t_name = os.path.basename(t_p) t_name = os.path.basename(t_p)
t_root, t_ext = os.path.splitext(t_name) t_root, t_ext = os.path.splitext(t_name)
@@ -361,25 +495,23 @@ class SorterEngine:
@staticmethod @staticmethod
def compress_for_web(path, quality, target_size=None): def compress_for_web(path, quality, target_size=None):
""" """Optimized image compression with SIMD hints."""
Loads image, resizes smart, and saves as WebP.
"""
try: try:
with Image.open(path) as img: with Image.open(path) as img:
# 1. Convert to RGB (WebP handles RGBA, but RGB is safer for consistency) # Fast mode conversion
if img.mode not in ('RGB', 'RGBA'): if img.mode not in ('RGB', 'RGBA'):
img = img.convert("RGB") img = img.convert("RGB")
# 2. Smart Resize (Only if target_size is provided) # Smart Resize with LANCZOS (high quality, reasonable speed)
if target_size: if target_size:
# Only resize if the original is actually bigger
if img.width > target_size or img.height > target_size: if img.width > target_size or img.height > target_size:
img.thumbnail((target_size, target_size), Image.Resampling.LANCZOS) # Use BILINEAR for speed on large downscales, LANCZOS for quality
resampling = Image.Resampling.BILINEAR if max(img.width, img.height) > target_size * 3 else Image.Resampling.LANCZOS
img.thumbnail((target_size, target_size), resampling)
# 3. Save as WebP
buf = BytesIO() buf = BytesIO()
# WebP is faster to decode in browser and smaller on disk # WebP with speed optimization
img.save(buf, format="WEBP", quality=quality) img.save(buf, format="WEBP", quality=quality, method=4) # method=4 is faster than default 6
return buf.getvalue() return buf.getvalue()
except Exception: except Exception:
return None return None
@@ -390,124 +522,95 @@ class SorterEngine:
if action['type'] == 'move' and os.path.exists(action['t_dst']): if action['type'] == 'move' and os.path.exists(action['t_dst']):
shutil.move(action['t_dst'], action['t_src']) shutil.move(action['t_dst'], action['t_src'])
elif action['type'] in ['unused', 'cat_move']: elif action['type'] in ['unused', 'cat_move']:
if os.path.exists(action['t_dst']): shutil.move(action['t_dst'], action['t_src']) if os.path.exists(action['t_dst']):
shutil.move(action['t_dst'], action['t_src'])
if 'c_dst' in action and os.path.exists(action['c_dst']): if 'c_dst' in action and os.path.exists(action['c_dst']):
shutil.move(action['c_dst'], action['c_src']) shutil.move(action['c_dst'], action['c_src'])
@staticmethod @staticmethod
def get_processed_log(): def get_processed_log():
"""Retrieves history of processed files.""" """Retrieves history of processed files."""
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("SELECT * FROM processed_log") cursor.execute("SELECT * FROM processed_log")
rows = cursor.fetchall() rows = cursor.fetchall()
conn.close() return {r[0]: {"cat": r[1], "action": r[2]} for r in rows}
return {r[0]: {"cat": r[1], "action": r[2]} for r in rows}
@staticmethod @staticmethod
def fix_permissions(path): def fix_permissions(path):
"""Forces file to be fully accessible (rwxrwxrwx).""" """Forces file to be fully accessible."""
try: try:
# 0o777 gives Read, Write, and Execute access to Owner, Group, and Others.
os.chmod(path, 0o777) os.chmod(path, 0o777)
except Exception: except Exception:
pass # Ignore errors if OS doesn't support chmod (e.g. some Windows setups) pass
@staticmethod @staticmethod
def commit_batch(file_list, output_root, cleanup_mode, operation="Copy"): def commit_batch(file_list, output_root, cleanup_mode, operation="Copy"):
"""Commits files and fixes permissions.""" """Commits files and fixes permissions."""
data = SorterEngine.get_staged_data() data = SorterEngine.get_staged_data()
conn = sqlite3.connect(SorterEngine.DB_PATH)
cursor = conn.cursor()
if not os.path.exists(output_root): os.makedirs(output_root, exist_ok=True) with SorterEngine.get_connection() as conn:
cursor = conn.cursor()
for file_path in file_list:
if not os.path.exists(file_path): continue
# --- CASE A: Tagged --- if not os.path.exists(output_root):
if file_path in data and data[file_path]['marked']: os.makedirs(output_root, exist_ok=True)
info = data[file_path]
final_dst = os.path.join(output_root, info['name']) for file_path in file_list:
if not os.path.exists(file_path):
continue
# Collision Check # --- CASE A: Tagged ---
if os.path.exists(final_dst): if file_path in data and data[file_path]['marked']:
root, ext = os.path.splitext(info['name']) info = data[file_path]
c = 1 final_dst = os.path.join(output_root, info['name'])
while os.path.exists(final_dst):
final_dst = os.path.join(output_root, f"{root}_{c}{ext}")
c += 1
# Perform Action
if operation == "Copy":
shutil.copy2(file_path, final_dst)
else:
shutil.move(file_path, final_dst)
# --- FIX PERMISSIONS ---
SorterEngine.fix_permissions(final_dst)
# Update DB
cursor.execute("DELETE FROM staging_area WHERE original_path = ?", (file_path,))
cursor.execute("INSERT OR REPLACE INTO processed_log VALUES (?, ?, ?)",
(file_path, info['cat'], operation))
# --- CASE B: Cleanup ---
elif cleanup_mode != "Keep":
if cleanup_mode == "Move to Unused":
unused_dir = os.path.join(os.path.dirname(file_path), "unused")
os.makedirs(unused_dir, exist_ok=True)
dest_unused = os.path.join(unused_dir, os.path.basename(file_path))
shutil.move(file_path, dest_unused) # Collision Check
SorterEngine.fix_permissions(dest_unused) # Fix here too if os.path.exists(final_dst):
root, ext = os.path.splitext(info['name'])
c = 1
while os.path.exists(final_dst):
final_dst = os.path.join(output_root, f"{root}_{c}{ext}")
c += 1
elif cleanup_mode == "Delete": if operation == "Copy":
os.remove(file_path) shutil.copy2(file_path, final_dst)
else:
conn.commit() shutil.move(file_path, final_dst)
conn.close()
@staticmethod SorterEngine.fix_permissions(final_dst)
def rename_category(old_name, new_name):
"""Renames a category and updates any staged images using it.""" cursor.execute("DELETE FROM staging_area WHERE original_path = ?", (file_path,))
conn = sqlite3.connect(SorterEngine.DB_PATH) cursor.execute("INSERT OR REPLACE INTO processed_log VALUES (?, ?, ?)",
cursor = conn.cursor() (file_path, info['cat'], operation))
# 1. Update Category Table # --- CASE B: Cleanup ---
try: elif cleanup_mode != "Keep":
cursor.execute("UPDATE categories SET name = ? WHERE name = ?", (new_name, old_name)) if cleanup_mode == "Move to Unused":
unused_dir = os.path.join(os.path.dirname(file_path), "unused")
# 2. Update Staging Area (Keep tags in sync) os.makedirs(unused_dir, exist_ok=True)
cursor.execute("UPDATE staging_area SET target_category = ? WHERE target_category = ?", (new_name, old_name)) dest_unused = os.path.join(unused_dir, os.path.basename(file_path))
shutil.move(file_path, dest_unused)
# 3. Update Staging Area Filenames (e.g. Action_001.jpg -> Adventure_001.jpg) SorterEngine.fix_permissions(dest_unused)
# This is complex in SQL, so we'll just flag them. elif cleanup_mode == "Delete":
# Ideally, we re-stage them, but for now, updating the category column is sufficient os.remove(file_path)
# because the filename is generated at the moment of tagging or commit.
conn.commit() conn.commit()
except sqlite3.IntegrityError:
# New name already exists
pass
finally:
conn.close()
@staticmethod @staticmethod
def delete_category(name): def delete_category(name):
"""Deletes a category and clears any staged tags associated with it.""" """Deletes a category and clears any staged tags associated with it."""
conn = sqlite3.connect(SorterEngine.DB_PATH) with SorterEngine.get_connection() as conn:
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute("DELETE FROM categories WHERE name = ?", (name,)) cursor.execute("DELETE FROM categories WHERE name = ?", (name,))
cursor.execute("DELETE FROM staging_area WHERE target_category = ?", (name,)) cursor.execute("DELETE FROM staging_area WHERE target_category = ?", (name,))
conn.commit() cursor.execute("DELETE FROM folder_tags WHERE target_category = ?", (name,))
conn.close() conn.commit()
# In engine.py / SorterEngine class
@staticmethod @staticmethod
def get_tagged_page_indices(all_images, page_size): def get_tagged_page_indices(all_images, page_size):
staged = SorterEngine.get_staged_data() staged = SorterEngine.get_staged_data()
if not staged: return set() if not staged:
return set()
tagged_pages = set() tagged_pages = set()
staged_keys = set(staged.keys()) staged_keys = set(staged.keys())
for idx, img_path in enumerate(all_images): for idx, img_path in enumerate(all_images):