mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-11 16:33:57 +01:00
Krzysztof kuhy Rudnicki
c1c73d43ba
Some checks failed
pre-commit / pre-commit (push) Has been cancelled
Tests / test (3.10) (push) Has been cancelled
Tests / test (3.11) (push) Has been cancelled
Tests / test (3.12) (push) Has been cancelled
Tests / lock-popup-safety (push) Has been cancelled
release-apk / release (APK) (push) Has been cancelled
workout-locker.timer (added in e5db254) re-runs the full lock-decision
chain every 30 minutes, but is_relaxed_day() is a pure date check with
no memory of an earlier same-day dismissal. Clicking "Skip — No
Penalty" only closed the window without persisting anything, so the
next tick re-derived reason=relaxed_day and rebuilt the same popup.
Now the skip button writes a relaxed_day_skip marker to the log
(excluded from weekly counting and sync, same treatment as heat_skip),
and the startup chain checks for it before re-entering the relaxed-day
branch. Also renames workout_log.json to log.json throughout the repo,
tests, docs, and Dart comments, since the fix touches that file anyway.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_014qH2hJ6mvCJd3ZXpAJSaF7
76 lines
2.8 KiB
Python
76 lines
2.8 KiB
Python
"""Early bird window detection and pending-state helpers for ScreenLocker.
|
|
|
|
The early-bird "still waiting to see if a real workout shows up" flag is a
|
|
same-day pending marker, not a workout — it is intentionally kept out of
|
|
log.json (which is reserved for real outcomes) and instead lives in
|
|
its own self-expiring, HMAC-signed state file, mirroring the pattern used by
|
|
``_wake_state.py`` for the companion wake_alarm service.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import datetime, timezone
|
|
import json
|
|
import logging
|
|
|
|
from gatelock.log_integrity import compute_entry_hmac
|
|
|
|
from screen_locker._compliance_state import is_early_bird_pending
|
|
from screen_locker._constants import (
|
|
EARLY_BIRD_END_HOUR,
|
|
EARLY_BIRD_END_MINUTE,
|
|
EARLY_BIRD_PENDING_FILE,
|
|
EARLY_BIRD_START_HOUR,
|
|
EXTRA_BENEFITS_FILE,
|
|
)
|
|
from screen_locker._extra_benefits import has_extended_early_bird
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _today_str() -> str:
|
|
"""Return today's date as YYYY-MM-DD in UTC."""
|
|
return datetime.now(tz=timezone.utc).strftime("%Y-%m-%d")
|
|
|
|
|
|
class EarlyBirdMixin:
|
|
"""Mixin providing early-bird time window checks and pending-state helpers."""
|
|
|
|
def _get_local_time_minutes(self) -> int:
|
|
"""Return current local time as minutes from midnight."""
|
|
now = datetime.now(tz=timezone.utc).astimezone()
|
|
return now.hour * 60 + now.minute
|
|
|
|
def _is_early_bird_time(self) -> bool:
|
|
"""Return True if current local time is in the early bird window.
|
|
|
|
Normally the window closes at 08:30. When the current ISO week has an
|
|
extended early-bird reward (earned by 5+ workouts the prior week) the
|
|
window extends to 09:00.
|
|
"""
|
|
minutes = self._get_local_time_minutes()
|
|
start = EARLY_BIRD_START_HOUR * 60
|
|
if has_extended_early_bird(EXTRA_BENEFITS_FILE):
|
|
end = 9 * 60 # 09:00
|
|
else:
|
|
end = EARLY_BIRD_END_HOUR * 60 + EARLY_BIRD_END_MINUTE
|
|
return start <= minutes < end
|
|
|
|
def _is_early_bird_pending(self) -> bool:
|
|
"""Check if today has an unresolved early-bird pending marker."""
|
|
return is_early_bird_pending(EARLY_BIRD_PENDING_FILE)
|
|
|
|
def _save_early_bird_pending(self) -> None:
|
|
"""Save today's early-bird pending marker (self-expires tomorrow)."""
|
|
state: dict[str, object] = {"date": _today_str()}
|
|
signature = compute_entry_hmac(state)
|
|
if signature is not None:
|
|
state["hmac"] = signature
|
|
else:
|
|
_logger.warning("HMAC key unavailable — saving unsigned pending marker")
|
|
try:
|
|
with EARLY_BIRD_PENDING_FILE.open("w") as f:
|
|
json.dump(state, f, indent=2)
|
|
except OSError as exc:
|
|
_logger.warning("Could not save early-bird pending marker: %s", exc)
|