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:38:19 +01:00
parent 3735447068
commit 7107934aa5
1 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
tab_gallery_sorter.py
View File

@@ -4,36 +4,31 @@ import math
from engine import SorterEngine
# --- 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_content():
"""
Renders the category manager controls.
Because this is a fragment, interacting with it won't reload the main image grid.
Isolates sidebar interactions.
"""
st.divider()
st.subheader("🏷️ Category Manager")
# 1. ADD CATEGORY
# 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"):
new_cat = c_add1.text_input("New Category", label_visibility="collapsed", placeholder="New...", key="t5_new_cat_input")
if c_add2.button("➕", help="Add"):
if new_cat:
SorterEngine.add_category(new_cat)
st.rerun() # Refresh only this fragment
st.rerun()
# 2. SELECT CATEGORY
# Select Category
cats = SorterEngine.get_categories()
if not cats:
st.warning("No categories.")
return None
return
# 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 updates session_state automatically via key
st.radio("Active Tag", cats, key="t5_active_cat")
@@ -41,11 +36,9 @@ def render_sidebar_content():
@st.fragment
def render_gallery_grid(current_batch, quality, grid_cols):
"""
Isolates the image grid updates.
Isolates grid interactions (Tagging/Deleting).
"""
# 1. Fetch latest data
staged = SorterEngine.get_staged_data()
# Read the active tag directly from Session State
selected_cat = st.session_state.get("t5_active_cat", "Default")
cols = st.columns(grid_cols)
@@ -65,7 +58,7 @@ def render_gallery_grid(current_batch, quality, grid_cols):
SorterEngine.delete_to_trash(img_path)
st.rerun()
# Status Banner
# Status
if is_staged:
st.success(f"🏷️ {staged[img_path]['cat']}")
@@ -80,7 +73,6 @@ def render_gallery_grid(current_batch, quality, grid_cols):
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()
else:
@@ -89,6 +81,28 @@ def render_gallery_grid(current_batch, quality, grid_cols):
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()
# --- MAIN PAGE RENDERER ---
def render(quality, profile_name):
st.subheader("🖼️ Gallery Staging Sorter")
@@ -98,6 +112,7 @@ 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")
@@ -109,18 +124,17 @@ def render(quality, profile_name):
if not os.path.exists(path_s): return
# --- CALL SIDEBAR FRAGMENT CORRECTLY ---
# We open the context manager FIRST, then call the fragment function inside it.
# 1. Sidebar Fragment
with st.sidebar:
render_sidebar_content()
# View Settings
# 2. 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)
# Pagination
# 3. Data & Pagination
all_images = SorterEngine.get_images(path_s, recursive=True)
if not all_images:
st.info("No images found.")
@@ -134,7 +148,7 @@ def render(quality, profile_name):
end_idx = start_idx + page_size
current_batch = all_images[start_idx:end_idx]
# Navigation Helper
# Navigation Controls (These MUST trigger full rerun to change batch)
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}"):
@@ -148,20 +162,12 @@ def render(quality, profile_name):
nav_controls("top")
st.divider()
# Call Gallery Fragment
# 4. Gallery Fragment
render_gallery_grid(current_batch, quality, grid_cols)
st.divider()
nav_controls("bottom")
st.divider()
# 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)
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("Done!")
st.rerun()
# 5. Batch Actions Fragment
render_batch_actions(current_batch, path_o, st.session_state.t5_page + 1)