From 00d1d8858a26bf7c5f3f4ca7e18d7e0c6e975e05 Mon Sep 17 00:00:00 2001 From: Ethanfel Date: Sun, 18 Jan 2026 22:44:36 +0100 Subject: [PATCH] Update tab_gallery_sorter.py --- tab_gallery_sorter.py | 96 +++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/tab_gallery_sorter.py b/tab_gallery_sorter.py index 2157891..24e8d3f 100644 --- a/tab_gallery_sorter.py +++ b/tab_gallery_sorter.py @@ -3,24 +3,45 @@ import os import math from engine import SorterEngine -# --- FRAGMENT 1: SIDEBAR CONTENT --- +# --- CALLBACKS (The Secret to No Refreshing) --- +def cb_tag_image(img_path, selected_cat): + """Callback: Tags image, then lets Streamlit update automatically.""" + staged = SorterEngine.get_staged_data() + ext = os.path.splitext(img_path)[1] + # Calculate suffix + 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) + +def cb_untag_image(img_path): + """Callback: Untags image.""" + SorterEngine.clear_staged_item(img_path) + +def cb_delete_image(img_path): + """Callback: Moves image to trash immediately.""" + SorterEngine.delete_to_trash(img_path) + +def cb_apply_batch(current_batch, path_o, cleanup_mode): + """Callback: Applies changes to disk.""" + SorterEngine.commit_batch(current_batch, path_o, cleanup_mode) + + +# --- FRAGMENT 1: SIDEBAR --- @st.fragment def render_sidebar_content(): - """ - Isolates sidebar interactions. - """ st.divider() st.subheader("🏷️ Category Manager") # Add Category c_add1, c_add2 = st.columns([3, 1]) new_cat = c_add1.text_input("New Category", label_visibility="collapsed", placeholder="New...", key="t5_new_cat_input") + + # We use a callback here too for smoothness, or just simple rerun if c_add2.button("➕", help="Add"): if new_cat: SorterEngine.add_category(new_cat) st.rerun() - - # Select Category + cats = SorterEngine.get_categories() if not cats: st.warning("No categories.") @@ -35,9 +56,6 @@ def render_sidebar_content(): # --- FRAGMENT 2: GALLERY GRID --- @st.fragment def render_gallery_grid(current_batch, quality, grid_cols): - """ - Isolates grid interactions (Tagging/Deleting). - """ staged = SorterEngine.get_staged_data() selected_cat = st.session_state.get("t5_active_cat", "Default") @@ -54,9 +72,9 @@ def render_gallery_grid(current_batch, quality, grid_cols): c_head1, c_head2 = st.columns([5, 1]) c_head1.caption(os.path.basename(img_path)[:15]) - if c_head2.button("❌", key=f"del_{unique_key}"): - SorterEngine.delete_to_trash(img_path) - st.rerun() + # Delete X (Using Callback) + c_head2.button("❌", key=f"del_{unique_key}", + on_click=cb_delete_image, args=(img_path,)) # Status if is_staged: @@ -67,40 +85,13 @@ def render_gallery_grid(current_batch, quality, grid_cols): if img_data: st.image(img_data, use_container_width=True) - # Buttons + # Action Buttons (Using Callbacks) if not is_staged: - if st.button("Tag", key=f"tag_{unique_key}", use_container_width=True): - ext = os.path.splitext(img_path)[1] - 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.button("Tag", key=f"tag_{unique_key}", use_container_width=True, + on_click=cb_tag_image, args=(img_path, selected_cat)) else: - if st.button("Untag", key=f"untag_{unique_key}", use_container_width=True): - SorterEngine.clear_staged_item(img_path) - st.rerun() - - -# --- FRAGMENT 3: BATCH ACTIONS --- -@st.fragment -def render_batch_actions(current_batch, path_o, page_num): - """ - Isolates the 'Apply' section. - Changing the Radio Button here will NOT reload the page or the images. - """ - st.write(f"### 🚀 Batch Actions (Page {page_num})") - - c_act1, c_act2 = st.columns([3, 1]) - - # This radio button caused the refresh before. Now it's contained! - cleanup = c_act1.radio("Untagged Action:", ["Keep", "Move to Unused", "Delete"], horizontal=True, key="t5_cleanup_mode") - - if c_act2.button("APPLY PAGE", type="primary", use_container_width=True): - with st.spinner("Processing..."): - SorterEngine.commit_batch(current_batch, path_o, cleanup) - st.success("Batch Completed!") - # We allow a full rerun here to refresh the grid (remove moved files) - st.rerun() + st.button("Untag", key=f"untag_{unique_key}", use_container_width=True, + on_click=cb_untag_image, args=(img_path,)) # --- MAIN PAGE RENDERER --- @@ -112,7 +103,6 @@ def render(quality, profile_name): profiles = SorterEngine.load_profiles() p_data = profiles.get(profile_name, {}) - # Settings Area (Still global, requires save) 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") @@ -124,7 +114,7 @@ def render(quality, profile_name): if not os.path.exists(path_s): return - # 1. Sidebar Fragment + # 1. Sidebar (Fragment) with st.sidebar: render_sidebar_content() @@ -148,7 +138,7 @@ def render(quality, profile_name): end_idx = start_idx + page_size current_batch = all_images[start_idx:end_idx] - # Navigation Controls (These MUST trigger full rerun to change batch) + # Navigation Controls def nav_controls(key): c1, c2, c3 = st.columns([1, 2, 1]) if c1.button("⬅️ Prev", disabled=(st.session_state.t5_page==0), key=f"p_{key}"): @@ -162,12 +152,18 @@ def render(quality, profile_name): nav_controls("top") st.divider() - # 4. Gallery Fragment + # 4. Gallery (Fragment with Callbacks) render_gallery_grid(current_batch, quality, grid_cols) st.divider() nav_controls("bottom") st.divider() - # 5. Batch Actions Fragment - render_batch_actions(current_batch, path_o, st.session_state.t5_page + 1) \ No newline at end of file + # 5. Batch Apply (NO FRAGMENT - Needs full refresh to show files are moved) + st.write(f"### 🚀 Batch Actions (Page {st.session_state.t5_page + 1})") + c_act1, c_act2 = st.columns([3, 1]) + cleanup = c_act1.radio("Untagged Action:", ["Keep", "Move to Unused", "Delete"], horizontal=True, key="t5_cleanup_mode") + + # We use on_click here too for consistency, but the page WILL reload fully after this. + c_act2.button("APPLY PAGE", type="primary", use_container_width=True, + on_click=cb_apply_batch, args=(current_batch, path_o, cleanup)) \ No newline at end of file