diff --git a/tab_id_review.py b/tab_id_review.py index e68a2b9..52d3b01 100644 --- a/tab_id_review.py +++ b/tab_id_review.py @@ -3,31 +3,33 @@ import os, shutil from engine import SorterEngine def render(path_rv_t, path_rv_c, quality): - # Only scan the two paths provided manually map_t = SorterEngine.get_id_mapping(path_rv_t) map_c = SorterEngine.get_id_mapping(path_rv_c) - # Find common IDs between these two specific folders common_ids = sorted(list(set(map_t.keys()) & set(map_c.keys()))) if st.session_state.idx_id < len(common_ids): curr_id = common_ids[st.session_state.idx_id] - t_p = os.path.join(path_rv_t, map_t[curr_id]) c_p = os.path.join(path_rv_c, map_c[curr_id]) st.subheader(f"Reviewing ID: {curr_id} ({st.session_state.idx_id + 1}/{len(common_ids)})") - col1, col2 = st.columns(2) + # Displaying filenames to see the mismatch + st.text(f"Target Name: {os.path.basename(t_p)}") + st.text(f"Control Name: {os.path.basename(c_p)}") + + col1, col2 = st.columns(2) img1 = SorterEngine.compress_for_web(t_p, quality) img2 = SorterEngine.compress_for_web(c_p, quality) - if img1: col1.image(img1, caption=f"Target: {map_t[curr_id]}") - if img2: col2.image(img2, caption=f"Control: {map_c[curr_id]}") + if img1: col1.image(img1) + if img2: col2.image(img2) btn_col1, btn_col2 = st.columns(2) - if btn_col1.button("❌ Move Pair to Unused", use_container_width=True, type="primary"): - # Move both to unused folders relative to their current review path + + # Action 1: Move to Unused with harmonization + if btn_col1.button("❌ Move to Unused (Match Names)", use_container_width=True, type="primary"): t_un, c_un = SorterEngine.move_to_unused_synced(t_p, c_p, path_rv_t, path_rv_c) st.session_state.history.append({ 'type': 'unused', @@ -37,11 +39,17 @@ def render(path_rv_t, path_rv_c, quality): st.session_state.idx_id += 1 st.rerun() - if btn_col2.button("✅ Keep Both / Next", use_container_width=True): + # Action 2: Keep Both with harmonization + if btn_col2.button("✅ Keep Both & Harmonize Names", use_container_width=True): + # Ensure the control name matches target name before moving on + new_c_p = SorterEngine.harmonize_names(t_p, c_p) + if new_c_p != c_p: + st.toast(f"Renamed control to match target.") + st.session_state.idx_id += 1 st.rerun() else: - st.info(f"No ID matches found between:\n\nTarget: `{path_rv_t}`\n\nControl: `{path_rv_c}`") + st.info("Review complete.") if st.button("Reset Review Progress"): st.session_state.idx_id = 0 st.rerun() \ No newline at end of file