From a33f87f68ec55f38509382bc1ab13721de717d43 Mon Sep 17 00:00:00 2001 From: Ethanfel Date: Sun, 18 Jan 2026 22:03:15 +0100 Subject: [PATCH] Update tab_gallery_sorter.py --- tab_gallery_sorter.py | 76 +++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 46 deletions(-) diff --git a/tab_gallery_sorter.py b/tab_gallery_sorter.py index 6bc3bb5..0823ab0 100644 --- a/tab_gallery_sorter.py +++ b/tab_gallery_sorter.py @@ -6,14 +6,11 @@ from engine import SorterEngine def render(quality, profile_name): st.subheader("🖼️ Gallery Staging Sorter") - # 1. Setup Session State for Pagination if 't5_page' not in st.session_state: st.session_state.t5_page = 0 - # 2. Load Profile & Paths profiles = SorterEngine.load_profiles() p_data = profiles.get(profile_name, {}) - # Path Inputs 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") @@ -23,43 +20,38 @@ def render(quality, profile_name): SorterEngine.save_tab_paths(profile_name, t5_s=path_s, t5_o=path_o) st.rerun() - # 3. Sidebar: Categories cats = SorterEngine.get_categories() if not cats: - st.warning("No categories found. Please add some in the Sidebar.") + st.warning("No categories found.") return selected_cat = st.sidebar.radio("Active Tag", cats, key="t5_cat_radio") - # 4. Data Loading - if not os.path.exists(path_s): - st.info("Enter a valid source path.") - return + if not os.path.exists(path_s): return all_images = SorterEngine.get_images(path_s, recursive=True) staged = SorterEngine.get_staged_data() if not all_images: - st.info("No images found in this folder.") + st.info("No images found.") return # --- VIEW SETTINGS --- - # New Slider for Grid Size with st.expander("👀 View Settings", expanded=False): - page_size = st.slider("Images per Page", min_value=12, max_value=100, value=24, step=4) + page_size = st.slider("Images per Page", 12, 100, 24, 4) - # --- PAGINATION LOGIC --- + # --- PAGINATION --- total_items = len(all_images) total_pages = math.ceil(total_items / page_size) - - # Bounds Check if st.session_state.t5_page >= total_pages: st.session_state.t5_page = max(0, total_pages - 1) start_idx = st.session_state.t5_page * page_size end_idx = start_idx + page_size + + # THIS IS THE BATCH WE WILL PROCESS current_batch = all_images[start_idx:end_idx] - # --- HELPER: Pagination Controls --- - def show_pagination_controls(key_suffix): + # --- HELPER: Controls --- + def show_controls(key_suffix): cp1, cp2, cp3 = st.columns([1, 2, 1]) with cp1: if st.button("⬅️ Previous", disabled=(st.session_state.t5_page == 0), key=f"prev_{key_suffix}"): @@ -72,39 +64,30 @@ def render(quality, profile_name): st.session_state.t5_page += 1 st.rerun() - # 1. TOP CONTROLS - show_pagination_controls("top") + show_controls("top") st.divider() - # --- GRID DISPLAY --- + # --- GRID --- cols = st.columns(4) for idx, img_path in enumerate(current_batch): - # Unique key combines page number and index to avoid conflicts unique_key = f"{st.session_state.t5_page}_{idx}" - with cols[idx % 4]: is_staged = img_path in staged - with st.container(border=True): # Header c_head1, c_head2 = st.columns([5, 1]) - c_head1.caption(os.path.basename(img_path)[:15] + "...") - - # Delete Button - if c_head2.button("❌", key=f"del_{unique_key}", help="Move to Trash"): + 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() - # Status Banner - if is_staged: - st.success(f"🏷️ {staged[img_path]['cat']}") + # Status + if is_staged: st.success(f"🏷️ {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) + if img_data: st.image(img_data, use_container_width=True) - # Action Buttons + # Buttons if not is_staged: if st.button("Tag", key=f"tag_{unique_key}", use_container_width=True): ext = os.path.splitext(img_path)[1] @@ -118,19 +101,20 @@ def render(quality, profile_name): st.rerun() st.divider() - - # 2. BOTTOM CONTROLS - show_pagination_controls("bottom") - + show_controls("bottom") st.divider() - # --- APPLY SECTION --- - c_act1, c_act2 = st.columns([3, 1]) - cleanup = c_act1.radio("Action for Unmarked Files:", ["Keep", "Move to Unused", "Delete"], horizontal=True) + # --- BATCH APPLY SECTION --- + st.write(f"### 🚀 Batch Actions (Page {st.session_state.t5_page + 1} Only)") + st.caption(f"This will process the **{len(current_batch)} images** visible above.") - if c_act2.button("🚀 APPLY TO DISK", type="primary", use_container_width=True): - with st.spinner("Moving files..."): - SorterEngine.commit_staging(path_o, cleanup, source_root=path_s) - st.success("Batch Complete!") - st.session_state.t5_page = 0 + c_act1, c_act2 = st.columns([3, 1]) + cleanup = c_act1.radio("Action for Untagged Files on this Page:", ["Keep", "Move to Unused", "Delete"], horizontal=True) + + if c_act2.button("APPLY PAGE TO DISK", type="primary", use_container_width=True): + with st.spinner("Processing current page..."): + # Call the new BATCH method + SorterEngine.commit_batch(current_batch, path_o, cleanup) + + st.success("Page processed!") st.rerun() \ No newline at end of file