From 37354470684935f74709fd92bc4af5e92c0b0967 Mon Sep 17 00:00:00 2001 From: Ethanfel Date: Sun, 18 Jan 2026 22:34:52 +0100 Subject: [PATCH] Update tab_gallery_sorter.py --- tab_gallery_sorter.py | 88 ++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 47 deletions(-) diff --git a/tab_gallery_sorter.py b/tab_gallery_sorter.py index 3085d8e..af605fb 100644 --- a/tab_gallery_sorter.py +++ b/tab_gallery_sorter.py @@ -3,53 +3,50 @@ import os import math from engine import SorterEngine -# --- FRAGMENT 1: SIDEBAR (Category Manager) --- +# --- FRAGMENT 1: SIDEBAR CONTENT --- +# We remove 'with st.sidebar' from inside this function. +# Instead, we will call this function inside the sidebar later. @st.fragment -def render_sidebar_fragment(): +def render_sidebar_content(): """ - Isolates the category selection. - Changing the active tag here updates Session State instantly - but DOES NOT reload the image grid. + Renders the category manager controls. + Because this is a fragment, interacting with it won't reload the main image grid. """ - with st.sidebar: - st.divider() - st.subheader("🏷️ Category Manager") + st.divider() + st.subheader("🏷️ Category Manager") + + # 1. ADD CATEGORY + c_add1, c_add2 = st.columns([3, 1]) + new_cat = c_add1.text_input("New Category", label_visibility="collapsed", placeholder="New Category...", key="t5_new_cat_input") + if c_add2.button("➕", help="Add Category"): + if new_cat: + SorterEngine.add_category(new_cat) + st.rerun() # Refresh only this fragment + + # 2. SELECT CATEGORY + cats = SorterEngine.get_categories() + if not cats: + st.warning("No categories.") + return None - # 1. ADD CATEGORY - c_add1, c_add2 = st.columns([3, 1]) - new_cat = c_add1.text_input("New Category", label_visibility="collapsed", placeholder="New Category...", key="t5_new_cat_input") - if c_add2.button("➕", help="Add Category"): - if new_cat: - SorterEngine.add_category(new_cat) - st.rerun() # Refresh only this sidebar fragment + # Default to first category if not set + if "t5_active_cat" not in st.session_state: + st.session_state.t5_active_cat = cats[0] - # 2. SELECT CATEGORY - cats = SorterEngine.get_categories() - if not cats: - st.warning("No categories.") - return None - - # We use session state to ensure the grid can see the selection - # Default to first category if not set - if "t5_active_cat" not in st.session_state: - st.session_state.t5_active_cat = cats[0] - - # The Radio Button - # on_change is not needed because the key automatically syncs with session_state - current = st.radio("Active Tag", cats, key="t5_active_cat") - - return current + # The Radio Button updates session_state automatically via key + st.radio("Active Tag", cats, key="t5_active_cat") + # --- FRAGMENT 2: GALLERY GRID --- @st.fragment def render_gallery_grid(current_batch, quality, grid_cols): """ - Isolates the image grid. - Reads the 'Active Tag' directly from Session State when a button is clicked. + Isolates the image grid updates. """ - # 1. Fetch latest data (DB + Session State) + # 1. Fetch latest data staged = SorterEngine.get_staged_data() - selected_cat = st.session_state.get("t5_active_cat", "Default") # Read latest tag + # Read the active tag directly from Session State + selected_cat = st.session_state.get("t5_active_cat", "Default") cols = st.columns(grid_cols) @@ -64,7 +61,6 @@ 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]) - # Delete X if c_head2.button("❌", key=f"del_{unique_key}"): SorterEngine.delete_to_trash(img_path) st.rerun() @@ -80,7 +76,6 @@ def render_gallery_grid(current_batch, quality, grid_cols): # Buttons if not is_staged: - # Note: Label is static "Tag", but logic uses 'selected_cat' 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 @@ -93,14 +88,13 @@ def render_gallery_grid(current_batch, quality, grid_cols): SorterEngine.clear_staged_item(img_path) st.rerun() + # --- MAIN PAGE RENDERER --- def render(quality, profile_name): st.subheader("🖼️ Gallery Staging Sorter") - # 1. Init Session State if 't5_page' not in st.session_state: st.session_state.t5_page = 0 - # 2. Profile & Paths profiles = SorterEngine.load_profiles() p_data = profiles.get(profile_name, {}) @@ -115,17 +109,18 @@ def render(quality, profile_name): if not os.path.exists(path_s): return - # 3. CALL SIDEBAR FRAGMENT - # This draws the sidebar controls. Interactions here will NOT reload the main page. - render_sidebar_fragment() + # --- CALL SIDEBAR FRAGMENT CORRECTLY --- + # We open the context manager FIRST, then call the fragment function inside it. + with st.sidebar: + render_sidebar_content() - # 4. View Settings (Main Body) + # View Settings with st.expander("👀 View Settings"): c_v1, c_v2 = st.columns(2) page_size = c_v1.slider("Images per Page", 12, 100, 24, 4) grid_cols = c_v2.slider("Grid Columns", 2, 8, 4) - # 5. Pagination Logic + # Pagination all_images = SorterEngine.get_images(path_s, recursive=True) if not all_images: st.info("No images found.") @@ -153,15 +148,14 @@ def render(quality, profile_name): nav_controls("top") st.divider() - # 6. CALL GALLERY FRAGMENT - # Interactions here (Tagging) will only reload this grid. + # Call Gallery Fragment render_gallery_grid(current_batch, quality, grid_cols) st.divider() nav_controls("bottom") st.divider() - # 7. Batch Apply + # Batch Apply 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)