mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-07-04 11:43:09 +02:00
Krzysztof kuhy Rudnicki
e25d806742
The screen locker skipped enforcement on 2026-07-03 without ever showing a lock: a banked skip credit (earned from a prior 5+/week streak) was consumed automatically with no confirmation and no visible log. Reworked the whole reward mechanic instead of just gating it, since banking a "skip a future workout" credit works against maximizing weekly workouts: - Removed skip credits entirely (has_skip_credit/consume_skip_credit and the confirmation dialog built to gate them). The only same-day skip paths left are heat_skip and sick_day, both requiring a genuine reason. - Extra workouts (5+/week) now bank shutdown-time-later hours for the following week instead — comfort, not reduced enforcement. Reuses the existing _adjust_shutdown_time_by and reset_to_base_if_new_day's previously-discarded return value as the once-per-day gate. - early_bird and sick_day no longer pollute workout_log.json. early_bird is a same-day pending marker now stored in its own self-expiring, HMAC-signed file; sick_day is sourced entirely from sick_history.json (already the real source of truth). Fixes an accidental-safety gap where "already took a sick day today" only halted startup by luck. - Cleaned up 3 stale non-workout entries already in workout_log.json. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QdTccgbK7624kfoaV6CtXS
133 lines
6.4 KiB
Python
133 lines
6.4 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() # type: ignore[attr-defined]
|
|
|
|
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() # type: ignore[attr-defined]
|
|
and not self._is_early_bird_time() # type: ignore[attr-defined]
|
|
):
|
|
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(): # type: ignore[attr-defined]
|
|
_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(): # type: ignore[attr-defined]
|
|
_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(): # type: ignore[attr-defined]
|
|
self._save_early_bird_pending() # type: ignore[attr-defined]
|
|
_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() # type: ignore[attr-defined]
|
|
except (OSError, RuntimeError) as exc:
|
|
_logger.info("Auto-upgrade phone check failed: %s", exc)
|
|
status, message = "error", str(exc)
|
|
if status == "verified":
|
|
self.workout_data["type"] = "phone_verified" # type: ignore[attr-defined]
|
|
self.workout_data["source"] = message # type: ignore[attr-defined]
|
|
self.workout_data["after_sick_day"] = "true" # type: ignore[attr-defined]
|
|
self._adjust_shutdown_time_later() # type: ignore[attr-defined]
|
|
self.save_workout_log() # type: ignore[attr-defined]
|
|
return True
|
|
_logger.info("Auto-upgrade phone skipped (%s), trying RunnerUp...", status)
|
|
try:
|
|
runnerup_status, runnerup_msg = self._verify_runnerup_workout() # type: ignore[attr-defined]
|
|
except (OSError, RuntimeError) as exc:
|
|
_logger.info("Auto-upgrade RunnerUp check failed: %s", 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" # type: ignore[attr-defined]
|
|
self.workout_data["source"] = runnerup_msg # type: ignore[attr-defined]
|
|
self.workout_data["after_sick_day"] = "true" # type: ignore[attr-defined]
|
|
self._adjust_shutdown_time_later() # type: ignore[attr-defined]
|
|
self.save_workout_log() # type: ignore[attr-defined]
|
|
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() # type: ignore[attr-defined]
|
|
except (OSError, RuntimeError) as exc:
|
|
_logger.info("Early bird upgrade phone check failed: %s", exc)
|
|
status, message = "error", str(exc)
|
|
if status == "verified":
|
|
self.workout_data["type"] = "phone_verified" # type: ignore[attr-defined]
|
|
self.workout_data["source"] = message # type: ignore[attr-defined]
|
|
self.workout_data["after_early_bird"] = "true" # type: ignore[attr-defined]
|
|
self._adjust_shutdown_time_later() # type: ignore[attr-defined]
|
|
self.save_workout_log() # type: ignore[attr-defined]
|
|
return True
|
|
_logger.info("Early bird phone skipped (%s), trying RunnerUp...", status)
|
|
try:
|
|
runnerup_status, runnerup_msg = self._verify_runnerup_workout() # type: ignore[attr-defined]
|
|
except (OSError, RuntimeError) as exc:
|
|
_logger.info("Early bird RunnerUp check failed: %s", 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" # type: ignore[attr-defined]
|
|
self.workout_data["source"] = runnerup_msg # type: ignore[attr-defined]
|
|
self.workout_data["after_early_bird"] = "true" # type: ignore[attr-defined]
|
|
self._adjust_shutdown_time_later() # type: ignore[attr-defined]
|
|
self.save_workout_log() # type: ignore[attr-defined]
|
|
return True
|