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

Update tab_category_sorter.py

Browse Source
This commit is contained in:
Ethanfel
2026-01-17 15:49:59 +01:00
parent 5c469f94da
commit a61f7ee763
1 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
tab_category_sorter.py
View File

@@ -3,7 +3,6 @@ import os, shutil
from engine import SorterEngine from engine import SorterEngine
def render(path_s, path_o, quality, naming_mode): def render(path_s, path_o, quality, naming_mode):
# Validation of paths
if not path_s or not os.path.exists(path_s): if not path_s or not os.path.exists(path_s):
st.warning("Please provide a valid Source Folder path.") st.warning("Please provide a valid Source Folder path.")
return return
@@ -11,19 +10,15 @@ def render(path_s, path_o, quality, naming_mode):
st.warning("Please provide a Category Output folder.") st.warning("Please provide a Category Output folder.")
return return
# --- 1. Category Management Tools --- # --- 1. Category Management Tools (Expander) ---
with st.expander("🛠️ Category & Folder Management"): with st.expander("🛠️ Bulk Sync & Folder Renaming"):
# Bulk Sync Tool
st.write("### Sync Existing Folders")
if st.button("🔄 Import Subfolders from Disk as Categories"): if st.button("🔄 Import Subfolders from Disk as Categories"):
added = SorterEngine.sync_categories_from_disk(path_o) added = SorterEngine.sync_categories_from_disk(path_o)
st.success(f"Added {added} new category buttons based on your folders!") st.success(f"Added {added} new categories!")
st.rerun() st.rerun()
st.divider() st.divider()
# Physical Rename Tool
st.write("### Rename Category & Folder")
categories = SorterEngine.get_categories() categories = SorterEngine.get_categories()
col_ren1, col_ren2 = st.columns(2) col_ren1, col_ren2 = st.columns(2)
old_cat = col_ren1.selectbox("Folder to Rename", ["Select..."] + categories) old_cat = col_ren1.selectbox("Folder to Rename", ["Select..."] + categories)
@@ -32,22 +27,19 @@ def render(path_s, path_o, quality, naming_mode):
if st.button("Apply Rename on Disk & Database"): if st.button("Apply Rename on Disk & Database"):
if old_cat != "Select..." and new_cat_name: if old_cat != "Select..." and new_cat_name:
SorterEngine.rename_category(old_cat, new_cat_name, path_o) SorterEngine.rename_category(old_cat, new_cat_name, path_o)
st.success(f"Successfully moved folder and updated buttons: {old_cat} -> {new_cat_name}")
st.rerun() st.rerun()
st.divider() st.divider()
# --- 2. Image Discovery --- # --- 2. Image Discovery ---
# Toggle for Recursive Scanning
recursive = st.toggle("🔍 Recursive Mode (Search all subfolders)", value=True) recursive = st.toggle("🔍 Recursive Mode (Search all subfolders)", value=True)
images = SorterEngine.get_images(path_s, recursive=recursive) # images = SorterEngine.get_images(path_s, recursive=recursive)
categories = SorterEngine.get_categories() categories = SorterEngine.get_categories()
if st.session_state.idx_cat < len(images): if st.session_state.idx_cat < len(images):
curr_p = images[st.session_state.idx_cat] # Full system path curr_p = images[st.session_state.idx_cat]
curr_file = os.path.basename(curr_p) curr_file = os.path.basename(curr_p)
# 🎞️ Filmstrip Preview
st.write("### 🎞️ Filmstrip") st.write("### 🎞️ Filmstrip")
fs_cols = st.columns(7) fs_cols = st.columns(7)
for i, img_full_path in enumerate(images[st.session_state.idx_cat : st.session_state.idx_cat + 7]): for i, img_full_path in enumerate(images[st.session_state.idx_cat : st.session_state.idx_cat + 7]):
@@ -55,64 +47,46 @@ def render(path_s, path_o, quality, naming_mode):
st.divider() st.divider()
# --- 3. Main Sorting UI ---
col_img, col_btns = st.columns([2, 1]) col_img, col_btns = st.columns([2, 1])
with col_img: with col_img:
st.image(SorterEngine.compress_for_web(curr_p, quality), caption=f"Processing: {curr_file}") st.image(SorterEngine.compress_for_web(curr_p, quality), caption=f"File: {curr_file}")
st.caption(f"Source Path: {curr_p}")
with col_btns: with col_btns:
# Generate ID based on the folder specifically containing this image # --- NEW CATEGORY ADDITION (Restored) ---
folder_of_image = os.path.dirname(curr_p) new_cat_input = st.text_input("➕ Quick Add Category", key="quick_add_cat")
fid = SorterEngine.get_folder_id(folder_of_image) # if st.button("Add Category", use_container_width=True):
if new_cat_input:
SorterEngine.add_category(new_cat_input)
st.rerun()
st.divider()
fid = SorterEngine.get_folder_id(os.path.dirname(curr_p))
st.write(f"**Folder ID:** `{fid}`") st.write(f"**Folder ID:** `{fid}`")
# Dynamic Category Buttons # Dynamic Buttons
for cat in categories: for cat in categories:
if st.button(cat, use_container_width=True, key=f"move_{cat}"): if st.button(cat, use_container_width=True, key=f"move_{cat}"):
_, ext = os.path.splitext(curr_p) _, ext = os.path.splitext(curr_p)
# Naming logic: Original vs ID
name = curr_file if naming_mode == "original" else f"{fid}{ext}" name = curr_file if naming_mode == "original" else f"{fid}{ext}"
dst_dir = os.path.join(path_o, cat) dst_dir = os.path.join(path_o, cat)
os.makedirs(dst_dir, exist_ok=True) os.makedirs(dst_dir, exist_ok=True)
# Collision protection
count = 2
final_dst = os.path.join(dst_dir, name) final_dst = os.path.join(dst_dir, name)
count = 2
while os.path.exists(final_dst): while os.path.exists(final_dst):
root, ext = os.path.splitext(name) root, ext = os.path.splitext(name)
final_dst = os.path.join(dst_dir, f"{root}_{count}{ext}") final_dst = os.path.join(dst_dir, f"{root}_{count}{ext}")
count += 1 count += 1
shutil.move(curr_p, final_dst) shutil.move(curr_p, final_dst)
st.session_state.history.append({'type': 'cat_move', 't_src': curr_p, 't_dst': final_dst})
# Log history for the Undo button in app.py
st.session_state.history.append({
'type': 'cat_move',
't_src': curr_p,
't_dst': final_dst
})
st.toast(f"Moved to {cat}")
st.rerun() st.rerun()
st.divider() st.divider()
if st.button("⏭️ SKIP IMAGE", use_container_width=True): if st.button("⏭️ SKIP IMAGE", use_container_width=True):
st.session_state.idx_cat += 1 st.session_state.idx_cat += 1
st.rerun() st.rerun()
if st.button("🗑️ QUICK TRASH", type="primary", use_container_width=True):
# Uses the default _TRASH category from DB seed
dst_dir = os.path.join(path_o, "_TRASH")
os.makedirs(dst_dir, exist_ok=True)
final_dst = os.path.join(dst_dir, curr_file)
shutil.move(curr_p, final_dst)
st.rerun()
else: else:
st.success("All images in this workspace have been categorized!") st.success("Categorization complete.")
if st.button("Restart from Beginning"):
st.session_state.idx_cat = 0
st.rerun()