mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 20:27:13 +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
92 lines
3.9 KiB
Python
92 lines
3.9 KiB
Python
"""Tests for screen_locker._log_io — the workout-log normalization layer."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import patch
|
|
|
|
from screen_locker._log_io import load_workout_log, read_raw_log
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
|
|
class TestReadRawLog:
|
|
"""Tests for read_raw_log (verbatim on-disk shape)."""
|
|
|
|
def test_missing_file_returns_empty(self, tmp_path: Path) -> None:
|
|
"""Non-existent file → {}."""
|
|
assert read_raw_log(tmp_path / "nope.json") == {}
|
|
|
|
def test_returns_contents_verbatim(self, tmp_path: Path) -> None:
|
|
"""Values are returned unchanged — dict or list."""
|
|
f = tmp_path / "log.json"
|
|
f.write_text(json.dumps({"2026-07-13": {"workout_data": {"type": "x"}}}))
|
|
assert read_raw_log(f) == {"2026-07-13": {"workout_data": {"type": "x"}}}
|
|
|
|
def test_invalid_json_returns_empty(self, tmp_path: Path) -> None:
|
|
"""Corrupt JSON → {}."""
|
|
f = tmp_path / "log.json"
|
|
f.write_text("{not json}")
|
|
assert read_raw_log(f) == {}
|
|
|
|
def test_oserror_returns_empty(self, tmp_path: Path) -> None:
|
|
"""OSError on open → {}."""
|
|
f = tmp_path / "log.json"
|
|
f.write_text("{}")
|
|
with patch("builtins.open", side_effect=OSError("perm")):
|
|
assert read_raw_log(f) == {}
|
|
|
|
def test_non_dict_top_level_returns_empty(self, tmp_path: Path) -> None:
|
|
"""A JSON list/scalar at the top level is not a log → {}."""
|
|
f = tmp_path / "log.json"
|
|
f.write_text(json.dumps([1, 2, 3]))
|
|
assert read_raw_log(f) == {}
|
|
|
|
|
|
class TestLoadWorkoutLog:
|
|
"""Tests for load_workout_log (normalizes both shapes to per-day lists)."""
|
|
|
|
def test_missing_file_returns_empty(self, tmp_path: Path) -> None:
|
|
"""Non-existent file → {}."""
|
|
assert load_workout_log(tmp_path / "nope.json") == {}
|
|
|
|
def test_legacy_dict_value_is_wrapped_in_a_list(self, tmp_path: Path) -> None:
|
|
"""The old one-entry-per-day shape reads as a one-element list."""
|
|
entry = {"timestamp": "t", "workout_data": {"type": "runnerup_verified"}}
|
|
f = tmp_path / "log.json"
|
|
f.write_text(json.dumps({"2026-07-12": entry}))
|
|
assert load_workout_log(f) == {"2026-07-12": [entry]}
|
|
|
|
def test_list_value_is_passed_through(self, tmp_path: Path) -> None:
|
|
"""The new multi-entry shape is returned as-is, order preserved."""
|
|
a = {"workout_data": {"type": "manual_workout"}}
|
|
b = {"workout_data": {"type": "runnerup_verified"}}
|
|
f = tmp_path / "log.json"
|
|
f.write_text(json.dumps({"2026-07-13": [a, b]}))
|
|
assert load_workout_log(f) == {"2026-07-13": [a, b]}
|
|
|
|
def test_malformed_list_elements_are_dropped(self, tmp_path: Path) -> None:
|
|
"""Non-dict entries inside a day's list are ignored."""
|
|
good = {"workout_data": {"type": "phone_verified"}}
|
|
f = tmp_path / "log.json"
|
|
f.write_text(json.dumps({"2026-07-13": [good, "junk", 7, None]}))
|
|
assert load_workout_log(f) == {"2026-07-13": [good]}
|
|
|
|
def test_malformed_day_value_is_skipped(self, tmp_path: Path) -> None:
|
|
"""A day whose value is neither dict nor list is omitted entirely."""
|
|
good = {"workout_data": {"type": "phone_verified"}}
|
|
f = tmp_path / "log.json"
|
|
f.write_text(json.dumps({"2026-07-13": good, "2026-07-14": "junk"}))
|
|
assert load_workout_log(f) == {"2026-07-13": [good]}
|
|
|
|
def test_mixed_legacy_and_new_shapes(self, tmp_path: Path) -> None:
|
|
"""A half-migrated file reads correctly — both shapes coexist."""
|
|
legacy = {"workout_data": {"type": "runnerup_verified"}}
|
|
a = {"workout_data": {"type": "manual_workout"}}
|
|
b = {"workout_data": {"type": "runnerup_verified"}}
|
|
f = tmp_path / "log.json"
|
|
f.write_text(json.dumps({"2026-07-12": legacy, "2026-07-13": [a, b]}))
|
|
assert load_workout_log(f) == {"2026-07-12": [legacy], "2026-07-13": [a, b]}
|