screen-locker/screen_locker/_status_view_verify.py
Krzysztof kuhy Rudnicki c277325a3e
Some checks are pending
pre-commit / pre-commit (push) Waiting to run
Tests / test (3.10) (push) Waiting to run
Tests / test (3.11) (push) Waiting to run
Tests / test (3.12) (push) Waiting to run
Make Check Phone week-aware; add RunnerUp GPS tolerance; fix CLI weekly count
Check Phone only ever checked today's date, so a verified workout from
earlier in the week (e.g. yesterday's run, found once the phone connects
later) was never backfilled unless you ran the --status CLI. It now falls
back to the existing RunnerUp week-scanner plus a new StrongLifts
equivalent, still pulling and validating the real file via ADB before
crediting anything.

GPS distance tracking undershoots on tight turns/tree cover, so a run
within 5% of the 5.0 km minimum (e.g. 4.9 km) is now accepted instead of
silently rejected — duration is clock-based and gets no such leeway.

Also fixes a pre-existing bug in the --status CLI surfaced by this change:
its weekly-total summary derived counts from a per-day checkmark (max 1
per day) instead of screen_locker._weekly_check.count_weekly_workouts,
undercounting any day with more than one verified workout.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ERWuV1nExiMfiNb9Gb7AQt
2026-07-18 06:55:55 +02:00

217 lines
9.2 KiB
Python

