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

Update tab_gallery_sorter.py

Browse Source
This commit is contained in:
Ethanfel
2026-01-18 21:53:59 +01:00
parent a34da3125d
commit 9fe207f8ca
1 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
tab_gallery_sorter.py
View File

@@ -3,7 +3,14 @@ import os
from engine import SorterEngine
@st.fragment
def gallery_grid(images, staged, quality, selected_cat):
def gallery_grid(images, quality, selected_cat):
"""
FRAGMENT: Handles the grid display.
CRITICAL FIX: Fetches 'staged' data INSIDE the function so updates appear immediately.
"""
# 1. Fetch fresh data every time the fragment re-runs
staged = SorterEngine.get_staged_data()
cols = st.columns(4)
for idx, img_path in enumerate(images):
with cols[idx % 4]:
@@ -13,57 +20,77 @@ def gallery_grid(images, staged, quality, selected_cat):
# Header: Name and Delete X
c_name, c_del = st.columns([5, 1])
c_name.caption(os.path.basename(img_path)[:20])
if c_del.button("❌", key=f"del_{idx}"):
# Delete Button
if c_del.button("❌", key=f"del_{idx}", help="Move to _DELETED"):
trash_p = SorterEngine.delete_to_trash(img_path)
st.session_state.history.append({'type': 'move', 't_src': img_path, 't_dst': trash_p})
st.rerun()
st.rerun() # Re-runs the fragment to remove the image
# Visual tag indicator
# Visual Tag Indicator (Green Text)
if is_staged:
st.success(f"Tagged: {staged[img_path]['cat']}")
# Image
img_data = SorterEngine.compress_for_web(img_path, quality)
if img_data:
st.image(img_data, use_container_width=True)
# Simplified Button
# Tag / Untag Logic
if not is_staged:
# The "Tag" button
if st.button("Tag", key=f"tg_{idx}", use_container_width=True):
ext = os.path.splitext(img_path)[1]
# Calculate new name based on count
count = len([v for v in staged.values() if v['cat'] == selected_cat]) + 1
new_name = f"{selected_cat}_{count:03d}{ext}"
SorterEngine.stage_image(img_path, selected_cat, new_name)
st.rerun()
st.rerun() # Re-runs fragment -> Fetches new 'staged' -> UI Updates!
else:
# The "Untag" button
if st.button("Untag", key=f"utg_{idx}", use_container_width=True):
SorterEngine.clear_staged_item(img_path)
st.rerun()
def render(quality, profile_name):
st.subheader("🖼️ Gallery Staging Sorter")
profiles = SorterEngine.load_profiles()
p_data = profiles.get(profile_name, {})
# Path setup
c1, c2 = st.columns(2)
path_s = c1.text_input("Source Folder", value=p_data.get("tab5_source", "/storage"), key="t5_s")
path_o = c2.text_input("Output Folder", value=p_data.get("tab5_out", "/storage"), key="t5_o")
if path_s != p_data.get("tab5_source") or path_o != p_data.get("tab5_out"):
if st.button("Save Paths"):
if st.button("💾 Save Paths"):
SorterEngine.save_tab_paths(profile_name, t5_s=path_s, t5_o=path_o)
st.rerun()
# Category Selection (Outside fragment to avoid resetting selection)
cats = SorterEngine.get_categories()
if not cats:
st.warning("No categories found. Add some in the sidebar!")
return
selected_cat = st.sidebar.radio("Active Tag", cats)
if not os.path.exists(path_s): return
if not os.path.exists(path_s):
st.info("Waiting for valid Source Path...")
return
# Data loading
images = SorterEngine.get_images(path_s, recursive=True)
staged = SorterEngine.get_staged_data()
gallery_grid(images, staged, quality, selected_cat)
# We NO LONGER pass 'staged' here. The fragment fetches it itself.
gallery_grid(images, quality, selected_cat)
st.divider()
cleanup = st.radio("Unmarked Files:", ["Keep", "Move to Unused", "Delete"], horizontal=True)
if st.button("APPLY CHANGES", type="primary", use_container_width=True):
SorterEngine.commit_staging(path_o, cleanup, source_root=path_s)
if st.button("🚀 APPLY CHANGES TO DISK", type="primary", use_container_width=True):
with st.spinner("Processing files..."):
SorterEngine.commit_staging(path_o, cleanup, source_root=path_s)
st.success("Done!")
st.rerun()