mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 19:07:16 +01:00
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
147 lines
5.3 KiB
Python
147 lines
5.3 KiB
Python
"""Shared workout-credit logic: save + shutdown bonus + debt-clear.
|
|
|
|
Extracted from ``screen_lock.py`` so both the locked-screen flow
|
|
(``ScreenLocker.unlock_screen``) and the voluntary ``StatusWindow``
|
|
"Log Manual Workout" path apply the identical reward — the drift between
|
|
those two paths having different behavior once caused a real shutdown-bonus
|
|
miss (see ``project-lock-disabled-pending-manual-log`` memory).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass
|
|
import logging
|
|
from typing import TYPE_CHECKING
|
|
|
|
from screen_locker import _sick_tracker
|
|
from screen_locker._weekly_check import (
|
|
COUNTED_WORKOUT_TYPES,
|
|
VERIFIED_WORKOUT_TYPES,
|
|
count_weekly_workouts,
|
|
)
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class WorkoutCreditResult:
|
|
"""Outcome of :meth:`WorkoutCreditMixin._apply_workout_credit`."""
|
|
|
|
shutdown_adjusted: bool
|
|
new_debt: int | None
|
|
extra_bonus_delta: int
|
|
weekly_count: int
|
|
already_counted_today: bool
|
|
|
|
|
|
class WorkoutCreditMixin:
|
|
"""Save a workout entry and apply its shutdown/debt/extra-bonus reward.
|
|
|
|
Requires ``self.workout_data``, ``self.log_file``, and the ``LogMixin``/
|
|
``ShutdownMixin`` methods it calls into.
|
|
"""
|
|
|
|
workout_data: dict[str, str]
|
|
log_file: Path
|
|
|
|
def _try_adjust_shutdown_for_workout(self) -> bool:
|
|
"""Try to adjust shutdown time later for actual workouts."""
|
|
workout_type = self.workout_data.get("type", "")
|
|
if workout_type not in COUNTED_WORKOUT_TYPES:
|
|
return False
|
|
adjusted = self._adjust_shutdown_time_later()
|
|
if adjusted:
|
|
_logger.info("Shutdown time moved 2 hours later as workout reward")
|
|
return adjusted
|
|
|
|
def _clear_debt_on_verified_workout(self) -> int | None:
|
|
"""Decrement workout debt by one for a verified workout.
|
|
|
|
Returns the new debt count, or ``None`` when this wasn't a
|
|
phone-verified workout.
|
|
"""
|
|
if self.workout_data.get("type") not in (
|
|
"phone_verified",
|
|
"runnerup_verified",
|
|
"manual_workout",
|
|
):
|
|
return None
|
|
history = _sick_tracker.load_history()
|
|
if history.debt <= 0:
|
|
return 0
|
|
new_debt = _sick_tracker.clear_one_debt(history)
|
|
_sick_tracker.save_history(history)
|
|
return new_debt
|
|
|
|
def _apply_workout_credit(self) -> WorkoutCreditResult:
|
|
"""Append ``workout_data`` and apply its reward, scaled to the day.
|
|
|
|
Shared by the locked-screen flow (:meth:`ScreenLocker.unlock_screen`),
|
|
the voluntary ``StatusWindow`` "Log Manual Workout" path, and the
|
|
Check-Phone verify path. Rewards, from the day's entries *before* this
|
|
one (via the write chokepoint's :class:`RecordResult`):
|
|
|
|
* duplicate (same ``workout_id`` already logged) → no new credit;
|
|
* first counted workout of the day → base **+2h** (cap 23:00);
|
|
* an additional same-day VERIFIED workout → **+1h** (cap midnight);
|
|
* an additional same-day manual workout → no shutdown credit
|
|
(self-reports can't stack intra-day credit — anti-gaming).
|
|
|
|
This method always files under *today*, so its credit is the intra-day
|
|
reward; back-dated writes (manual-sync, RunnerUp backfill) go straight
|
|
through the write chokepoint and earn only the weekly count, never a
|
|
push to tonight's shutdown.
|
|
"""
|
|
# sick_day is already persisted to sick_history.json by
|
|
# _finalize_sick_day — workout_log.json is reserved for real outcomes.
|
|
if self.workout_data.get("type") == "sick_day":
|
|
return WorkoutCreditResult(
|
|
shutdown_adjusted=False,
|
|
new_debt=None,
|
|
extra_bonus_delta=0,
|
|
weekly_count=count_weekly_workouts(self.log_file),
|
|
already_counted_today=False,
|
|
)
|
|
|
|
result = self.save_workout_log()
|
|
weekly_count = count_weekly_workouts(self.log_file)
|
|
|
|
if not result.appended:
|
|
# A workout with this id was already recorded today — idempotent.
|
|
return WorkoutCreditResult(
|
|
shutdown_adjusted=False,
|
|
new_debt=None,
|
|
extra_bonus_delta=0,
|
|
weekly_count=weekly_count,
|
|
already_counted_today=True,
|
|
)
|
|
|
|
first_counted_today = not any(
|
|
entry.get("workout_data", {}).get("type") in COUNTED_WORKOUT_TYPES
|
|
for entry in result.prior_entries
|
|
)
|
|
|
|
shutdown_adjusted = False
|
|
extra_bonus_delta = 0
|
|
if first_counted_today:
|
|
shutdown_adjusted = self._try_adjust_shutdown_for_workout()
|
|
elif self.workout_data.get("type") in VERIFIED_WORKOUT_TYPES:
|
|
old_cfg = self._read_shutdown_config()
|
|
if old_cfg and self._adjust_shutdown_time_by(1):
|
|
new_cfg = self._read_shutdown_config()
|
|
if new_cfg:
|
|
extra_bonus_delta = new_cfg[1] - old_cfg[1]
|
|
|
|
new_debt = self._clear_debt_on_verified_workout()
|
|
|
|
return WorkoutCreditResult(
|
|
shutdown_adjusted=shutdown_adjusted,
|
|
new_debt=new_debt,
|
|
extra_bonus_delta=extra_bonus_delta,
|
|
weekly_count=weekly_count,
|
|
already_counted_today=False,
|
|
)
|