mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-15 06:10: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
236 lines
9.5 KiB
Python
236 lines
9.5 KiB
Python
"""Tests for manual-workout integration in _ui_flows.py and screen_lock.py."""
|
|
# pylint: disable=protected-access
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from screen_locker import _manual_workout, _sick_tracker
|
|
from screen_locker._log_mixin import RecordResult
|
|
from screen_locker._sick_tracker import SickHistory
|
|
from screen_locker.tests.conftest import create_locker
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
|
|
class TestShowRetryAndManualWorkoutBudget:
|
|
"""Tests for the "Log Manual Workout" button in _show_retry_and_sick."""
|
|
|
|
def test_shows_button_when_budget_available(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(_sick_tracker, "load_history", return_value=SickHistory()),
|
|
patch.object(_manual_workout, "is_budget_exhausted", return_value=False),
|
|
):
|
|
locker._show_retry_and_sick("nope")
|
|
button_texts = {c.kwargs.get("text") for c in mock_tk.Button.call_args_list}
|
|
assert "Log Manual Workout" in button_texts
|
|
|
|
def test_hides_button_when_budget_exhausted(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
with (
|
|
patch.object(_sick_tracker, "load_history", return_value=SickHistory()),
|
|
patch.object(_manual_workout, "is_budget_exhausted", return_value=True),
|
|
):
|
|
locker._show_retry_and_sick("nope")
|
|
button_texts: set[str] = set()
|
|
for call in mock_tk.Button.call_args_list:
|
|
button_texts.add(call.kwargs.get("text", ""))
|
|
assert "Log Manual Workout" not in button_texts
|
|
text_calls = [c.kwargs.get("text", "") for c in mock_tk.Label.call_args_list]
|
|
assert any("Manual-workout budget exhausted" in t for t in text_calls)
|
|
|
|
|
|
class TestOnManualWorkoutSaved:
|
|
"""Tests for UIFlowsMixin._on_manual_workout_saved."""
|
|
|
|
def test_sets_workout_data_and_schedules_unlock(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
object.__setattr__(locker, "unlock_screen", MagicMock())
|
|
object.__setattr__(locker.root, "after", MagicMock())
|
|
entry = {"type": "manual_workout", "source": "table tennis at Solec"}
|
|
|
|
locker._on_manual_workout_saved(entry)
|
|
|
|
assert locker.workout_data == entry
|
|
locker.unlock_screen.assert_not_called()
|
|
locker.root.after.assert_called_once_with(1500, locker.unlock_screen)
|
|
|
|
|
|
class TestOnManualWorkoutCancelled:
|
|
"""Tests for UIFlowsMixin._on_manual_workout_cancelled."""
|
|
|
|
def test_returns_to_phone_check(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
object.__setattr__(locker, "_start_phone_check", MagicMock())
|
|
locker._on_manual_workout_cancelled()
|
|
locker._start_phone_check.assert_called_once()
|
|
|
|
|
|
class TestApplyWorkoutCredit:
|
|
"""Tests for ScreenLocker._apply_workout_credit under the multi-per-day rule.
|
|
|
|
Credit is now driven by the :class:`RecordResult` the write chokepoint
|
|
returns (``appended`` + ``prior_entries``), not a separate
|
|
``_was_already_counted_today`` probe (removed).
|
|
"""
|
|
|
|
def test_skips_credit_when_duplicate_already_logged_today(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
"""save_workout_log reports a duplicate (appended=False) → no new credit."""
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.workout_data = {"type": "manual_workout"}
|
|
object.__setattr__(
|
|
locker,
|
|
"save_workout_log",
|
|
MagicMock(return_value=RecordResult(appended=False, prior_entries=[])),
|
|
)
|
|
object.__setattr__(
|
|
locker, "_try_adjust_shutdown_for_workout", MagicMock(return_value=True)
|
|
)
|
|
object.__setattr__(
|
|
locker, "_clear_debt_on_verified_workout", MagicMock(return_value=0)
|
|
)
|
|
|
|
result = locker._apply_workout_credit()
|
|
|
|
assert result.already_counted_today is True
|
|
assert result.shutdown_adjusted is False
|
|
assert result.new_debt is None
|
|
assert result.extra_bonus_delta == 0
|
|
locker._try_adjust_shutdown_for_workout.assert_not_called()
|
|
locker._clear_debt_on_verified_workout.assert_not_called()
|
|
locker.save_workout_log.assert_called_once() # log entry write attempted
|
|
|
|
def test_first_workout_of_day_gets_base_shutdown_push(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
"""First counted workout of the day (empty prior_entries) → base +2h push."""
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.workout_data = {"type": "manual_workout"}
|
|
object.__setattr__(
|
|
locker,
|
|
"save_workout_log",
|
|
MagicMock(return_value=RecordResult(appended=True, prior_entries=[])),
|
|
)
|
|
object.__setattr__(
|
|
locker, "_try_adjust_shutdown_for_workout", MagicMock(return_value=True)
|
|
)
|
|
object.__setattr__(
|
|
locker, "_clear_debt_on_verified_workout", MagicMock(return_value=2)
|
|
)
|
|
|
|
result = locker._apply_workout_credit()
|
|
|
|
assert result.already_counted_today is False
|
|
assert result.shutdown_adjusted is True
|
|
assert result.new_debt == 2
|
|
assert result.extra_bonus_delta == 0
|
|
locker._try_adjust_shutdown_for_workout.assert_called_once()
|
|
|
|
def test_additional_manual_workout_earns_no_shutdown_credit(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
"""A second manual workout on a day that already counted → no shutdown push.
|
|
|
|
Anti-gaming: self-reports can't stack intra-day shutdown credit. The
|
|
prior day already holds a counted entry, and the new workout is manual
|
|
(not verified), so neither the base push nor the +1h extra applies.
|
|
"""
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.workout_data = {"type": "manual_workout"}
|
|
prior = [{"workout_data": {"type": "manual_workout"}}]
|
|
object.__setattr__(
|
|
locker,
|
|
"save_workout_log",
|
|
MagicMock(return_value=RecordResult(appended=True, prior_entries=prior)),
|
|
)
|
|
object.__setattr__(
|
|
locker, "_try_adjust_shutdown_for_workout", MagicMock(return_value=True)
|
|
)
|
|
object.__setattr__(
|
|
locker, "_adjust_shutdown_time_by", MagicMock(return_value=True)
|
|
)
|
|
object.__setattr__(
|
|
locker, "_clear_debt_on_verified_workout", MagicMock(return_value=None)
|
|
)
|
|
|
|
result = locker._apply_workout_credit()
|
|
|
|
assert result.shutdown_adjusted is False
|
|
assert result.extra_bonus_delta == 0
|
|
locker._try_adjust_shutdown_for_workout.assert_not_called()
|
|
locker._adjust_shutdown_time_by.assert_not_called()
|
|
|
|
def test_additional_verified_workout_earns_plus_one_hour(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
"""An additional same-day VERIFIED workout earns the +1h extra bonus.
|
|
|
|
prior_entries already holds a counted workout, so this isn't the first
|
|
of the day; because the new type is verified it takes the +1h branch,
|
|
and extra_bonus_delta reflects the shutdown-config hour delta.
|
|
"""
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.workout_data = {"type": "phone_verified"}
|
|
prior = [{"workout_data": {"type": "phone_verified"}}]
|
|
object.__setattr__(
|
|
locker,
|
|
"save_workout_log",
|
|
MagicMock(return_value=RecordResult(appended=True, prior_entries=prior)),
|
|
)
|
|
object.__setattr__(
|
|
locker, "_try_adjust_shutdown_for_workout", MagicMock(return_value=True)
|
|
)
|
|
object.__setattr__(
|
|
locker,
|
|
"_read_shutdown_config",
|
|
MagicMock(side_effect=[(21, 21, 5), (22, 22, 5)]),
|
|
)
|
|
object.__setattr__(
|
|
locker, "_adjust_shutdown_time_by", MagicMock(return_value=True)
|
|
)
|
|
object.__setattr__(
|
|
locker, "_clear_debt_on_verified_workout", MagicMock(return_value=None)
|
|
)
|
|
with patch(
|
|
"screen_locker._workout_credit.count_weekly_workouts", return_value=5
|
|
):
|
|
result = locker._apply_workout_credit()
|
|
|
|
assert result.weekly_count == 5
|
|
assert result.shutdown_adjusted is False
|
|
assert result.extra_bonus_delta == 1
|
|
locker._try_adjust_shutdown_for_workout.assert_not_called()
|
|
locker._adjust_shutdown_time_by.assert_called_once_with(1)
|
|
|
|
def test_skips_save_for_sick_day_type(
|
|
self, mock_tk: MagicMock, mock_sys_exit: MagicMock, tmp_path: Path
|
|
) -> None:
|
|
locker = create_locker(mock_tk, tmp_path)
|
|
locker.workout_data = {"type": "sick_day"}
|
|
object.__setattr__(
|
|
locker, "_try_adjust_shutdown_for_workout", MagicMock(return_value=False)
|
|
)
|
|
object.__setattr__(
|
|
locker, "_clear_debt_on_verified_workout", MagicMock(return_value=None)
|
|
)
|
|
object.__setattr__(locker, "save_workout_log", MagicMock())
|
|
|
|
result = locker._apply_workout_credit()
|
|
|
|
assert result.already_counted_today is False
|
|
assert result.shutdown_adjusted is False
|
|
locker.save_workout_log.assert_not_called()
|