From ef1eb814dfbbe6c77ea7285e6c03b7e927f3f854 Mon Sep 17 00:00:00 2001 From: Ethanfel Date: Sat, 17 Jan 2026 14:08:07 +0100 Subject: [PATCH] Update app.py --- app.py | 99 +++++++++++++++++++++------------------------------------- 1 file changed, 36 insertions(+), 63 deletions(-) diff --git a/app.py b/app.py index 79883ed..7bffc13 100644 --- a/app.py +++ b/app.py @@ -4,25 +4,17 @@ from engine import SorterEngine import tab_time_discovery import tab_id_review -# Page Configuration -st.set_page_config(layout="wide", page_title="Advanced Sorter v8.0") +st.set_page_config(layout="wide", page_title="Turbo Sorter Pro") -# --- Session State Initialization --- -if 'history' not in st.session_state: - st.session_state.history = [] -if 'idx_time' not in st.session_state: - st.session_state.idx_time = 0 -if 'idx_id' not in st.session_state: - st.session_state.idx_id = 0 +if 'history' not in st.session_state: st.session_state.history = [] +if 'idx_time' not in st.session_state: st.session_state.idx_time = 0 +if 'idx_id' not in st.session_state: st.session_state.idx_id = 0 # --- Status Bar --- -# Calculates stats based on the history stack -matches_created = len([h for h in st.session_state.history if 'link' in h['type']]) -unused_count = len([h for h in st.session_state.history if h['type'] == 'unused']) +matches = len([h for h in st.session_state.history if 'link' in h['type']]) +st.info(f"📊 **Session Stats:** {matches} Matches Created") -st.info(f"📊 **Session Stats:** {matches_created} Matches Linked | {unused_count} Moved to Unused") - -# --- Sidebar: Configuration & Profiles --- +# --- Sidebar --- BASE_PATH = "/storage" favs = SorterEngine.load_favorites() @@ -30,57 +22,38 @@ with st.sidebar: st.title("⭐ Profiles") selected_fav = st.selectbox("Load Favorite", ["None"] + list(favs.keys())) - # Delete Profile Logic - if selected_fav != "None": - if st.button("🗑️ Delete Selected Profile", type="secondary"): - SorterEngine.delete_favorite(selected_fav) - st.rerun() - - st.divider() - st.title("📁 Paths") - # Sets default path from favorites or base storage - def_t = favs[selected_fav]['target'] if selected_fav != "None" else BASE_PATH - - # User inputs for target folder - path_t = st.text_input("Target Folder Path (Folder 1)", value=def_t) - - # Automatic Sibling Detection for UI feedback - siblings = SorterEngine.get_sibling_controls(path_t) - st.caption(f"Found {len(siblings)} sibling control folders at this level.") - - # Create New Profile - with st.expander("💾 Create New Profile"): - new_fav_name = st.text_input("Profile Name") - if st.button("Save Profile"): - if new_fav_name: - SorterEngine.save_favorite(new_fav_name, path_t, path_t) # Control follows target sibling logic - st.success(f"Saved {new_fav_name}") - st.rerun() - - st.divider() - # Global Settings matched to original script logic - quality = st.slider("Bandwidth Quality", 5, 100, 40) - threshold = st.number_input("Time Threshold (s)", value=50) - - # ID Logic: Finds next ID based on existing files - id_val = st.number_input("Next ID Number", value=SorterEngine.get_max_id_number(path_t) + 1) - prefix = f"id{int(id_val):03d}_" - - # Undo Action (Z shortcut logic) - if st.button("↶ UNDO", use_container_width=True, disabled=not st.session_state.history): - SorterEngine.revert_action(st.session_state.history.pop()) - # Revert indices based on the type of action undone - if st.session_state.idx_id > 0: st.session_state.idx_id -= 1 + if selected_fav != "None" and st.button("🗑️ Delete Selected Profile"): + SorterEngine.delete_favorite(selected_fav) st.rerun() -# --- Main Tab Navigation --- -# Reordered: Discovery first, then Review + st.divider() + st.title("🕒 Discovery Path") + path_t = st.text_input("Target Folder (Folder 1)", value=favs[selected_fav]['target'] if selected_fav != "None" else BASE_PATH) + + st.divider() + st.title("🆔 Review Paths") + # Manual path overrides for the Review Tab + path_rv_t = st.text_input("Review Target Folder", value=os.path.join(path_t, "selected_target")) + path_rv_c = st.text_input("Review Control Folder", value=os.path.join(path_t, "selected_control")) + + if st.button("💾 Save Profile"): + name = st.text_input("Profile Name", key="new_fav") + if name: SorterEngine.save_favorite(name, path_t, path_t) + + st.divider() + quality = st.slider("Quality", 5, 100, 40) + threshold = st.number_input("Threshold (s)", value=50) + id_val = st.number_input("Next ID", value=SorterEngine.get_max_id_number(path_t) + 1) + prefix = f"id{int(id_val):03d}_" + + if st.button("↶ UNDO", use_container_width=True, disabled=not st.session_state.history): + SorterEngine.revert_action(st.session_state.history.pop()) + st.rerun() + +# --- Tabs --- t1, t2 = st.tabs(["🕒 1. Time Discovery", "🆔 2. ID Match Review"]) - with t1: - # Tab 1: Discovery uses sibling-scan logic tab_time_discovery.render(path_t, quality, threshold, prefix) - with t2: - # Tab 2: Review matches across all siblings - tab_id_review.render(path_t, quality) \ No newline at end of file + # Pass the manual review paths to Tab 2 + tab_id_review.render(path_rv_t, path_rv_c, quality) \ No newline at end of file