mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 20: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
115 lines
3.9 KiB
Python
115 lines
3.9 KiB
Python
"""Daily shutdown-time base reset for the screen locker.
|
|
|
|
On each new calendar day the shutdown config is reset to base hours (21:00
|
|
by default) so that the day's workout bonuses always layer on top of a known
|
|
floor rather than accumulating indefinitely across days.
|
|
|
|
The sick-day state file is cleared on reset so the sick-restore path cannot
|
|
overwrite the fresh base when it runs later in the same startup.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import datetime, timezone
|
|
import json
|
|
import logging
|
|
from typing import TYPE_CHECKING, Any
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
_DEFAULT_BASE_HOUR = 21
|
|
|
|
|
|
def get_base_hours(state_file: Path) -> tuple[int, int]:
|
|
"""Return ``(base_mon_wed_hour, base_thu_sun_hour)`` from *state_file*.
|
|
|
|
Falls back to ``(21, 21)`` if the file is missing or corrupt.
|
|
"""
|
|
if not state_file.exists():
|
|
return (_DEFAULT_BASE_HOUR, _DEFAULT_BASE_HOUR)
|
|
try:
|
|
with state_file.open() as f:
|
|
state: dict[str, Any] = json.load(f)
|
|
return (
|
|
int(state.get("base_mon_wed_hour", _DEFAULT_BASE_HOUR)),
|
|
int(state.get("base_thu_sun_hour", _DEFAULT_BASE_HOUR)),
|
|
)
|
|
except (OSError, json.JSONDecodeError, ValueError) as exc:
|
|
_logger.warning(
|
|
"Could not read shutdown base hours from %s: %s — defaulting both "
|
|
"to %02d:00",
|
|
state_file,
|
|
exc,
|
|
_DEFAULT_BASE_HOUR,
|
|
)
|
|
return (_DEFAULT_BASE_HOUR, _DEFAULT_BASE_HOUR)
|
|
|
|
|
|
def reset_to_base_if_new_day(
|
|
state_file: Path,
|
|
mixin: object,
|
|
sick_day_state_file: Path | None = None,
|
|
) -> bool:
|
|
"""Reset the shutdown config to base hours if a new calendar day has begun.
|
|
|
|
Writes base hours via *mixin*._write_shutdown_config (with restore=True so
|
|
the script allows moving the time earlier), updates ``last_reset_date`` in
|
|
*state_file*, and removes *sick_day_state_file* if it exists so the
|
|
sick-restore path does not fight with the fresh base on the same startup.
|
|
|
|
Returns True if a reset was performed, False if today was already reset.
|
|
"""
|
|
today = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d")
|
|
|
|
if state_file.exists():
|
|
try:
|
|
with state_file.open() as f:
|
|
state: dict[str, Any] = json.load(f)
|
|
if state.get("last_reset_date") == today:
|
|
return False
|
|
except (OSError, json.JSONDecodeError) as exc:
|
|
_logger.warning(
|
|
"Could not read last_reset_date from %s: %s — cannot tell if "
|
|
"today was already reset, so resetting to base hours again",
|
|
state_file,
|
|
exc,
|
|
)
|
|
|
|
base_mw, base_ts = get_base_hours(state_file)
|
|
|
|
# Preserve the morning-end hour from the live config.
|
|
config = mixin._read_shutdown_config()
|
|
morning_end = config[2] if config else 5
|
|
|
|
ok: bool = mixin._write_shutdown_config(base_mw, base_ts, morning_end, restore=True)
|
|
if not ok:
|
|
_logger.warning("Daily base reset: failed to write shutdown config.")
|
|
return False
|
|
|
|
# Clear stale sick-day state so it does not override the base reset.
|
|
if sick_day_state_file is not None and sick_day_state_file.exists():
|
|
try:
|
|
sick_day_state_file.unlink()
|
|
_logger.info("Daily base reset: cleared stale sick-day state.")
|
|
except OSError as exc:
|
|
_logger.warning(
|
|
"Daily base reset: could not remove sick-day state: %s", exc
|
|
)
|
|
|
|
new_state: dict[str, Any] = {
|
|
"base_mon_wed_hour": base_mw,
|
|
"base_thu_sun_hour": base_ts,
|
|
"last_reset_date": today,
|
|
}
|
|
try:
|
|
with state_file.open("w") as f:
|
|
json.dump(new_state, f, indent=2)
|
|
except OSError as exc:
|
|
_logger.warning("Daily base reset: failed to write state file: %s", exc)
|
|
|
|
_logger.info("Daily base reset: Mon-Wed=%d, Thu-Sun=%d.", base_mw, base_ts)
|
|
return True
|