mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-14 10:30:59 +01:00
Krzysztof kuhy Rudnicki
79879263ba
The workout log stored ONE workout per calendar day, so a second same-day
workout was silently dropped and could never earn credit.
Multiple workouts per day:
- workout_log.json: {date: entry} -> {date: [entry, ...]}. Legacy entries are
wrapped on read (_log_io.load_workout_log) so their HMACs stay valid — no
re-signing; every write normalizes the file, migrating it progressively.
- New write chokepoint (_log_mixin.write_signed_entry) APPENDS and dedups by a
stable workout_id, returning RecordResult so callers can tell a new workout
from a duplicate. Re-verifying the same workout is a no-op.
- count_weekly_workouts is anti-gaming: each VERIFIED workout counts
individually; self-reported manual entries count at most once per day. Four
real workouts in one day satisfy the week; four manual entries count as one.
- Reward: the day's first counted workout gets the base +2h; an additional
same-day VERIFIED workout gets +1h; an additional manual gets nothing. The
old "+1h when weekly_count > 4" gate is replaced — weekly volume is the
banked bonus's job and shouldn't be paid twice.
- Fixed: the unlock screen labelled the +1h "#{weekly_count - 4}", which can
render negative under the new rule. Removed the dead runnerup_manual type.
- Flutter: the manual budget counts distinct DAYS, matching the PC.
PC->phone sync (it had never worked once):
- push_pc_manuals pushed from a side-store written at log-time, so anything
logged before that feature existed could never publish. _manual_push now
derives the crdt log directly from workout_log.json — the single source of
truth — covering manual AND verified runs. The record id is the workout's own
workout_id (derived for legacy entries to match the phone's format) and the
HLC comes from the entry's own timestamp, so a re-push is byte-identical and
the repo never churns.
- The phone reads every kind (readMergedWorkoutPayloads) and lists the PC's
workouts under "SYNCED FROM PC". The manual budget still sees manual-only, so
a verified run can't consume a self-report slot.
- Settings claimed "Connected." whenever a token STRING existed. It now
verifies against the API on open, so a revoked token reports 401 instead of
showing a green lie.
Never fail silently:
- 30 swallowed exceptions across 19 files now log WARNING with the concrete
cause AND consequence — plus the token guards in _workout_sync that returned
[] in total silence, the exact bug that hid the dead sync for weeks.
- New pre-commit hook (scripts/check_silent_failures.py) fails any except that
neither re-raises nor logs loudly. ruff's S110 only catches `except: pass`;
the real pattern here was `except: log.info(); return []`. Documented in
CLAUDE.md.
Verified on real data: the Jul 13 run (pulled from its actual TCX over ADB) now
counts alongside that day's manual squash, and all three workouts are published
to kuhyx/syncs.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Fv8ULVt3Q67GwCFbM7doHB
245 lines
10 KiB
Python
245 lines
10 KiB
Python
"""Tests for screen_locker._status.run_status()."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from pathlib import Path
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from screen_locker._status import _load_extra_benefits, run_status
|
|
from screen_locker.tests.conftest import _make_locker
|
|
|
|
if TYPE_CHECKING:
|
|
import pytest
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# _load_extra_benefits helpers
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestLoadExtraBenefits:
|
|
"""Tests for _load_extra_benefits."""
|
|
|
|
def test_missing_file_returns_empty(self, tmp_path: Path) -> None:
|
|
"""Non-existent EXTRA_BENEFITS_FILE → {}."""
|
|
with patch("screen_locker._status.EXTRA_BENEFITS_FILE", tmp_path / "nope.json"):
|
|
assert _load_extra_benefits() == {}
|
|
|
|
def test_valid_json_returned(self, tmp_path: Path) -> None:
|
|
"""Valid JSON → dict."""
|
|
f = tmp_path / "eb.json"
|
|
f.write_text(json.dumps({"skip_credits": 2}))
|
|
with patch("screen_locker._status.EXTRA_BENEFITS_FILE", f):
|
|
assert _load_extra_benefits() == {"skip_credits": 2}
|
|
|
|
def test_invalid_json_returns_empty(self, tmp_path: Path) -> None:
|
|
"""ValueError (invalid JSON) → {}."""
|
|
f = tmp_path / "eb.json"
|
|
f.write_text("{bad}")
|
|
with patch("screen_locker._status.EXTRA_BENEFITS_FILE", f):
|
|
assert _load_extra_benefits() == {}
|
|
|
|
def test_oserror_returns_empty(self, tmp_path: Path) -> None:
|
|
"""OSError on read_text → {}."""
|
|
f = tmp_path / "eb.json"
|
|
f.write_text("{}")
|
|
with (
|
|
patch("screen_locker._status.EXTRA_BENEFITS_FILE", f),
|
|
patch.object(Path, "read_text", side_effect=OSError("perm")),
|
|
):
|
|
assert _load_extra_benefits() == {}
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# run_status integration tests
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestRunStatusNormal:
|
|
"""Tests for run_status display paths (no workouts in log)."""
|
|
|
|
def test_empty_log_no_fill(
|
|
self, tmp_path: Path, capsys: pytest.CaptureFixture
|
|
) -> None:
|
|
"""Empty log, no RunnerUp fill → 'No new workouts found', need-more message."""
|
|
eb_file = tmp_path / "eb.json"
|
|
log_file = tmp_path / "log.json"
|
|
locker = _make_locker(log_file, n_filled=0)
|
|
with (
|
|
patch("screen_locker._status.EXTRA_BENEFITS_FILE", eb_file),
|
|
patch("screen_locker._status.current_streak", return_value=0),
|
|
patch("screen_locker._status.has_extended_early_bird", return_value=False),
|
|
patch("screen_locker._status.count_weekly_workouts", return_value=0),
|
|
patch("sys.exit"),
|
|
):
|
|
run_status(locker)
|
|
out = capsys.readouterr().out
|
|
assert "No new workouts found" in out
|
|
assert "Need" in out
|
|
|
|
def test_full_week_no_break_when_today_is_sunday(
|
|
self, tmp_path: Path, capsys: pytest.CaptureFixture
|
|
) -> None:
|
|
"""Today == the week's Sunday: the per-day loop runs all 7 days, never breaking early."""
|
|
from datetime import datetime, timezone
|
|
|
|
fixed_now = datetime(2026, 7, 5, 12, 0, tzinfo=timezone.utc) # a real Sunday
|
|
eb_file = tmp_path / "eb.json"
|
|
log_file = tmp_path / "log.json"
|
|
locker = _make_locker(log_file, n_filled=0)
|
|
mock_datetime_cls = MagicMock()
|
|
mock_datetime_cls.now.return_value = fixed_now
|
|
with (
|
|
patch("screen_locker._status.datetime", mock_datetime_cls),
|
|
patch("screen_locker._status.EXTRA_BENEFITS_FILE", eb_file),
|
|
patch("screen_locker._status.current_streak", return_value=0),
|
|
patch("screen_locker._status.has_extended_early_bird", return_value=False),
|
|
patch("screen_locker._status.count_weekly_workouts", return_value=0),
|
|
patch("sys.exit"),
|
|
):
|
|
run_status(locker)
|
|
out = capsys.readouterr().out
|
|
assert out.count("no entry") == 7
|
|
|
|
def test_sick_day_shown_when_no_log_entry(
|
|
self, tmp_path: Path, capsys: pytest.CaptureFixture
|
|
) -> None:
|
|
"""A date with no workout_log entry but in sick_history → shown as sick_day."""
|
|
from datetime import datetime, timezone
|
|
|
|
today = datetime.now(tz=timezone.utc).astimezone().date().isoformat()
|
|
eb_file = tmp_path / "eb.json"
|
|
log_file = tmp_path / "log.json"
|
|
history_file = tmp_path / "sick_history.json"
|
|
history_file.write_text(json.dumps({"sick_days": [today]}))
|
|
locker = _make_locker(log_file, n_filled=0)
|
|
with (
|
|
patch("screen_locker._status.EXTRA_BENEFITS_FILE", eb_file),
|
|
patch("screen_locker._status.current_streak", return_value=0),
|
|
patch("screen_locker._status.has_extended_early_bird", return_value=False),
|
|
patch("screen_locker._status.count_weekly_workouts", return_value=0),
|
|
patch("sys.exit"),
|
|
):
|
|
run_status(locker)
|
|
out = capsys.readouterr().out
|
|
assert "sick_day" in out
|
|
|
|
def test_shutdown_config_printed(
|
|
self, tmp_path: Path, capsys: pytest.CaptureFixture
|
|
) -> None:
|
|
"""Shutdown config present → shutdown time line shown."""
|
|
eb_file = tmp_path / "eb.json"
|
|
locker = _make_locker(tmp_path / "log.json", cfg=(22, 22, 5))
|
|
with (
|
|
patch("screen_locker._status.EXTRA_BENEFITS_FILE", eb_file),
|
|
patch("screen_locker._status.current_streak", return_value=0),
|
|
patch("screen_locker._status.has_extended_early_bird", return_value=False),
|
|
patch("screen_locker._status.count_weekly_workouts", return_value=0),
|
|
patch("sys.exit"),
|
|
):
|
|
run_status(locker)
|
|
out = capsys.readouterr().out
|
|
assert "Shutdown tonight" in out
|
|
assert "22:00" in out
|
|
|
|
def test_no_shutdown_config(
|
|
self, tmp_path: Path, capsys: pytest.CaptureFixture
|
|
) -> None:
|
|
"""Shutdown config None → no shutdown line."""
|
|
eb_file = tmp_path / "eb.json"
|
|
locker = _make_locker(tmp_path / "log.json", cfg=None)
|
|
with (
|
|
patch("screen_locker._status.EXTRA_BENEFITS_FILE", eb_file),
|
|
patch("screen_locker._status.current_streak", return_value=0),
|
|
patch("screen_locker._status.has_extended_early_bird", return_value=False),
|
|
patch("screen_locker._status.count_weekly_workouts", return_value=0),
|
|
patch("sys.exit"),
|
|
):
|
|
run_status(locker)
|
|
out = capsys.readouterr().out
|
|
assert "Shutdown tonight" not in out
|
|
|
|
def test_shutdown_bonus_and_streak_shown(
|
|
self, tmp_path: Path, capsys: pytest.CaptureFixture
|
|
) -> None:
|
|
"""bonus_hours=3, streak=2, eb_ext=True → shown in output."""
|
|
eb_file = tmp_path / "eb.json"
|
|
locker = _make_locker(tmp_path / "log.json", n_filled=0)
|
|
with (
|
|
patch("screen_locker._status.EXTRA_BENEFITS_FILE", eb_file),
|
|
patch("screen_locker._status.weekly_shutdown_bonus_hours", return_value=3),
|
|
patch("screen_locker._status.current_streak", return_value=2),
|
|
patch("screen_locker._status.has_extended_early_bird", return_value=True),
|
|
patch("screen_locker._status.count_weekly_workouts", return_value=0),
|
|
patch("sys.exit"),
|
|
):
|
|
run_status(locker)
|
|
out = capsys.readouterr().out
|
|
assert "Shutdown bonus (this wk): 3h" in out
|
|
assert "Streak (5+ wks) : 2" in out
|
|
assert "Yes — until 09:00" in out
|
|
|
|
|
|
class TestRunStatusWorkoutLog:
|
|
"""Tests for per-day log display and counted/uncounted workout marking."""
|
|
|
|
def test_counted_entry_shown_with_checkmark(
|
|
self, tmp_path: Path, capsys: pytest.CaptureFixture
|
|
) -> None:
|
|
"""Log entry with counted type → ✓ mark printed."""
|
|
from datetime import datetime, timezone
|
|
|
|
today = datetime.now(tz=timezone.utc).astimezone().date().isoformat()
|
|
log_file = tmp_path / "log.json"
|
|
log_file.write_text(
|
|
json.dumps(
|
|
{
|
|
today: {
|
|
"workout_data": {
|
|
"type": "runnerup_verified",
|
|
"source": "run.tcx",
|
|
}
|
|
}
|
|
}
|
|
)
|
|
)
|
|
eb_file = tmp_path / "eb.json"
|
|
locker = _make_locker(log_file, n_filled=0)
|
|
with (
|
|
patch("screen_locker._status.EXTRA_BENEFITS_FILE", eb_file),
|
|
patch("screen_locker._status.current_streak", return_value=0),
|
|
patch("screen_locker._status.has_extended_early_bird", return_value=False),
|
|
patch("screen_locker._status.count_weekly_workouts", return_value=1),
|
|
patch("sys.exit"),
|
|
):
|
|
run_status(locker)
|
|
out = capsys.readouterr().out
|
|
assert "✓" in out
|
|
assert "runnerup_verified" in out
|
|
assert "run.tcx" in out
|
|
|
|
def test_uncounted_entry_shown_with_x(
|
|
self, tmp_path: Path, capsys: pytest.CaptureFixture
|
|
) -> None:
|
|
"""Log entry with uncounted type → ✗ mark printed."""
|
|
from datetime import datetime, timezone
|
|
|
|
today = datetime.now(tz=timezone.utc).astimezone().date().isoformat()
|
|
log_file = tmp_path / "log.json"
|
|
log_file.write_text(
|
|
json.dumps({today: {"workout_data": {"type": "heat_skip", "source": ""}}})
|
|
)
|
|
eb_file = tmp_path / "eb.json"
|
|
locker = _make_locker(log_file, n_filled=0)
|
|
with (
|
|
patch("screen_locker._status.EXTRA_BENEFITS_FILE", eb_file),
|
|
patch("screen_locker._status.current_streak", return_value=0),
|
|
patch("screen_locker._status.has_extended_early_bird", return_value=False),
|
|
patch("screen_locker._status.count_weekly_workouts", return_value=0),
|
|
patch("sys.exit"),
|
|
):
|
|
run_status(locker)
|
|
out = capsys.readouterr().out
|
|
assert "heat_skip" in out
|