mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 20:27:13 +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
137 lines
5.2 KiB
Python
137 lines
5.2 KiB
Python
"""Pure, read-only leaf predicates for the lock-decision chain.
|
|
|
|
Split out of :mod:`screen_locker._compliance_state` to keep every file under
|
|
the 250-line cap. That module re-exports everything here, so existing
|
|
importers are unaffected.
|
|
|
|
Nothing in this module touches ADB, sudo, subprocess, or the network, and
|
|
nothing writes to disk.
|
|
|
|
Note for tests: the ``gatelock.log_integrity`` helpers are imported *here*
|
|
now, so patch them at ``screen_locker._compliance_predicates.verify_entry_hmac``
|
|
rather than at the old ``_compliance_state`` path.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
from typing import TYPE_CHECKING
|
|
|
|
import freedays
|
|
from gatelock.log_integrity import compute_entry_hmac, verify_entry_hmac
|
|
|
|
from screen_locker._day import today_str
|
|
from screen_locker._log_io import load_workout_log
|
|
from screen_locker._sick import is_sick
|
|
from screen_locker._weekly_check import RELAXED_DAY_SKIP_TYPE
|
|
|
|
if TYPE_CHECKING:
|
|
from datetime import date
|
|
from pathlib import Path
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _today_str() -> str:
|
|
"""Return today's LOCAL date as ``YYYY-MM-DD`` (see ``screen_locker._day``)."""
|
|
return today_str()
|
|
|
|
|
|
def is_scheduled_skip_today(today: date | None = None) -> bool:
|
|
"""Return True if *today* is in the shared free-day pool.
|
|
|
|
The source moved from this app's own ``scheduled_skips.json`` to the
|
|
fleet-wide pool (``~/src/utils/freedays``), so one marked day now stands down
|
|
every gate app at once instead of only this one.
|
|
|
|
The date is **local**, not UTC. The file-backed check this replaces
|
|
compared against a UTC day while ``add_scheduled_skip.py`` wrote a local
|
|
one, so a skip added near midnight could name a date the chain never
|
|
matched. freedays owns "what is today" for all of them now.
|
|
|
|
Still fails closed: an unreadable pool reads as "not free", so the lock
|
|
chain continues rather than the lock silently switching itself off.
|
|
"""
|
|
return freedays.is_free_day(today)
|
|
|
|
|
|
def has_logged_today(log_file: Path, *, today: str | None = None) -> bool:
|
|
"""Return True if a validly-signed workout is logged for *today*.
|
|
|
|
The day may hold multiple workouts; return True if ANY of today's entries
|
|
verifies (or is acceptably unsigned when no HMAC key is configured).
|
|
A ``relaxed_day_skip`` entry does NOT count — it is a UI-dismissal marker,
|
|
not a workout, and must not be mistaken for one by ``workout_logged_today``
|
|
(which would otherwise mask the more accurate
|
|
``relaxed_day_already_skipped`` reason in the decision trail).
|
|
"""
|
|
entries = [
|
|
entry
|
|
for entry in load_workout_log(log_file).get(today or _today_str(), [])
|
|
if entry.get("workout_data", {}).get("type") != RELAXED_DAY_SKIP_TYPE
|
|
]
|
|
if not entries:
|
|
return False
|
|
key_unavailable = compute_entry_hmac({"_probe": True}) is None
|
|
for entry in entries:
|
|
if verify_entry_hmac(entry):
|
|
return True
|
|
if key_unavailable and "hmac" not in entry:
|
|
_logger.info("HMAC key unavailable — accepting unsigned entry")
|
|
return True
|
|
_logger.warning("HMAC verification failed for today's log entries")
|
|
return False
|
|
|
|
|
|
def is_relaxed_day_skipped_today(log_file: Path, *, today: str | None = None) -> bool:
|
|
"""Return True if today's relaxed-day prompt was already dismissed.
|
|
|
|
Written by ``UIFlowsRelaxedMixin._skip_relaxed_day`` when the user clicks
|
|
"Skip — No Penalty". Without this, the recurring 30-minute
|
|
``workout-locker.timer`` re-derives ``relaxed_day`` from scratch every
|
|
tick and re-shows the popup, since ``is_relaxed_day`` is a pure date
|
|
check with no memory of a same-day dismissal on its own.
|
|
"""
|
|
entries = load_workout_log(log_file).get(today or _today_str(), [])
|
|
return any(
|
|
entry.get("workout_data", {}).get("type") == RELAXED_DAY_SKIP_TYPE
|
|
for entry in entries
|
|
)
|
|
|
|
|
|
def is_early_bird_pending(pending_file: Path, *, today: str | None = None) -> bool:
|
|
"""Return True if today has an unresolved early-bird pending marker."""
|
|
if not pending_file.exists():
|
|
return False
|
|
try:
|
|
with pending_file.open() as f:
|
|
state = json.load(f)
|
|
except (OSError, json.JSONDecodeError) as exc:
|
|
_logger.warning(
|
|
"Could not read the early-bird pending marker at %s: %s — treating "
|
|
"it as not pending, so the lock chain proceeds as if no early bird "
|
|
"was claimed today",
|
|
pending_file,
|
|
exc,
|
|
)
|
|
return False
|
|
if not isinstance(state, dict) or state.get("date") != (today or _today_str()):
|
|
return False
|
|
if verify_entry_hmac(state):
|
|
return True
|
|
if compute_entry_hmac({"_probe": True}) is None and "hmac" not in state:
|
|
_logger.info("HMAC key unavailable — accepting unsigned pending marker")
|
|
return True
|
|
_logger.warning("HMAC verification failed for early-bird pending marker")
|
|
return False
|
|
|
|
|
|
def is_sick_day_today(today: date | None = None) -> bool:
|
|
"""Return True if ``today`` (default: today) is in the sickdays pool.
|
|
|
|
Kept here so callers of the status layer have one predicate module to
|
|
import from; the answer itself is ``_sick.is_sick``'s.
|
|
"""
|
|
return is_sick(today)
|