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 22:34:52 +01:00
parent 293cfd14f8
commit 3735447068
1 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
tab_gallery_sorter.py
View File

@@ -3,53 +3,50 @@ import os
import math import math
from engine import SorterEngine 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 @st.fragment
def render_sidebar_fragment(): def render_sidebar_content():
""" """
Isolates the category selection. Renders the category manager controls.
Changing the active tag here updates Session State instantly Because this is a fragment, interacting with it won't reload the main image grid.
but DOES NOT reload the image grid.
""" """
with st.sidebar: st.divider()
st.divider() st.subheader("🏷️ Category Manager")
st.subheader("🏷️ Category Manager")
# 1. ADD CATEGORY # 1. ADD CATEGORY
c_add1, c_add2 = st.columns([3, 1]) 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") 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 c_add2.button("➕", help="Add Category"):
if new_cat: if new_cat:
SorterEngine.add_category(new_cat) SorterEngine.add_category(new_cat)
st.rerun() # Refresh only this sidebar fragment st.rerun() # Refresh only this fragment
# 2. SELECT CATEGORY # 2. SELECT CATEGORY
cats = SorterEngine.get_categories() cats = SorterEngine.get_categories()
if not cats: if not cats:
st.warning("No categories.") st.warning("No categories.")
return None return None
# We use session state to ensure the grid can see the selection # Default to first category if not set
# Default to first category if not set if "t5_active_cat" not in st.session_state:
if "t5_active_cat" not in st.session_state: st.session_state.t5_active_cat = cats[0]
st.session_state.t5_active_cat = cats[0]
# The Radio Button # The Radio Button updates session_state automatically via key
# on_change is not needed because the key automatically syncs with session_state st.radio("Active Tag", cats, key="t5_active_cat")
current = st.radio("Active Tag", cats, key="t5_active_cat")
return current
# --- FRAGMENT 2: GALLERY GRID --- # --- FRAGMENT 2: GALLERY GRID ---
@st.fragment @st.fragment
def render_gallery_grid(current_batch, quality, grid_cols): def render_gallery_grid(current_batch, quality, grid_cols):
""" """
Isolates the image grid. Isolates the image grid updates.
Reads the 'Active Tag' directly from Session State when a button is clicked.
""" """
# 1. Fetch latest data (DB + Session State) # 1. Fetch latest data
staged = SorterEngine.get_staged_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) 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, c_head2 = st.columns([5, 1])
c_head1.caption(os.path.basename(img_path)[:15]) c_head1.caption(os.path.basename(img_path)[:15])
# Delete X
if c_head2.button("❌", key=f"del_{unique_key}"): if c_head2.button("❌", key=f"del_{unique_key}"):
SorterEngine.delete_to_trash(img_path) SorterEngine.delete_to_trash(img_path)
st.rerun() st.rerun()
@@ -80,7 +76,6 @@ def render_gallery_grid(current_batch, quality, grid_cols):
# Buttons # Buttons
if not is_staged: 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): if st.button("Tag", key=f"tag_{unique_key}", use_container_width=True):
ext = os.path.splitext(img_path)[1] ext = os.path.splitext(img_path)[1]
count = len([v for v in staged.values() if v['cat'] == selected_cat]) + 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) SorterEngine.clear_staged_item(img_path)
st.rerun() st.rerun()
# --- MAIN PAGE RENDERER --- # --- MAIN PAGE RENDERER ---
def render(quality, profile_name): def render(quality, profile_name):
st.subheader("🖼️ Gallery Staging Sorter") st.subheader("🖼️ Gallery Staging Sorter")
# 1. Init Session State
if 't5_page' not in st.session_state: st.session_state.t5_page = 0 if 't5_page' not in st.session_state: st.session_state.t5_page = 0
# 2. Profile & Paths
profiles = SorterEngine.load_profiles() profiles = SorterEngine.load_profiles()
p_data = profiles.get(profile_name, {}) p_data = profiles.get(profile_name, {})
@@ -115,17 +109,18 @@ def render(quality, profile_name):
if not os.path.exists(path_s): return if not os.path.exists(path_s): return
# 3. CALL SIDEBAR FRAGMENT # --- CALL SIDEBAR FRAGMENT CORRECTLY ---
# This draws the sidebar controls. Interactions here will NOT reload the main page. # We open the context manager FIRST, then call the fragment function inside it.
render_sidebar_fragment() with st.sidebar:
render_sidebar_content()
# 4. View Settings (Main Body) # View Settings
with st.expander("👀 View Settings"): with st.expander("👀 View Settings"):
c_v1, c_v2 = st.columns(2) c_v1, c_v2 = st.columns(2)
page_size = c_v1.slider("Images per Page", 12, 100, 24, 4) page_size = c_v1.slider("Images per Page", 12, 100, 24, 4)
grid_cols = c_v2.slider("Grid Columns", 2, 8, 4) grid_cols = c_v2.slider("Grid Columns", 2, 8, 4)
# 5. Pagination Logic # Pagination
all_images = SorterEngine.get_images(path_s, recursive=True) all_images = SorterEngine.get_images(path_s, recursive=True)
if not all_images: if not all_images:
st.info("No images found.") st.info("No images found.")
@@ -153,15 +148,14 @@ def render(quality, profile_name):
nav_controls("top") nav_controls("top")
st.divider() st.divider()
# 6. CALL GALLERY FRAGMENT # Call Gallery Fragment
# Interactions here (Tagging) will only reload this grid.
render_gallery_grid(current_batch, quality, grid_cols) render_gallery_grid(current_batch, quality, grid_cols)
st.divider() st.divider()
nav_controls("bottom") nav_controls("bottom")
st.divider() st.divider()
# 7. Batch Apply # Batch Apply
st.write(f"### 🚀 Batch Actions (Page {st.session_state.t5_page + 1})") st.write(f"### 🚀 Batch Actions (Page {st.session_state.t5_page + 1})")
c_act1, c_act2 = st.columns([3, 1]) c_act1, c_act2 = st.columns([3, 1])
cleanup = c_act1.radio("Untagged Action:", ["Keep", "Move to Unused", "Delete"], horizontal=True) cleanup = c_act1.radio("Untagged Action:", ["Keep", "Move to Unused", "Delete"], horizontal=True)