"""The status window's "Check Phone" verify-and-credit flow.
Split out of ``status_view`` to keep that module focused on rendering. Holds
the one place the voluntary status window *writes*: a verified workout here is
appended to the log and earns its shutdown reward, exactly as the locked
screen's unlock does.
"""
from __future__ import annotations
from concurrent.futures import ThreadPoolExecutor # pylint: disable=no-name-in-module
from dataclasses import dataclass
from typing import TYPE_CHECKING
from screen_locker._status_data import gather_status
from screen_locker._weekly_check import WEEKLY_WORKOUT_MINIMUM, count_weekly_workouts
if TYPE_CHECKING:
from collections.abc import Callable
from concurrent.futures import Future
from pathlib import Path
from screen_locker._workout_credit import WorkoutCreditResult
from screen_locker.screen_lock import ScreenLocker
@dataclass(frozen=True)
class PhoneCheckOutcome:
"""Result of the "Check Phone" button's verify-then-backfill chain.
``credited_type`` is ``"phone_verified"`` / ``"runnerup_verified"`` when
*today's* workout verified directly, or ``None`` otherwise (whether or
not the week-scan backfill found something — that's reported separately
via ``week_fill_message``, since it applies its own credit already).
"""
credited_type: str | None
status: str
phone_message: str
runnerup_message: str | None
week_fill_message: str | None = None
def _make_bare_verifier(log_file: Path) -> ScreenLocker:
"""Build a minimal ``ScreenLocker`` for verification calls.
Same ``object.__new__`` bypass ``screen_lock.py`` already uses for
``--status`` — just enough state for the verification mixins' methods
to run, no Tk lock UI, no ``__init__`` side effects.
"""
from screen_locker.screen_lock import ScreenLocker
verifier = object.__new__(ScreenLocker)
verifier.log_file = log_file
verifier.workout_data = {}
return verifier
def _backfill_week_and_apply_bonus(verifier: ScreenLocker) -> str | None:
"""Scan the current week for unlogged RunnerUp/StrongLifts and credit it.
Reuses the exact prev/new-count + ``_adjust_shutdown_time_by`` bonus
pattern already proven by the automatic lock-check
(``screen_lock.py:_auto_fill_week_runnerup_bonus``) and the ``--status``
CLI (``_status.py``) — deliberately *not* routed through
``_apply_workout_credit``, which always files under today by design and
would mis-date a backfilled entry.
Returns a human-readable summary if anything was filled, else ``None``.
"""
prev_count = count_weekly_workouts(verifier.log_file)
filled = verifier._scan_and_fill_week_runnerup(verifier.log_file)
filled += verifier._try_fill_stronglifts_for_week(verifier.log_file)
if not filled:
return None
new_count = count_weekly_workouts(verifier.log_file)
bonus = max(0, new_count - max(WEEKLY_WORKOUT_MINIMUM, prev_count))
if bonus > 0:
verifier._adjust_shutdown_time_by(bonus)
plural = "workout" if filled == 1 else "workouts"
message = f"Auto-filled {filled} {plural} from earlier this week."
if bonus > 0:
message += f" +{bonus}h shutdown time."
return message
def _verify_phone_then_runnerup(verifier: ScreenLocker) -> PhoneCheckOutcome:
"""Check StrongLifts first, then RunnerUp, then backfill the rest of the week.
Mirrors the locked screen's StrongLifts→RunnerUp chain (``_ui_flows.py``):
a user may have run instead of lifted, so a failed phone check falls back
to today's RunnerUp export. When neither source verifies *today*, this
also scans the rest of the current ISO week for an unlogged, already-real
(ADB-pulled, TCX/JSON-verified) workout — e.g. a run from yesterday that
was never on-screen when the phone wasn't connected yet — and credits it
directly. Only calls the verifier's ADB methods — never touches Tk — so
it is safe to run inside a background thread.
"""
phone_status, phone_message = verifier._verify_phone_workout()
if phone_status == "verified":
return PhoneCheckOutcome("phone_verified", phone_status, phone_message, None)
runnerup_status, runnerup_message = verifier._verify_runnerup_workout()
if runnerup_status == "verified":
return PhoneCheckOutcome(
"runnerup_verified", runnerup_status, phone_message, runnerup_message
)
week_fill_message = _backfill_week_and_apply_bonus(verifier)
return PhoneCheckOutcome(
None, runnerup_status, phone_message, runnerup_message, week_fill_message
)
class PhoneCheckMixin:
"""The "Check Phone" button: verify today's workout, then credit it.
Composed onto ``StatusWindow``, which supplies ``log_file``,
``verifier_factory``, ``root``, ``render`` and the result/message slots
declared below.
"""
log_file: Path
verifier_factory: Callable[[Path], ScreenLocker]
_phone_future: Future[PhoneCheckOutcome] | None
_phone_check_result: tuple[str, str] | None
_credit_message: str | None
def _on_check_phone_clicked(self) -> None:
"""Verify today's workout (StrongLifts then RunnerUp) and apply its reward.
Runs the two-step check in one background worker so the Tk loop stays
responsive, then polls the future. Unlike the old display-only probe,
a verified result here writes the entry and applies the shutdown bonus
(see :meth:`_on_phone_check_result`). When neither source verifies
today, the same worker also backfills any unlogged workout from
earlier this week before giving up.
"""
self._phone_check_result = None
self._credit_message = None
verifier = self.verifier_factory(self.log_file)
executor = ThreadPoolExecutor(max_workers=1)
self._phone_future = executor.submit(_verify_phone_then_runnerup, verifier)
executor.shutdown(wait=False)
self._poll_phone_check()
def _poll_phone_check(self) -> None:
"""Poll the background verification future until it resolves."""
if self._phone_future is not None and self._phone_future.done():
self._on_phone_check_result(self._phone_future.result())
else:
self.root.after(500, self._poll_phone_check)
def _on_phone_check_result(self, outcome: PhoneCheckOutcome) -> None:
"""Apply credit on a verified workout, else show a combined failure.
On a verified *today* result this writes the entry and applies the
reward via ``_apply_workout_credit`` — the same path the locked
screen's ``unlock_screen`` and the "Log Manual Workout" button use,
guarded against double-crediting on the same day. When the week-scan
backfill found something instead (see ``_verify_phone_then_runnerup``),
its message is shown as-is — that step already wrote the entry and
applied its own bonus, applying credit again here would double it.
When nothing verified or filled, both today-check messages are shown
so the user knows why nothing counted.
"""
if outcome.credited_type is not None:
message = (
outcome.runnerup_message
if outcome.credited_type == "runnerup_verified"
else outcome.phone_message
)
source_label = (
"RunnerUp"
if outcome.credited_type == "runnerup_verified"
else "StrongLifts"
)
verifier = self.verifier_factory(self.log_file)
verifier.workout_data = {
"type": outcome.credited_type,
"source": message or "",
}
credit = verifier._apply_workout_credit()
self._credit_message = "\n".join(
self._credit_result_lines(f"{source_label} verified: {message}", credit)
)
elif outcome.week_fill_message is not None:
self._credit_message = outcome.week_fill_message
else:
self._phone_check_result = (
outcome.status,
f"StrongLifts: {outcome.phone_message} · "
f"RunnerUp: {outcome.runnerup_message}",
)
self.render(gather_status())
def _credit_result_lines(
self, header: str, credit: WorkoutCreditResult
) -> list[str]:
"""Human-readable outcome lines for an applied workout credit.
Shared by the "Check Phone" verify path and the "Log Manual Workout"
path so both report the reward identically: the base +2h shutdown push
for the day's first workout, the +1h bonus for an additional same-day
verified workout, and any debt cleared — or a note when this exact
workout was already recorded today (idempotent, no new credit).
"""
lines = [header]
if credit.already_counted_today:
lines.append("(Already recorded today — no additional credit.)")
return lines
if credit.shutdown_adjusted:
lines.append("Shutdown time +2h later!")
if credit.extra_bonus_delta > 0:
lines.append(f"Extra workout today! +{credit.extra_bonus_delta}h tonight")
if credit.new_debt is not None:
lines.append(f"Workout debt: {credit.new_debt}")
return lines