mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 19:07:16 +01:00
A sick day is now a date in the shared sickdays pool (utils sickdays 0.1.0) and nothing else. Removed: the 7/30/90-day budget, the escalating lockout countdown, the justification form, the commitment prompt and its double debt, the workout-debt counter, the -60 min shutdown cut and its sick_day_state.json, the post-sick-day --verify-workout mode, the sick auto-upgrade, scripts/revoke_sick_day.py and their tests. - Lock screen: "I'm sick" on the retry, no-phone and both Tue-Thu screens; one tap -> sickdays.add_sick_day(today) -> sick floor -> best-effort background sickdays.sync_quietly -> unlock. Refusals (free day, unreadable pool) are shown and the lock stays. - Shutdown: the reset resolves with earned_time.resolve(..., sick=True) (max(20:00, ladder), capped 23:00) and saves the sick lift with the grace lift, so later credits absorb it instead of stacking on 20:00. A day marked after the reset is lifted by the new _sick_floor live pass (every 5-min tick, --sync-only, --apply-bonuses, and the tap itself). - Workout lock and grace floor stand down on a sick day; workouts that day credit normally through the sync paths. - wake-alarm workday_penalty.json is void when its issued_date or penalty_date is a sick day. - Status window, i3 line, CLI --status, MCP flags and web reasons read sickdays. - scripts/migrate_sick_history.py imports sick_history.json's dates via sickdays.import_legacy, verifies and removes the file; idempotent, run by install.sh. - Pins: earned-time 0.11.0, freedays 0.4.0, sickdays 0.1.0 (tags pending); pre-commit 4.7.0, ruff 0.17.1 (freshness gate). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Xfj1sxKH9VBPqpcAni8Jry
135 lines
5.4 KiB
Python
135 lines
5.4 KiB
Python
"""Manual-workout sync and RunnerUp auto-fill for the screen locker.
|
|
|
|
Split out of ``screen_lock.py`` to keep every file under the 250-line cap.
|
|
These methods form one cohesive unit: they publish this PC's workouts, ingest
|
|
records other devices produced, and apply the same shutdown credit a
|
|
live-logged workout earns.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
|
|
from screen_locker._constants import SHUTDOWN_BASE_FILE
|
|
from screen_locker._earned import span
|
|
from screen_locker._earner_units import sync_path_unit
|
|
from screen_locker._manual_push import push_pc_workouts
|
|
from screen_locker._manual_sync import ingest_manual_records
|
|
from screen_locker._session_sync import ingest_session_records
|
|
from screen_locker._shutdown_base import apply_flat_bonuses_if_new
|
|
from screen_locker._workout_sync import (
|
|
pull_all_manual_records,
|
|
pull_all_session_records,
|
|
)
|
|
|
|
__all__ = ["SyncMixin"]
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
class SyncMixin:
|
|
"""Publish, ingest and credit manual workouts synced between devices."""
|
|
|
|
def sync_now(self) -> None:
|
|
"""Run one sync pass: publish this PC's workouts, ingest everyone's.
|
|
|
|
The public entry point behind ``--sync-only``, which the
|
|
``workout-sync.timer`` unit calls. Sync used to happen only inside the
|
|
locker's startup path, so a workout finished after login stayed
|
|
invisible until the next login.
|
|
|
|
Also re-runs the RunnerUp TCX backfill here, not just at login: the
|
|
login-time scan gets exactly one shot, and if the phone isn't
|
|
adb-visible at that instant (e.g. USB debugging not yet
|
|
authorized), a same-day run stays uncredited until the next login.
|
|
Repeating it every 15 minutes closes that gap.
|
|
"""
|
|
self._ingest_synced_manual_workouts()
|
|
self._ingest_synced_sessions()
|
|
self._auto_fill_week_runnerup_bonus()
|
|
# Same reason: a LeetCode solve or a reading session made after login
|
|
# must not wait for the next login to earn its hour.
|
|
apply_flat_bonuses_if_new(SHUTDOWN_BASE_FILE, self)
|
|
# The ledger watch that makes that pass instant follows the registry.
|
|
sync_path_unit()
|
|
|
|
def _ingest_synced_manual_workouts(self) -> None:
|
|
"""Sync manual workouts: publish this PC's, ingest everyone else's.
|
|
|
|
Each newly-ingested record earns the identical shutdown reward a
|
|
live-logged workout would (see
|
|
``WorkoutCreditMixin._apply_credit_for_written_entry``), regardless of
|
|
whether it's dated today or back-dated — there's only one current
|
|
shutdown config, so a back-dated sync still pushes it.
|
|
"""
|
|
push_pc_workouts(self.log_file)
|
|
ingested = ingest_manual_records(
|
|
self.log_file,
|
|
pull_all_manual_records(),
|
|
on_ingested=self._credit_ingested_workout,
|
|
)
|
|
for record_id in ingested:
|
|
_logger.info("Ingested synced manual workout: %s", record_id)
|
|
self.workout_data = {}
|
|
|
|
def _ingest_synced_sessions(self) -> None:
|
|
"""Ingest StrongLifts sessions other devices (or this PC) finished.
|
|
|
|
The desktop build of workout_app writes a session to its own device
|
|
log and nothing else; without this the record would only ever be seen
|
|
by the interactive verification flow, so a workout finished on the PC
|
|
earned nothing until a lock screen happened to open.
|
|
|
|
Each newly-ingested session earns the identical reward a live-logged
|
|
workout would, and re-running is a no-op (the write chokepoint dedups
|
|
by workout_id).
|
|
"""
|
|
ingested = ingest_session_records(
|
|
self.log_file,
|
|
pull_all_session_records(),
|
|
on_ingested=self._credit_ingested_workout,
|
|
)
|
|
for record_id in ingested:
|
|
_logger.info("Ingested synced StrongLifts session: %s", record_id)
|
|
self.workout_data = {}
|
|
|
|
def _credit_ingested_workout(
|
|
self, entry: dict[str, str], prior_entries: list[dict]
|
|
) -> None:
|
|
"""Apply the live-workout reward to a workout ingested from another source.
|
|
|
|
Shared by manual-workout sync, StrongLifts session sync and the
|
|
RunnerUp TCX backfill -- one reward rule for every non-interactive way
|
|
a workout can land in the log.
|
|
"""
|
|
self.workout_data = entry
|
|
credit = self._apply_credit_for_written_entry(prior_entries)
|
|
if credit.shutdown_adjusted:
|
|
_logger.info(
|
|
"Ingested workout pushed shutdown time later: %s",
|
|
entry.get("source", ""),
|
|
)
|
|
elif credit.extra_bonus_delta:
|
|
_logger.info(
|
|
"Ingested workout added +%s shutdown time: %s",
|
|
span(credit.extra_bonus_delta),
|
|
entry.get("source", ""),
|
|
)
|
|
|
|
def _auto_fill_week_runnerup_bonus(self) -> None:
|
|
"""Auto-fill missed RunnerUp workouts and credit each one.
|
|
|
|
Every appended run goes through the same
|
|
:meth:`_credit_ingested_workout` callback as a synced manual workout
|
|
or StrongLifts session, so the reward is the documented day rule
|
|
(+2h first counted workout of its day, +1h each further one).
|
|
"""
|
|
n_filled = self._scan_and_fill_week_runnerup(
|
|
self.log_file, on_ingested=self._credit_ingested_workout
|
|
)
|
|
if n_filled:
|
|
_logger.info(
|
|
"Auto-filled %d RunnerUp workout(s) from TCX exports.", n_filled
|
|
)
|
|
self.workout_data = {}
|