From b25933f975c71c8f69a44ee5a6cd9b423508dee0 Mon Sep 17 00:00:00 2001 From: Krzysztof kuhy Rudnicki Date: Sat, 21 Nov 2026 22:00:54 +0100 Subject: [PATCH] earned_time: fail closed on a moved review ledger The guard ledger is found by stripping REVIEW.ledger off the review ledger path; a path that does not end in it now warns and answers None instead of reading the wrong file or raising IndexError. Co-Authored-By: Claude Fable 5.2 Claude-Session: https://claude.ai/code/session_01WzxdWXLvi9aq4MxL4XHKJ4 --- earned_time/earned_time/_review.py | 24 ++++++++++++++----- .../earned_time/tests/test_review_edges.py | 19 ++++++++++++++- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/earned_time/earned_time/_review.py b/earned_time/earned_time/_review.py index a1de6c8..1443599 100644 --- a/earned_time/earned_time/_review.py +++ b/earned_time/earned_time/_review.py @@ -141,15 +141,18 @@ def _firsts(rows: list[dict[str, object]]) -> dict[str, dict[str, object]]: return firsts -def guard_ledger_for(ledger: Path, earner: Earner) -> Path: +def guard_ledger_for(ledger: Path, earner: Earner) -> Path | None: """The guard ledger under the same home as ``ledger`` (``earner.ledger``). The consumer resolves only the review ledger (``home / earner.ledger``), - so the home is that path with ``earner.ledger``'s depth stripped: a test - that redirects the home redirects both ledgers. + so the home is that path with ``earner.ledger``'s parts stripped: a test + that redirects the home redirects both ledgers. ``None`` when ``ledger`` + does not end in ``earner.ledger``: no home to find the guard under. """ - depth = len(PurePosixPath(str(earner.ledger)).parts) - return ledger.parents[depth - 1] / GUARD_LEDGER + parts = PurePosixPath(str(earner.ledger)).parts + if ledger.parts[-len(parts) :] != parts or len(ledger.parts) <= len(parts): + return None + return ledger.parents[len(parts) - 1] / GUARD_LEDGER def _pays(row: dict[str, object], accepted: dict[str, list[float]]) -> bool: @@ -188,7 +191,16 @@ def paid_reviews( if not today: return iter(()) guard = replace(earner, label="LeetCode guard", missing_ledger_is_no=False) - guard_rows = read_rows(guard_ledger_for(ledger, earner), guard) + path = guard_ledger_for(ledger, earner) + if path is None: + _logger.warning( + "%s ledger %s is not at home/%s; cannot find the guard ledger", + earner.label, + ledger, + earner.ledger, + ) + return None + guard_rows = read_rows(path, guard) if guard_rows is None: return None accepted = _accepted(guard_rows, key) diff --git a/earned_time/earned_time/tests/test_review_edges.py b/earned_time/earned_time/tests/test_review_edges.py index 5fe9de4..08acbdd 100644 --- a/earned_time/earned_time/tests/test_review_edges.py +++ b/earned_time/earned_time/tests/test_review_edges.py @@ -4,6 +4,8 @@ from __future__ import annotations import json +import logging +from pathlib import Path from typing import TYPE_CHECKING from earned_time import ( @@ -24,7 +26,7 @@ from earned_time.tests._review_rows import ( ) if TYPE_CHECKING: - from pathlib import Path + import pytest def _unsigned(row: dict[str, object]) -> dict[str, object]: @@ -75,3 +77,18 @@ def test_junk_review_rows_are_skipped(tmp_path: Path, key_file: Path) -> None: def test_the_guard_ledger_shares_the_review_ledgers_home(tmp_path: Path) -> None: review_ledger = tmp_path / str(REVIEW.ledger) assert guard_ledger_for(review_ledger, REVIEW) == tmp_path / GUARD_LEDGER + + +def test_a_review_ledger_off_its_path_cannot_check( + tmp_path: Path, key_file: Path, caplog: pytest.LogCaptureFixture +) -> None: + caplog.set_level(logging.WARNING) + home_with(tmp_path, [review()], [accepted()]) + moved = tmp_path / "elsewhere.json" + moved.write_bytes((tmp_path / str(REVIEW.ledger)).read_bytes()) + assert done_today(REVIEW, moved, key_file, now=evening()) is None + assert "cannot find the guard ledger" in caplog.text + + +def test_a_shallow_path_has_no_guard() -> None: + assert guard_ledger_for(Path(str(REVIEW.ledger)), REVIEW) is None