mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 20:27:13 +01:00
CI ran on 399f981 before these fixes landed; both workflows were red:
- Tests: ModuleNotFoundError: No module named 'crdt_sync'. CI installs
requirements.txt (not pyproject deps), which lacked the crdt-sync git
dependency the Workstream-C sync introduced. Add crdt-sync + mcp>=1.9
to requirements.txt (mirrors diet-guard's fix).
- pre-commit no-noqa: ~45 `# type: ignore[attr-defined]` comments across
_auto_upgrade/_runnerup_db/_status/_heat_skip flagged repo-wide by the
no-noqa hook. The mypy hook already runs with
--disable-error-code=attr-defined, so every one of these ignores was
suppressing an already-disabled check — dead weight. Removed them; mypy
and pytest (747 passed, 100% cov) both stay green. Same for the test's
redundant `# type: ignore[override]` (override never fired).
- pre-commit ruff: FBT003 in _heat_skip.py (tk positional bools, its API)
and C901/PLR0912 in _status.py run_status (branchy weekly pipeline by
design) — added per-file-ignores with rationale, matching the existing
ignores for the sibling validation-chain modules.
- Added crdt-sync/mcp/pydantic to the pylint hook's additional_dependencies
so pylint can resolve the new imports.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018PMRRVVkeRyrSaaqueMZKG
130 lines
5.5 KiB
Python
130 lines
5.5 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.info("Auto-upgrade phone check failed: %s", 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.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"
|
|
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.info("Early bird upgrade phone check failed: %s", 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.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"
|
|
self.workout_data["source"] = runnerup_msg
|
|
self.workout_data["after_early_bird"] = "true"
|
|
self._adjust_shutdown_time_later()
|
|
self.save_workout_log()
|
|
return True
|