From 8aec1ae269fb6af55271aee11634cc9ee5955b36 Mon Sep 17 00:00:00 2001 From: kodi Date: Mon, 9 Mar 2026 11:40:21 +0100 Subject: [PATCH] feat: Set File Date to First Aired Date --- app/api/session.py | 20 ++++ app/services/session_service.py | 108 +++++++++++++++++ app/static/app.js | 51 ++++++++ app/static/styles.css | 32 +++++ app/templates/index.html | 56 ++++++--- data/session_state.sqlite3 | Bin 69632 -> 81920 bytes feature_tests_settings.sh | 199 ++++++++++++++++++++++++++++++++ 7 files changed, 450 insertions(+), 16 deletions(-) create mode 100755 feature_tests_settings.sh diff --git a/app/api/session.py b/app/api/session.py index a5f765d..1e6d796 100644 --- a/app/api/session.py +++ b/app/api/session.py @@ -24,6 +24,10 @@ class SelectedFilesReorderRequest(BaseModel): to_index: int = Field(ge=0) +class SessionSettingsRequest(BaseModel): + set_file_date_to_first_aired_date: bool + + def _normalize_session_id(session_id: str) -> str: normalized = session_id.strip() if not normalized: @@ -139,6 +143,22 @@ def reorder_selected_files( return {"session_id": normalized_session_id, "items": items} +@router.get("/settings") +def get_session_settings(): + service = SessionService() + return {"settings": service.get_settings()} + + +@router.put("/settings") +def put_session_settings(payload: SessionSettingsRequest): + service = SessionService() + try: + settings = service.update_settings(payload.model_dump()) + except ValueError as exc: + raise HTTPException(status_code=400, detail=str(exc)) + return {"settings": settings} + + @router.get("/mapping-preview") def get_mapping_preview(session_id: str = Query("default", min_length=1)): service = SessionService() diff --git a/app/services/session_service.py b/app/services/session_service.py index 6fe3416..5975cb3 100644 --- a/app/services/session_service.py +++ b/app/services/session_service.py @@ -10,6 +10,8 @@ from app.config import APP_DATA_DIR class SessionService: + FILE_DATE_SETTING_KEY = "set_file_date_to_first_aired_date" + def __init__(self) -> None: self._db_path = Path(APP_DATA_DIR) / "session_state.sqlite3" self._db_path.parent.mkdir(parents=True, exist_ok=True) @@ -110,6 +112,53 @@ class SessionService: ON rename_run_items(run_id, item_index) """ ) + conn.execute( + """ + CREATE TABLE IF NOT EXISTS app_settings ( + key TEXT PRIMARY KEY, + value TEXT NOT NULL, + updated_at TEXT NOT NULL + ) + """ + ) + + def get_settings(self) -> dict: + with self._connect() as conn: + rows = conn.execute( + """ + SELECT key, value + FROM app_settings + """ + ).fetchall() + + values = {str(row["key"]): str(row["value"]) for row in rows} + return { + self.FILE_DATE_SETTING_KEY: values.get(self.FILE_DATE_SETTING_KEY, "0") == "1", + } + + def update_settings(self, settings: dict) -> dict: + if self.FILE_DATE_SETTING_KEY not in settings: + raise ValueError(f"missing required setting: {self.FILE_DATE_SETTING_KEY}") + setting_value = settings[self.FILE_DATE_SETTING_KEY] + if not isinstance(setting_value, bool): + raise ValueError(f"{self.FILE_DATE_SETTING_KEY} must be boolean") + + stored_value = "1" if setting_value else "0" + updated_at = datetime.now(timezone.utc).isoformat() + + with self._connect() as conn: + conn.execute( + """ + INSERT INTO app_settings (key, value, updated_at) + VALUES (?, ?, ?) + ON CONFLICT(key) DO UPDATE SET + value = excluded.value, + updated_at = excluded.updated_at + """, + (self.FILE_DATE_SETTING_KEY, stored_value, updated_at), + ) + + return self.get_settings() def list_selected_episodes(self, session_id: str) -> list[dict]: with self._connect() as conn: @@ -467,9 +516,15 @@ class SessionService: started_at = time.perf_counter() preview = self.build_filename_preview(session_id) + settings = self.get_settings() + set_file_date_to_first_aired = bool(settings.get(self.FILE_DATE_SETTING_KEY, False)) allowed_roots = self._allowed_media_roots() preflight_items = [] preflight_errors = 0 + aired_by_index = {} + + for preview_item in preview["items"]: + aired_by_index[int(preview_item["index"])] = preview_item["episode"].get("aired") for item in preview["items"]: source_path_str = str(item["file"].get("path") or "").strip() @@ -499,6 +554,8 @@ class SessionService: "proposed_filename": proposed_filename, "status": status, "errors": errors, + "file_date_status": "file_date_skipped", + "file_date_detail": "rename not executed due to preflight failure", } ) @@ -523,11 +580,19 @@ class SessionService: source_path = Path(item["source_path"]) destination_path = Path(item["destination_path"]) os.replace(str(source_path), str(destination_path)) + + file_date_status, file_date_detail = self._apply_file_date_after_rename( + enabled=set_file_date_to_first_aired, + aired_value=aired_by_index.get(int(item["index"])), + destination_path=destination_path, + ) results.append( { **item, "status": "renamed", "errors": [], + "file_date_status": file_date_status, + "file_date_detail": file_date_detail, } ) @@ -546,6 +611,49 @@ class SessionService: ) return result + def _apply_file_date_after_rename( + self, + enabled: bool, + aired_value, + destination_path: Path, + ) -> tuple[str, str]: + if not enabled: + return ("file_date_skipped", "setting disabled") + + ts = self._aired_to_local_noon_timestamp(aired_value) + if ts is None: + return ("file_date_skipped", "aired date missing or invalid") + + try: + os.utime(destination_path, (ts, ts)) + return ("file_date_updated", "mtime+atime set to aired date at 12:00 local time") + except Exception as exc: + return ("file_date_error", str(exc)) + + def _aired_to_local_noon_timestamp(self, aired_value) -> float | None: + if aired_value is None: + return None + + text = str(aired_value).strip() + if not text: + return None + date_text = text[:10] + + try: + date_part = datetime.strptime(date_text, "%Y-%m-%d") + except ValueError: + return None + + local_noon = datetime( + date_part.year, + date_part.month, + date_part.day, + 12, + 0, + 0, + ) + return local_noon.timestamp() + def _log_rename_run(self, session_id: str, result: dict, duration_ms: int) -> None: created_at = datetime.now(timezone.utc).isoformat() counts = result.get("counts", {}) diff --git a/app/static/app.js b/app/static/app.js index 909a240..933eac1 100644 --- a/app/static/app.js +++ b/app/static/app.js @@ -14,6 +14,9 @@ modalFiles: [], modalSelectedFilePaths: new Set(), syncScrolling: false, + settings: { + set_file_date_to_first_aired_date: false, + }, }; const el = { @@ -30,6 +33,11 @@ seriesStatus: document.getElementById("seriesStatus"), seriesOverview: document.getElementById("seriesOverview"), seriesTvdbLink: document.getElementById("seriesTvdbLink"), + settingsBtn: document.getElementById("settingsBtn"), + settingsModal: document.getElementById("settingsModal"), + closeSettingsModalBtn: document.getElementById("closeSettingsModalBtn"), + saveSettingsBtn: document.getElementById("saveSettingsBtn"), + setFileDateToFirstAiredDateInput: document.getElementById("setFileDateToFirstAiredDateInput"), refreshEpisodesBtn: document.getElementById("refreshEpisodesBtn"), episodesList: document.getElementById("episodesList"), episodeMeta: document.getElementById("episodeMeta"), @@ -199,6 +207,42 @@ el.fileMeta.innerHTML = `Rows: ${fileCount} ${mismatchText}`; } + function applySettingsToForm() { + el.setFileDateToFirstAiredDateInput.checked = !!state.settings.set_file_date_to_first_aired_date; + } + + function openSettingsModal() { + applySettingsToForm(); + el.settingsModal.classList.remove("hidden"); + el.settingsModal.setAttribute("aria-hidden", "false"); + } + + function closeSettingsModal() { + el.settingsModal.classList.add("hidden"); + el.settingsModal.setAttribute("aria-hidden", "true"); + } + + async function loadSettings() { + const data = await api("/api/session/settings"); + state.settings = data.settings || { set_file_date_to_first_aired_date: false }; + applySettingsToForm(); + } + + async function saveSettings() { + const payload = { + set_file_date_to_first_aired_date: !!el.setFileDateToFirstAiredDateInput.checked, + }; + const data = await api("/api/session/settings", { + method: "PUT", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(payload), + }); + state.settings = data.settings || payload; + applySettingsToForm(); + closeSettingsModal(); + out("Settings saved", data); + } + function selectPair(index) { state.selectedPairIndex = index; renderSelectedEpisodes(); @@ -557,6 +601,12 @@ function bindEvents() { el.searchBtn.addEventListener("click", () => withHandler(doSearch, el.searchBtn)); + el.settingsBtn.addEventListener("click", openSettingsModal); + el.closeSettingsModalBtn.addEventListener("click", closeSettingsModal); + el.saveSettingsBtn.addEventListener("click", () => withHandler(saveSettings, el.saveSettingsBtn)); + el.settingsModal.addEventListener("click", (e) => { + if (e.target === el.settingsModal) closeSettingsModal(); + }); el.refreshEpisodesBtn.addEventListener("click", () => withHandler(loadEpisodes, el.refreshEpisodesBtn)); el.refreshSelectedEpisodesBtn.addEventListener("click", () => withHandler(loadSelectedEpisodes, el.refreshSelectedEpisodesBtn)); @@ -611,6 +661,7 @@ el.modalRecursiveInput.checked = true; renderSelectedSeriesDetails(); bindEvents(); + await loadSettings(); await loadSelectedEpisodes(); await loadSelectedFiles(); await loadRoots(); diff --git a/app/static/styles.css b/app/static/styles.css index da3ece0..849ba63 100644 --- a/app/static/styles.css +++ b/app/static/styles.css @@ -63,6 +63,11 @@ body { overflow: hidden; } +#panelSearch .panel-body { + flex: 1; + min-height: 0; +} + .panel h2 { margin: 0 0 10px; font-size: 16px; @@ -223,6 +228,10 @@ button.secondary { min-height: 40px; } +.panel-search-footer { + justify-content: flex-end; +} + .mismatch { color: #b91c1c; font-weight: 700; @@ -265,6 +274,29 @@ button.secondary { max-height: 280px; } +.settings-card { + width: min(520px, 94vw); +} + +.settings-section h4 { + margin: 0 0 8px; + font-size: 14px; + color: #1e293b; +} + +.settings-check { + display: flex; + align-items: center; + gap: 8px; + font-size: 13px; + color: #334155; +} + +.settings-actions { + justify-content: flex-end; + margin-top: 12px; +} + #panelSelectedEpisodes .panel-footer button:first-child, #panelSelectedEpisodes .panel-footer button:last-child, #panelSelectedFiles .panel-footer button:first-child, diff --git a/app/templates/index.html b/app/templates/index.html index fd99bbf..86d5788 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -15,23 +15,28 @@

1. TV Shows

-
- - +
+
+ + +
+
+
    +
    -
    -
      -
      @@ -131,6 +136,25 @@ + + diff --git a/data/session_state.sqlite3 b/data/session_state.sqlite3 index 0194c4a6dd65daca9f475d214c0758b457af1b72..1b098bf6a6660cafc742d7727cebbb14ca69d95d 100644 GIT binary patch delta 4042 zcmc&%TTmO<8Q#_EvMXu#AcVLWCtlW=GXrbCly+`hD(3DeNC zDzwi71^Plq{re8NsPn%9xJ1!syQU-r=mo3xC)n7oo$Hqvbf{@q? z2z7-zM*fV%Y=5v-SSN7Fa?R9gd<}cS_}F}A$?%}uX}46=)}k{*Y4K1(5=Td4DJh+f z4-cgZ|8_js8Ex&3(%r2O?2Xce2)#|IvAD{PNE38-w6~ky*V)$I+Sy0%iS{YKwU-;8 z78B!&!%}M<9~~6a(qK$XD>nh%93agVdumZ6K0GKrn;J{R(^5E;eo5((6L8CNw1_qybG+8jYt$2BlQQ z3g50LZYq|8d+|l$CUKGY38Av5`%#rHX~4sqi~$@Sk9*iafMWz7D}?xv&%^U$q3qag-&Rang$43r z#f<8X-M@1g>xeH=1wXjQ@+I+S;sfGGkmq$GP-LWtuoo%9iYTKh`xG=+XRXo9;kvnN z#5G9yk#4QAm}y;WQ4LXQRF^t@?E5CH+;CR4OrJ5RJ70MdQ}@1jp5XAEhyy)|Sk9XN zYaRekP?sr&oV736t)_QPnDHJgYKWmHVJ+fBAMytLAjsSEnLboKnVB;i5d^(5pSgrK z&e$VnB!C|uS#vg?bH@kWVH!>X!wP<7OzBik%~Fc@vl;{2pv=v>Tx`(YNV^l_At?bL zbaydAlnE&v3$@K`1MQ)Gj8E{eJ`a3sQXci|Qh}UQQQ~q^On?jVK`7OX^2+INmrZey zKOIjeB#r-@Vj?l}j3f=ye36zH8fU!(qAq(K;1zT9H6Ipt|sQdKx0s-7&CQ z5Wy+l$NRV}g}sH$QxN$~GHl2%2%Lut`GW;>!Gyv>Ak2llKGyGNh2=ch|DT{}0T&a% z`Fs>6!sqvMJfCHFz_!eQqWN;zfPsON$$5D{!w39X0;3UYu_|Y-deswGCk^*I$wdU5 z2Y&*u0T~Q|cEEuuYKi(Q+zIEYm#Il=fNGOa1%ke6yHHN98;&B%4zC}psx`<<4 zq-0$LbUxLAVr_ z5rR~LJ_Ia+e}P+I0o(+ifRDjtZ~?pz-Uf5v$KWh@6=cA7z;WVw^3F~SMAVI|qo0N`x`wNW~1BO&X4 zE2+DE2LbOurME!hVbs_G+Tj5y_GCOE#k2!WEIk6hBva{_zSHaX*n*nVHW0XY171PU z)=su!G+qihg-~CSpWENFJ#XzLzJ*)Ow@ep}A7H;QoIt;aoXTXLa>~z9Bm!Nba*NzH zQ0=gB%?i4(V-w`p+gKL^cTFGc5nbZZgDLtUaZvfq=M8Y{t}R;u>UBWdL6wek6$Njs z07+?BJSq)7{)GH22?cQ|*eriTgo3`EnqXCtAPWWeiRrjBJRs%toKUaueok)l8u#;R z>WNP$$jw?ZtcDK}>N@$6{j%-X)&#N1GG@AD++z4}KJ!yU+021TN;frQk*DOUYKJq@ z16}PkGa>ELy1Le)vXSSSmO0y|V8~U=jqASboxJ+-x(bkubxNb%F4vbv4rsguZSQuR zku2wEQhG8GA3B_lNy+3$@^N=+WIQ<_(cBA{nOiHvgHZCUM zK|ne4cem?!UHK{}j>w~5lM~k}CnaBtldaBsGaCwCAOtMoqjb% zw<=%!ZS$R!!PZq}Fw@~IR-#(=X-Z1#g43L*b}Ppg+LcEZ8Wr$ahjYeSy1Y!<%S3?YTIsH|n55g_5|maJXBAu&1!z2r=9Y}GE}Ac0dBU-*Z;=Nks~vX# zLr|YLv3+e!XKqQ>K%VsvmN~Uuw|y$FI^!sTs_>HA<(@IPIbcGI7IsZh*gOndKLL*< zkIKIWKpX9{$eL Zqct%UTt~ol*erezYVX53h}*V`{{bf>Pr?8I delta 576 zcmXw$O-NKx6vyxTe(%0_@0n?snnB2k$wd%OgS4m_s8)ha3m0LKB%u$n4>HDuP6bm$ zvyyz=O*jd)w?(xB znt-j)%fvKDnE9!w#Anx-`23^UFK&NqwIzc{?LZ9b|T#c9FkjAzy#3HMWwvw8N~k|x}XLB_Od zenT< zuk(oqQ;I4+n)JLzj-URDoWuqSD=}nsoA1nH#zTEW&p;=gqcPI&EZGCvw01Ek_Fa6*x?*B|S6fuyDzkE_;`Pe2r32CsNd)_Fz(-JrpRfztunB9h0v})j=HWH? RqWfcD{(ieCcEB5t{07=)uUG&8 diff --git a/feature_tests_settings.sh b/feature_tests_settings.sh new file mode 100755 index 0000000..5a7ec8b --- /dev/null +++ b/feature_tests_settings.sh @@ -0,0 +1,199 @@ +#!/usr/bin/env bash +set -euo pipefail + +if [ -z "${BASE_URL:-}" ]; then + if curl --silent --fail http://127.0.0.1:8085/api/health >/dev/null 2>&1; then + BASE_URL="http://127.0.0.1:8085" + elif curl --silent --fail http://host.containers.internal:8085/api/health >/dev/null 2>&1; then + BASE_URL="http://host.containers.internal:8085" + else + echo "ERROR: could not determine BASE_URL. Tried 127.0.0.1 and host.containers.internal." >&2 + exit 1 + fi +fi + +if [ -z "${TEST_MEDIA_ROOT:-}" ]; then + for candidate in \ + "/Volumes/8TB/Shared_Folders/TV_Shows" \ + "/Volumes/8TB_RAID1/Shared_Folders/Library/TV_Shows" + do + if [ -d "$candidate" ] && [ -w "$candidate" ]; then + TEST_MEDIA_ROOT="$candidate" + break + fi + done +fi + +if [ -z "${TEST_MEDIA_ROOT:-}" ]; then + echo "ERROR: no writable allowed media root found. Set TEST_MEDIA_ROOT." >&2 + exit 1 +fi + +TMP_DIR="$(mktemp -d)" +TEST_DIR="${TEST_MEDIA_ROOT}/_rename_mvp_settings_$(date +%s)_$$" +mkdir -p "${TEST_DIR}" +trap 'rm -rf "$TMP_DIR"' EXIT + +SESSION_ID="settings-rename-$(date +%s)-$$" + +clear_session() { + local sid="$1" + curl --fail --silent --show-error -X DELETE \ + "${BASE_URL}/api/session/selected-episodes?session_id=${sid}" \ + >/dev/null + curl --fail --silent --show-error -X DELETE \ + "${BASE_URL}/api/session/selected-files?session_id=${sid}" \ + >/dev/null +} + +echo "== Feature test 1: settings endpoint returns expected key ==" +curl --fail --silent --show-error \ + "${BASE_URL}/api/session/settings" \ + -o "${TMP_DIR}/settings_get.json" + +cat "${TMP_DIR}/settings_get.json" + +python3 - "${TMP_DIR}/settings_get.json" <<'PY' +import json +import sys +from pathlib import Path + +data = json.loads(Path(sys.argv[1]).read_text(encoding="utf-8")) +settings = data.get("settings") +assert isinstance(settings, dict), "settings must be object" +assert "set_file_date_to_first_aired_date" in settings, "missing setting key" +assert isinstance(settings["set_file_date_to_first_aired_date"], bool), "setting must be boolean" +print("settings GET validation passed") +PY + +echo +echo "== Feature test 2: settings update persists round-trip ==" +cat > "${TMP_DIR}/settings_put_true.json" <<'JSON' +{ + "set_file_date_to_first_aired_date": true +} +JSON + +curl --fail --silent --show-error \ + -X PUT "${BASE_URL}/api/session/settings" \ + -H "Content-Type: application/json" \ + --data @"${TMP_DIR}/settings_put_true.json" \ + -o "${TMP_DIR}/settings_put_resp.json" + +curl --fail --silent --show-error \ + "${BASE_URL}/api/session/settings" \ + -o "${TMP_DIR}/settings_get_after_put.json" + +cat "${TMP_DIR}/settings_get_after_put.json" + +python3 - "${TMP_DIR}/settings_put_resp.json" "${TMP_DIR}/settings_get_after_put.json" <<'PY' +import json +import sys +from pathlib import Path + +put_data = json.loads(Path(sys.argv[1]).read_text(encoding="utf-8")) +get_data = json.loads(Path(sys.argv[2]).read_text(encoding="utf-8")) +assert put_data["settings"]["set_file_date_to_first_aired_date"] is True, "PUT should return true" +assert get_data["settings"]["set_file_date_to_first_aired_date"] is True, "GET after PUT should be true" +print("settings PUT/GET round-trip passed") +PY + +echo +echo "== Feature test 3: rename execute updates file date to aired date (12:00 local) ==" +clear_session "${SESSION_ID}" + +SRC="${TEST_DIR}/source_settings_test.mkv" +printf "settings-test" > "${SRC}" + +cat > "${TMP_DIR}/episodes.json" <<'JSON' +{ + "items": [ + { + "id": 101, + "series": "Elsbeth", + "year": "2024", + "season_number": 1, + "episode_number": 3, + "title": "Settings Date Test", + "aired": "2024-03-15" + } + ] +} +JSON + +cat > "${TMP_DIR}/files.json" </dev/null + +curl --fail --silent --show-error \ + -X POST "${BASE_URL}/api/session/selected-files?session_id=${SESSION_ID}" \ + -H "Content-Type: application/json" \ + --data @"${TMP_DIR}/files.json" \ + >/dev/null + +curl --fail --silent --show-error \ + -X POST "${BASE_URL}/api/session/rename-execute?session_id=${SESSION_ID}&confirm=true" \ + -o "${TMP_DIR}/rename_exec.json" + +cat "${TMP_DIR}/rename_exec.json" + +python3 - "${TMP_DIR}/rename_exec.json" <<'PY' +import json +import sys +from pathlib import Path + +data = json.loads(Path(sys.argv[1]).read_text(encoding="utf-8")) +assert data.get("executed") is True, "rename should execute" +assert data.get("preflight_ok") is True, "preflight should pass" +items = data.get("items") or [] +assert len(items) == 1, "expected 1 item" +item = items[0] +assert item.get("status") == "renamed", "item status must be renamed" +assert item.get("file_date_status") == "file_date_updated", "file_date_status should be updated" +print("rename response settings validation passed") +PY + +DST="${TEST_DIR}/Elsbeth (2024) - S01E03 - Settings Date Test.mkv" +test -f "${DST}" + +python3 - "${DST}" <<'PY' +import os +import sys +from datetime import datetime +from pathlib import Path + +dst = Path(sys.argv[1]) +st = dst.stat() +expected = datetime(2024, 3, 15, 12, 0, 0).timestamp() +delta = abs(st.st_mtime - expected) +assert delta < 2.5, f"mtime delta too large: {delta}" +print("mtime validation passed") +PY + +# Reset setting back to false to keep environment stable for subsequent runs. +cat > "${TMP_DIR}/settings_put_false.json" <<'JSON' +{ + "set_file_date_to_first_aired_date": false +} +JSON +curl --fail --silent --show-error \ + -X PUT "${BASE_URL}/api/session/settings" \ + -H "Content-Type: application/json" \ + --data @"${TMP_DIR}/settings_put_false.json" \ + >/dev/null + +echo +echo "All settings feature tests passed."