Update tab_gallery_sorter.py
This commit is contained in:
@@ -3,58 +3,44 @@ import os
|
||||
import math
|
||||
from engine import SorterEngine
|
||||
|
||||
# ==========================================
|
||||
# 1. GLOBAL CALLBACKS (Prevents Page Refresh)
|
||||
# ==========================================
|
||||
|
||||
# --- CALLBACKS ---
|
||||
def cb_tag_image(img_path, selected_cat):
|
||||
"""Tags an image. Updates DB immediately."""
|
||||
if selected_cat.startswith("---") or selected_cat == "":
|
||||
st.toast("⚠️ Select a valid category first!", icon="🚫")
|
||||
return
|
||||
|
||||
staged = SorterEngine.get_staged_data()
|
||||
ext = os.path.splitext(img_path)[1]
|
||||
|
||||
# Auto-increment logic
|
||||
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)
|
||||
|
||||
def cb_untag_image(img_path):
|
||||
"""Untags an image."""
|
||||
SorterEngine.clear_staged_item(img_path)
|
||||
|
||||
def cb_delete_image(img_path):
|
||||
"""Moves image to trash."""
|
||||
SorterEngine.delete_to_trash(img_path)
|
||||
|
||||
def cb_apply_batch(current_batch, path_o, cleanup_mode, operation):
|
||||
"""Commits the batch with the specified operation (Move/Copy)."""
|
||||
"""Applies ONLY the current page."""
|
||||
SorterEngine.commit_batch(current_batch, path_o, cleanup_mode, operation)
|
||||
|
||||
def cb_apply_global(path_o, cleanup_mode, operation, path_s):
|
||||
"""Applies EVERYTHING in the staging area."""
|
||||
SorterEngine.commit_global(path_o, cleanup_mode, operation, source_root=path_s)
|
||||
|
||||
def cb_change_page(delta):
|
||||
"""Updates page number (-1 or +1)."""
|
||||
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
|
||||
st.session_state.t5_page += delta
|
||||
|
||||
def cb_jump_page(k):
|
||||
"""Updates page number from direct input box."""
|
||||
val = st.session_state[k]
|
||||
st.session_state.t5_page = val - 1
|
||||
|
||||
|
||||
# ==========================================
|
||||
# 2. FRAGMENT: SIDEBAR (Category Manager)
|
||||
# ==========================================
|
||||
# --- SIDEBAR FRAGMENT (Manager) ---
|
||||
@st.fragment
|
||||
def render_sidebar_content():
|
||||
st.divider()
|
||||
st.subheader("🏷️ Category Manager")
|
||||
|
||||
# --- PREPARE LIST (With Separators) ---
|
||||
cats = SorterEngine.get_categories()
|
||||
processed_cats = []
|
||||
last_char = ""
|
||||
@@ -66,26 +52,16 @@ def render_sidebar_content():
|
||||
processed_cats.append(cat)
|
||||
last_char = current_char
|
||||
|
||||
# --- STATE SYNC ---
|
||||
if "t5_active_cat" not in st.session_state:
|
||||
st.session_state.t5_active_cat = cats[0] if cats else "Default"
|
||||
|
||||
# Fallback if selection was deleted
|
||||
if "t5_active_cat" not in st.session_state: st.session_state.t5_active_cat = cats[0] if cats else "Default"
|
||||
current_selection = st.session_state.t5_active_cat
|
||||
if not current_selection.startswith("---") and current_selection not in cats:
|
||||
st.session_state.t5_active_cat = cats[0] if cats else "Default"
|
||||
|
||||
# --- RADIO SELECTION ---
|
||||
selection = st.radio("Active Tag", processed_cats, key="t5_radio_select")
|
||||
|
||||
if not selection.startswith("---"):
|
||||
st.session_state.t5_active_cat = selection
|
||||
if not selection.startswith("---"): st.session_state.t5_active_cat = selection
|
||||
|
||||
st.divider()
|
||||
|
||||
# --- TABS: ADD / EDIT ---
|
||||
tab_add, tab_edit = st.tabs(["➕ Add", "✏️ Edit"])
|
||||
|
||||
with tab_add:
|
||||
c1, c2 = st.columns([3, 1])
|
||||
new_cat = c1.text_input("New Name", label_visibility="collapsed", placeholder="New...", key="t5_new_cat")
|
||||
@@ -93,119 +69,96 @@ def render_sidebar_content():
|
||||
if new_cat:
|
||||
SorterEngine.add_category(new_cat)
|
||||
st.rerun()
|
||||
|
||||
with tab_edit:
|
||||
target_cat = st.session_state.t5_active_cat
|
||||
is_valid = target_cat and not target_cat.startswith("---") and target_cat in cats
|
||||
|
||||
if is_valid:
|
||||
if target_cat and not target_cat.startswith("---") and target_cat in cats:
|
||||
st.caption(f"Editing: **{target_cat}**")
|
||||
|
||||
# RENAME
|
||||
rename_val = st.text_input("Rename to:", value=target_cat, key=f"ren_{target_cat}")
|
||||
if st.button("💾 Save Name", key=f"save_{target_cat}", use_container_width=True):
|
||||
if st.button("💾 Save", key=f"save_{target_cat}", use_container_width=True):
|
||||
if rename_val and rename_val != target_cat:
|
||||
SorterEngine.rename_category(target_cat, rename_val)
|
||||
st.session_state.t5_active_cat = rename_val
|
||||
st.rerun()
|
||||
|
||||
st.markdown("---")
|
||||
|
||||
# DELETE
|
||||
if st.button("🗑️ Delete Category", key=f"del_cat_{target_cat}", type="primary", use_container_width=True):
|
||||
if st.button("🗑️ Delete", key=f"del_cat_{target_cat}", type="primary", use_container_width=True):
|
||||
SorterEngine.delete_category(target_cat)
|
||||
st.rerun()
|
||||
else:
|
||||
st.info("Select a valid category to edit.")
|
||||
|
||||
|
||||
# ==========================================
|
||||
# 3. FRAGMENT: GALLERY GRID
|
||||
# ==========================================
|
||||
# --- GALLERY GRID FRAGMENT ---
|
||||
@st.fragment
|
||||
def render_gallery_grid(current_batch, quality, grid_cols):
|
||||
staged = SorterEngine.get_staged_data()
|
||||
# NEW: Fetch processed history
|
||||
history = SorterEngine.get_processed_log()
|
||||
|
||||
selected_cat = st.session_state.get("t5_active_cat", "Default")
|
||||
tagging_disabled = selected_cat.startswith("---")
|
||||
|
||||
cols = st.columns(grid_cols)
|
||||
|
||||
for idx, img_path in enumerate(current_batch):
|
||||
unique_key = f"frag_{os.path.basename(img_path)}"
|
||||
|
||||
with cols[idx % grid_cols]:
|
||||
is_staged = img_path in staged
|
||||
is_processed = img_path in history
|
||||
|
||||
with st.container(border=True):
|
||||
# Header
|
||||
c_head1, c_head2 = st.columns([5, 1])
|
||||
c_head1.caption(os.path.basename(img_path)[:15])
|
||||
c_head2.button("❌", key=f"del_{unique_key}", on_click=cb_delete_image, args=(img_path,))
|
||||
|
||||
# DELETE (Callback)
|
||||
c_head2.button("❌", key=f"del_{unique_key}",
|
||||
on_click=cb_delete_image, args=(img_path,))
|
||||
|
||||
# STATUS
|
||||
# STATUS BANNERS
|
||||
if is_staged:
|
||||
st.success(f"🏷️ {staged[img_path]['cat']}")
|
||||
elif is_processed:
|
||||
# NEW: Show history status
|
||||
st.info(f"✅ {history[img_path]['action']} -> {history[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)
|
||||
|
||||
# ACTIONS (Callbacks)
|
||||
if not is_staged:
|
||||
st.button("Tag", key=f"tag_{unique_key}",
|
||||
disabled=tagging_disabled,
|
||||
use_container_width=True,
|
||||
st.button("Tag", key=f"tag_{unique_key}", disabled=tagging_disabled, use_container_width=True,
|
||||
on_click=cb_tag_image, args=(img_path, selected_cat))
|
||||
else:
|
||||
st.button("Untag", key=f"untag_{unique_key}",
|
||||
use_container_width=True,
|
||||
st.button("Untag", key=f"untag_{unique_key}", use_container_width=True,
|
||||
on_click=cb_untag_image, args=(img_path,))
|
||||
|
||||
|
||||
# ==========================================
|
||||
# 4. FRAGMENT: BATCH ACTIONS
|
||||
# ==========================================
|
||||
# --- BATCH ACTIONS FRAGMENT ---
|
||||
@st.fragment
|
||||
def render_batch_actions(current_batch, path_o, page_num):
|
||||
st.write(f"### 🚀 Batch Actions (Page {page_num})")
|
||||
def render_batch_actions(current_batch, path_o, page_num, path_s):
|
||||
st.write(f"### 🚀 Processing Actions")
|
||||
st.caption("Settings apply to both Page and Global actions.")
|
||||
|
||||
# We use columns to organize the settings clearly
|
||||
c_set1, c_set2, c_btn = st.columns([2, 2, 1.5], vertical_alignment="bottom")
|
||||
c_set1, c_set2 = st.columns(2)
|
||||
op_mode = c_set1.radio("Tagged Files:", ["Move", "Copy"], horizontal=True, key="t5_op_mode")
|
||||
cleanup = c_set2.radio("Untagged Files:", ["Keep", "Move to Unused", "Delete"], horizontal=True, key="t5_cleanup_mode")
|
||||
|
||||
# 1. Operation for TAGGED files
|
||||
op_mode = c_set1.radio("Tagged Files:", ["Move", "Copy"],
|
||||
horizontal=True, key="t5_op_mode")
|
||||
st.divider()
|
||||
|
||||
# 2. Action for UNTAGGED files
|
||||
cleanup = c_set2.radio("Untagged Files:", ["Keep", "Move to Unused", "Delete"],
|
||||
horizontal=True, key="t5_cleanup_mode")
|
||||
c_btn1, c_btn2 = st.columns(2)
|
||||
|
||||
# 3. Apply Button
|
||||
# Note: We added 'op_mode' to the args
|
||||
if c_btn.button(f"APPLY ({op_mode})", type="primary", use_container_width=True,
|
||||
on_click=cb_apply_batch, args=(current_batch, path_o, cleanup, op_mode)):
|
||||
st.success("Batch processed!")
|
||||
# Rerun to show changes (files disappearing or remaining depending on copy/move)
|
||||
# BUTTON 1: APPLY PAGE
|
||||
if c_btn1.button(f"APPLY PAGE {page_num}", type="secondary", use_container_width=True,
|
||||
on_click=cb_apply_batch, args=(current_batch, path_o, cleanup, op_mode)):
|
||||
st.toast(f"Page {page_num} Applied!")
|
||||
st.rerun()
|
||||
|
||||
# BUTTON 2: APPLY GLOBAL
|
||||
if c_btn2.button("APPLY ALL (GLOBAL)", type="primary", use_container_width=True,
|
||||
help="Process ALL tagged files across all pages.",
|
||||
on_click=cb_apply_global, args=(path_o, cleanup, op_mode, path_s)):
|
||||
st.toast("Global Apply Complete!")
|
||||
st.rerun()
|
||||
|
||||
# ==========================================
|
||||
# 5. MAIN RENDERER
|
||||
# ==========================================
|
||||
# --- MAIN RENDERER ---
|
||||
def render(quality, profile_name):
|
||||
st.subheader("🖼️ Gallery Staging Sorter")
|
||||
|
||||
# Init State
|
||||
if 't5_page' not in st.session_state: st.session_state.t5_page = 0
|
||||
|
||||
# Load Paths
|
||||
profiles = SorterEngine.load_profiles()
|
||||
p_data = profiles.get(profile_name, {})
|
||||
|
||||
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")
|
||||
@@ -217,17 +170,14 @@ def render(quality, profile_name):
|
||||
|
||||
if not os.path.exists(path_s): return
|
||||
|
||||
# --- RENDER SIDEBAR ---
|
||||
with st.sidebar:
|
||||
render_sidebar_content()
|
||||
|
||||
# --- 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)
|
||||
|
||||
# --- DATA & MATH ---
|
||||
all_images = SorterEngine.get_images(path_s, recursive=True)
|
||||
if not all_images:
|
||||
st.info("No images found.")
|
||||
@@ -235,8 +185,6 @@ def render(quality, profile_name):
|
||||
|
||||
total_items = len(all_images)
|
||||
total_pages = math.ceil(total_items / page_size)
|
||||
|
||||
# Safety Bounds Check
|
||||
if st.session_state.t5_page >= total_pages: st.session_state.t5_page = max(0, total_pages - 1)
|
||||
if st.session_state.t5_page < 0: st.session_state.t5_page = 0
|
||||
|
||||
@@ -244,46 +192,19 @@ def render(quality, profile_name):
|
||||
end_idx = start_idx + page_size
|
||||
current_batch = all_images[start_idx:end_idx]
|
||||
|
||||
# --- NAVIGATION BAR COMPONENT ---
|
||||
def nav_controls(key_suffix):
|
||||
# New Layout: [Prev] [Input Box] ["/ 15"] [Next]
|
||||
c1, c2, c3, c4 = st.columns([1.5, 1, 0.5, 1.5], vertical_alignment="center")
|
||||
|
||||
# 1. Previous Button
|
||||
c1.button("⬅️ Prev",
|
||||
disabled=(st.session_state.t5_page == 0),
|
||||
on_click=cb_change_page, args=(-1,),
|
||||
key=f"p_{key_suffix}", use_container_width=True)
|
||||
|
||||
# 2. Page Selector (Number Input)
|
||||
c2.number_input(
|
||||
"Page",
|
||||
min_value=1, max_value=total_pages,
|
||||
value=st.session_state.t5_page + 1,
|
||||
step=1,
|
||||
label_visibility="collapsed",
|
||||
key=f"jump_{key_suffix}",
|
||||
on_change=cb_jump_page, args=(f"jump_{key_suffix}",)
|
||||
)
|
||||
|
||||
# 3. Total Page Count Display
|
||||
c1.button("⬅️ Prev", disabled=(st.session_state.t5_page == 0), on_click=cb_change_page, args=(-1,), key=f"p_{key_suffix}", use_container_width=True)
|
||||
c2.number_input("Page", min_value=1, max_value=total_pages, value=st.session_state.t5_page + 1, step=1, label_visibility="collapsed", key=f"jump_{key_suffix}", on_change=cb_jump_page, args=(f"jump_{key_suffix}",))
|
||||
c3.markdown(f"<div style='text-align: left; font-weight: bold;'>/ {total_pages}</div>", unsafe_allow_html=True)
|
||||
|
||||
# 4. Next Button
|
||||
c4.button("Next ➡️",
|
||||
disabled=(st.session_state.t5_page >= total_pages - 1),
|
||||
on_click=cb_change_page, args=(1,),
|
||||
key=f"n_{key_suffix}", use_container_width=True)
|
||||
|
||||
# --- RENDER PAGE ---
|
||||
st.divider()
|
||||
nav_controls("top") # Top Nav
|
||||
|
||||
render_gallery_grid(current_batch, quality, grid_cols) # Grid
|
||||
c4.button("Next ➡️", disabled=(st.session_state.t5_page >= total_pages - 1), on_click=cb_change_page, args=(1,), key=f"n_{key_suffix}", use_container_width=True)
|
||||
|
||||
st.divider()
|
||||
nav_controls("bottom") # Bottom Nav
|
||||
nav_controls("top")
|
||||
render_gallery_grid(current_batch, quality, grid_cols)
|
||||
st.divider()
|
||||
nav_controls("bottom")
|
||||
st.divider()
|
||||
|
||||
# Batch Actions
|
||||
render_batch_actions(current_batch, path_o, st.session_state.t5_page + 1)
|
||||
# Pass 'path_s' so global cleanup works if enabled
|
||||
render_batch_actions(current_batch, path_o, st.session_state.t5_page + 1, path_s)
|
||||
Reference in New Issue
Block a user