mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 21:27:13 +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
6.1 KiB
Python
147 lines
6.1 KiB
Python
"""Mixin: auto-upgrade early_bird/sick_day pending states via phone or RunnerUp.
|
|
|
|
Neither early_bird (a same-day pending marker, see ``_early_bird.py``) nor
|
|
sick_day (tracked in ``sick_history.json`` via ``_sick_tracker.py``) live in
|
|
workout_log.json — this module only checks their pending state and, on
|
|
success, writes the *real* outcome (phone_verified/runnerup_verified) there.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import sys
|
|
|
|
from screen_locker import _sick_tracker
|
|
from screen_locker._wake_state import has_workout_skip_today
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
class AutoUpgradeMixin:
|
|
"""Handles today-state detection and silent log-entry upgrading.
|
|
|
|
Relies on methods from EarlyBirdMixin, PhoneVerificationMixin,
|
|
RunnerUpVerificationMixin, LogMixin, and ShutdownMixin via MRO.
|
|
"""
|
|
|
|
def _is_sick_day_today(self) -> bool:
|
|
"""Check if today is marked as a sick day in sick_history.json."""
|
|
return _sick_tracker.is_sick_day(_sick_tracker.load_history())
|
|
|
|
def _check_early_exits(self, *, verify_only: bool) -> None:
|
|
"""Check startup conditions and exit early when appropriate."""
|
|
if verify_only:
|
|
if not self._is_sick_day_today():
|
|
_logger.info("No sick day logged today. Nothing to verify.")
|
|
sys.exit(0)
|
|
return
|
|
self._check_non_verify_exits()
|
|
|
|
def _check_today_state_exits(self) -> bool:
|
|
"""Handle early-bird and today's log states. Return True to stop startup."""
|
|
if self._is_early_bird_pending() and not self._is_early_bird_time():
|
|
if self._try_auto_upgrade_early_bird():
|
|
_logger.info("Auto-upgraded early_bird entry to phone_verified.")
|
|
sys.exit(0)
|
|
return True
|
|
return False # Expired early bird, upgrade unavailable — full lock.
|
|
if self._is_early_bird_pending():
|
|
_logger.info("Early bird window still active — skipping lock.")
|
|
elif self._is_sick_day_today():
|
|
if self._try_auto_upgrade_sick_day():
|
|
_logger.info("Auto-upgraded today's sick_day entry to phone_verified.")
|
|
else:
|
|
_logger.info("Sick day already logged today.")
|
|
elif self.has_logged_today():
|
|
_logger.info("Workout already logged today. Skipping screen lock.")
|
|
elif has_workout_skip_today():
|
|
_logger.info("Wake alarm earned workout skip. Skipping screen lock.")
|
|
elif self._is_early_bird_time():
|
|
self._save_early_bird_pending()
|
|
_logger.info("Early bird time — skipping lock, will re-check at 08:30.")
|
|
else:
|
|
return False
|
|
sys.exit(0)
|
|
return True
|
|
|
|
def _try_auto_upgrade_sick_day(self) -> bool:
|
|
"""Upgrade sick_day entry when phone or RunnerUp detects a valid workout."""
|
|
try:
|
|
status, message = self._verify_phone_workout()
|
|
except (OSError, RuntimeError) as exc:
|
|
_logger.warning(
|
|
"Sick-day auto-upgrade could not reach the phone (%s) — today's "
|
|
"sick_day entry stays unverified; trying RunnerUp next",
|
|
exc,
|
|
)
|
|
status, message = "error", str(exc)
|
|
if status == "verified":
|
|
self.workout_data["type"] = "phone_verified"
|
|
self.workout_data["source"] = message
|
|
self.workout_data["after_sick_day"] = "true"
|
|
self._adjust_shutdown_time_later()
|
|
self.save_workout_log()
|
|
return True
|
|
_logger.info("Auto-upgrade phone skipped (%s), trying RunnerUp...", status)
|
|
try:
|
|
runnerup_status, runnerup_msg = self._verify_runnerup_workout()
|
|
except (OSError, RuntimeError) as exc:
|
|
_logger.warning(
|
|
"Sick-day auto-upgrade could not read RunnerUp either (%s) — "
|
|
"today stays a sick_day, NOT upgraded to a verified workout",
|
|
exc,
|
|
)
|
|
return False
|
|
if runnerup_status != "verified":
|
|
_logger.info(
|
|
"Auto-upgrade RunnerUp skipped (%s): %s", runnerup_status, runnerup_msg
|
|
)
|
|
return False
|
|
self.workout_data["type"] = "runnerup_verified"
|
|
self.workout_data["source"] = runnerup_msg
|
|
self.workout_data["after_sick_day"] = "true"
|
|
self._adjust_shutdown_time_later()
|
|
self.save_workout_log()
|
|
return True
|
|
|
|
def _try_auto_upgrade_early_bird(self) -> bool:
|
|
"""Try phone then RunnerUp to upgrade an early_bird log entry."""
|
|
try:
|
|
status, message = self._verify_phone_workout()
|
|
except (OSError, RuntimeError) as exc:
|
|
_logger.warning(
|
|
"Early-bird auto-upgrade could not reach the phone (%s) — the "
|
|
"early_bird entry stays unverified; trying RunnerUp next",
|
|
exc,
|
|
)
|
|
status, message = "error", str(exc)
|
|
if status == "verified":
|
|
self.workout_data["type"] = "phone_verified"
|
|
self.workout_data["source"] = message
|
|
self.workout_data["after_early_bird"] = "true"
|
|
self._adjust_shutdown_time_later()
|
|
self.save_workout_log()
|
|
return True
|
|
_logger.info("Early bird phone skipped (%s), trying RunnerUp...", status)
|
|
try:
|
|
runnerup_status, runnerup_msg = self._verify_runnerup_workout()
|
|
except (OSError, RuntimeError) as exc:
|
|
_logger.warning(
|
|
"Early-bird auto-upgrade could not read RunnerUp either (%s) — "
|
|
"the expired early_bird entry is NOT upgraded, so the screen "
|
|
"will lock",
|
|
exc,
|
|
)
|
|
return False
|
|
if runnerup_status != "verified":
|
|
_logger.info(
|
|
"Early bird RunnerUp skipped (%s): %s", runnerup_status, runnerup_msg
|
|
)
|
|
return False
|
|
self.workout_data["type"] = "runnerup_verified"
|
|
self.workout_data["source"] = runnerup_msg
|
|
self.workout_data["after_early_bird"] = "true"
|
|
self._adjust_shutdown_time_later()
|
|
self.save_workout_log()
|
|
return True
|