Update tab_gallery_sorter.py

tab_gallery_sorter.py

@@ -1,96 +1,129 @@
 import streamlit as st
 import os
+import math
 from engine import SorterEngine
 
-@st.fragment
-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]:
-            is_staged = img_path in staged
-            
-            with st.container(border=True):
-                # Header: Name and Delete X
-                c_name, c_del = st.columns([5, 1])
-                c_name.caption(os.path.basename(img_path)[:20])
-                
-                # 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() # Re-runs the fragment to remove the image
-
-                # 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)
-                
-                # 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() # 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")
     
+    # 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 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")
     
+    # Save Path Button
     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 Settings"):
             SorterEngine.save_tab_paths(profile_name, t5_s=path_s, t5_o=path_o)
             st.rerun()
 
-    # Category Selection (Outside fragment to avoid resetting selection)
+    # 3. Sidebar: Categories
     cats = SorterEngine.get_categories()
     if not cats:
-        st.warning("No categories found. Add some in the sidebar!")
+        st.warning("No categories found. Please add some in the Sidebar or Tab 4.")
         return
-    selected_cat = st.sidebar.radio("Active Tag", cats)
+    selected_cat = st.sidebar.radio("Active Tag", cats, key="t5_cat_radio")
-    
+
+    # 4. Data Loading
     if not os.path.exists(path_s):
-        st.info("Waiting for valid Source Path...")
+        st.info("Enter a valid source path.")
         return
 
-    # Data loading
+    # Fetch all images, but we will only display a slice of them
-    images = SorterEngine.get_images(path_s, recursive=True)
+    all_images = SorterEngine.get_images(path_s, recursive=True)
+    staged = SorterEngine.get_staged_data()
     
-    # We NO LONGER pass 'staged' here. The fragment fetches it itself.
+    if not all_images:
-    gallery_grid(images, quality, selected_cat)
+        st.info("No images found in this folder.")
+        return
+
+    # --- PAGINATION LOGIC ---
+    PAGE_SIZE = 24
+    total_items = len(all_images)
+    total_pages = math.ceil(total_items / PAGE_SIZE)
+    
+    # Ensure page number is valid
+    if st.session_state.t5_page >= total_pages: st.session_state.t5_page = total_pages - 1
+    if st.session_state.t5_page < 0: st.session_state.t5_page = 0
+    
+    start_idx = st.session_state.t5_page * PAGE_SIZE
+    end_idx = start_idx + PAGE_SIZE
+    current_batch = all_images[start_idx:end_idx]
+
+    # --- PAGINATION CONTROLS (TOP) ---
+    cp1, cp2, cp3 = st.columns([1, 2, 1])
+    with cp1:
+        if st.button("⬅️ Previous", disabled=(st.session_state.t5_page == 0), key="prev_top"):
+            st.session_state.t5_page -= 1
+            st.rerun()
+    with cp2:
+        st.markdown(f"<h4 style='text-align: center;'>Page {st.session_state.t5_page + 1} of {total_pages}</h4>", unsafe_allow_html=True)
+    with cp3:
+        if st.button("Next ➡️", disabled=(st.session_state.t5_page >= total_pages - 1), key="next_top"):
+            st.session_state.t5_page += 1
+            st.rerun()
 
     st.divider()
-    cleanup = st.radio("Unmarked Files:", ["Keep", "Move to Unused", "Delete"], horizontal=True)
+
+    # --- GRID DISPLAY ---
+    cols = st.columns(4)
+    for idx, img_path in enumerate(current_batch):
+        # Create a unique key based on the actual file path hash + page index
+        # This prevents buttons from confusing each other
+        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"):
+                    SorterEngine.delete_to_trash(img_path)
+                    st.rerun()
+
+                # Status Banner
+                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)
+
+                # Action 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]
+                        # Determine 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)
+                        st.rerun()
+                else:
+                    if st.button("Untag", key=f"untag_{unique_key}", use_container_width=True):
+                        SorterEngine.clear_staged_item(img_path)
+                        st.rerun()
+
+    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)
     
-    if st.button("🚀 APPLY CHANGES TO DISK", type="primary", use_container_width=True):
+    if c_act2.button("🚀 APPLY TO DISK", type="primary", use_container_width=True):
-        with st.spinner("Processing files..."):
+        with st.spinner("Moving files..."):
             SorterEngine.commit_staging(path_o, cleanup, source_root=path_s)
-        st.success("Done!")
+        st.success("Batch Complete!")
+        st.session_state.t5_page = 0 # Reset to first page after moving
         st.rerun()