mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 21:07:14 +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
76 lines
2.6 KiB
Python
76 lines
2.6 KiB
Python
"""Single normalization point for reading ``workout_log.json``.
|
|
|
|
The log is day-keyed and now holds MULTIPLE workouts per day. This module is
|
|
the one place that reads the raw file and normalizes both shapes into a
|
|
per-day list:
|
|
|
|
* legacy ``{date: entry}`` — the single ``entry`` is wrapped in a
|
|
one-element list, and
|
|
* new ``{date: [entry, ...]}`` — returned as-is.
|
|
|
|
Kept dependency-free (stdlib only) so any module — including the low-level
|
|
``_log_mixin`` and ``_compliance_state`` — can import it without risking an
|
|
import cycle. Every consumer reads through :func:`load_workout_log` and
|
|
iterates the per-day list rather than assuming one entry per day.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
from typing import TYPE_CHECKING
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
def read_raw_log(log_file: Path) -> dict:
|
|
"""Load ``workout_log.json`` verbatim (values may be dict or list), or ``{}``.
|
|
|
|
Returns the on-disk shape unchanged. Prefer :func:`load_workout_log` for
|
|
reading; this raw form exists for the writer, which rewrites the file, and
|
|
for the one-shot migration.
|
|
"""
|
|
if not log_file.exists():
|
|
return {}
|
|
try:
|
|
with log_file.open() as f:
|
|
data = json.load(f)
|
|
except (OSError, json.JSONDecodeError) as exc:
|
|
_logger.warning(
|
|
"Could not read the workout log at %s (%s) — treating it as EMPTY, "
|
|
"so NO workouts count and the lock will fire until it is readable",
|
|
log_file,
|
|
exc,
|
|
)
|
|
return {}
|
|
if not isinstance(data, dict):
|
|
_logger.warning(
|
|
"Workout log at %s is a %s, not an object of dates — treating it as "
|
|
"EMPTY, so NO workouts count",
|
|
log_file,
|
|
type(data).__name__,
|
|
)
|
|
return {}
|
|
return data
|
|
|
|
|
|
def load_workout_log(log_file: Path) -> dict[str, list[dict]]:
|
|
"""Load ``workout_log.json`` normalized to ``{date: [entry, ...]}``.
|
|
|
|
Accepts BOTH the legacy day-keyed shape (``{date: entry}``) and the new
|
|
multi-entry shape so old files, rolled-back writers, and mid-migration
|
|
states all read correctly. Each entry is the usual
|
|
``{timestamp, workout_data, hmac[, workout_id]}`` dict; malformed values
|
|
are dropped. Missing/corrupt file → ``{}``.
|
|
"""
|
|
normalized: dict[str, list[dict]] = {}
|
|
for date, value in read_raw_log(log_file).items():
|
|
if isinstance(value, list):
|
|
normalized[date] = [entry for entry in value if isinstance(entry, dict)]
|
|
elif isinstance(value, dict):
|
|
normalized[date] = [value]
|
|
return normalized
|