mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 20:27:13 +01:00
_workout_sync.py (332) -> _sync_client.py token, Firebase/GitHub client
_sync_records.py payload predicates + log decoding
_sick_tracker.py (317) -> _sick_budget.py SickHistory + rolling budget
This one was not a pure move until the fixtures followed it. Three autouse
test guards patch names by module, and all three pointed at _workout_sync:
isolate_sync_token SYNC_TOKEN_FILE -> now also on _sync_client
_no_real_firebase_config CONFIG_FILE -> now on _sync_client
_firebase_config helper (7 call sites) -> now passed _sync_client
With them stale, sync_client built a REAL client: the suite went from 14s to
over 120s and test_workout_sync_part5 asserted against live workout data
pulled from the actual backend. Fixed, the same tests run in 0.7s. Both
modules keep SYNC_TOKEN_FILE so either patch point works, and every relocated
guard target is asserted to exist.
977 tests pass at 100% branch coverage; pylint back to 8.70 after fixing the
findings the split introduced (a dropped `return None` in _parse_iso and
leftover dead imports). `screen_lock --status` unchanged.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EveB813BQ8abAP68VSqZ5Y
201 lines
6.7 KiB
Python
201 lines
6.7 KiB
Python
"""Pulls phone/other-device workouts via crdt-sync's GitHub transport.
|
|
|
|
GitHub is used purely as dumb file storage (see ``crdt_sync``'s own docs) --
|
|
the phone app pushes its completed-workout log to a private repo; this module
|
|
reads the session log and every device's manual-workout records. (The PC does
|
|
push its OWN manual workouts, but via :mod:`screen_locker._manual_push`, not
|
|
here.) Sync is optional: an unconfigured token is a normal, expected state,
|
|
not an error -- unlike diet_guard, where sync is core to the app.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import TYPE_CHECKING
|
|
|
|
from crdt_sync import (
|
|
CONFIG_FILE,
|
|
Hlc,
|
|
RemoteStore,
|
|
RemoteSyncError,
|
|
)
|
|
|
|
from screen_locker._constants import (
|
|
SYNC_REPO_NAME,
|
|
SYNC_REPO_OWNER,
|
|
SYNC_TOKEN_FILE,
|
|
)
|
|
from screen_locker._sync_client import (
|
|
read_sync_token,
|
|
remote_client,
|
|
sync_client,
|
|
)
|
|
from screen_locker._sync_records import (
|
|
_is_manual_payload,
|
|
_is_session_payload,
|
|
_manual_records,
|
|
_records_matching,
|
|
_session_records,
|
|
)
|
|
from screen_locker._sync_retry import with_sync_retry
|
|
|
|
# Re-exported for callers (_manual_push) and for the autouse isolate_sync_token
|
|
# fixture, which redirects SYNC_TOKEN_FILE on this module as well as on
|
|
# _sync_client -- without both, a real token on the host leaks into the tests.
|
|
__all__ = [
|
|
"CONFIG_FILE",
|
|
"SYNC_TOKEN_FILE",
|
|
"_is_manual_payload",
|
|
"_is_session_payload",
|
|
"_manual_records",
|
|
"_records_matching",
|
|
"_session_records",
|
|
"pull_all_manual_records",
|
|
"pull_synced_workout",
|
|
"read_sync_token",
|
|
"remote_client",
|
|
"sync_client",
|
|
]
|
|
|
|
if TYPE_CHECKING:
|
|
from collections.abc import Callable
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
_DEVICES_PREFIX = "screen-locker-sync/devices"
|
|
_PAYLOAD_FIELD = "payload"
|
|
|
|
|
|
def _merge_device_records(
|
|
client: RemoteStore,
|
|
extract: Callable[[str], dict[str, tuple[dict, Hlc]]],
|
|
what: str,
|
|
*,
|
|
strict: bool = False,
|
|
) -> dict[str, tuple[dict, Hlc]]:
|
|
"""Merge ``extract``-selected records across EVERY device log.
|
|
|
|
Walks ``devices/<id>/log.json`` for every device directory, keeping the
|
|
highest-HLC copy of each record id -- records are id-stable, so the same
|
|
workout mirrored into two device logs dedups to one.
|
|
|
|
Every device is walked because the phone's directory name is a per-install
|
|
uuid (since ffc6c72), not a fixed role id: it changes on every reinstall,
|
|
and old directories linger. Reading any single hardcoded device path is
|
|
guaranteed to go stale, which is exactly how phone sessions stopped
|
|
reaching this machine.
|
|
|
|
Best-effort per device: an unreachable or corrupt device log yields fewer
|
|
records rather than raising, and says so at ``warning`` -- naming the
|
|
device and what is being dropped -- so a partial pull is never silent.
|
|
|
|
``strict`` controls only the *top-level* listing failure, where nothing at
|
|
all could be read. Callers that distinguish "nothing to sync" from "the
|
|
sync broke" pass ``strict=True`` to get the exception instead of an empty
|
|
dict, since an empty dict would otherwise report a total failure as the
|
|
benign "no records" case.
|
|
"""
|
|
try:
|
|
devices = with_sync_retry(
|
|
lambda: client.list_directory(_DEVICES_PREFIX),
|
|
description="list synced device logs",
|
|
)
|
|
except RemoteSyncError as exc:
|
|
_logger.warning(
|
|
"Could not list device logs under %s in %s/%s: %s — pulling NO "
|
|
"synced %s, so phone-logged workouts will not count",
|
|
_DEVICES_PREFIX,
|
|
SYNC_REPO_OWNER,
|
|
SYNC_REPO_NAME,
|
|
exc,
|
|
what,
|
|
)
|
|
if strict:
|
|
raise
|
|
return {}
|
|
|
|
merged: dict[str, tuple[dict, Hlc]] = {}
|
|
for device in devices:
|
|
path = f"{_DEVICES_PREFIX}/{device}/log.json"
|
|
try:
|
|
text = client.get_file_text(path)
|
|
except RemoteSyncError as exc:
|
|
_logger.warning(
|
|
"Could not fetch device log %s: %s — SKIPPING that device, so "
|
|
"any %s it holds will not count",
|
|
path,
|
|
exc,
|
|
what,
|
|
)
|
|
continue
|
|
if text is None:
|
|
continue
|
|
try:
|
|
records = extract(text)
|
|
except (ValueError, KeyError, TypeError) as exc:
|
|
_logger.warning("Corrupt sync data at %s: %s", path, exc)
|
|
continue
|
|
for rid, (payload, hlc) in records.items():
|
|
existing = merged.get(rid)
|
|
if existing is None or existing[1] < hlc:
|
|
merged[rid] = (payload, hlc)
|
|
|
|
return merged
|
|
|
|
|
|
def pull_synced_workout() -> tuple[dict | None, str | None]:
|
|
"""Return ``(data, error)``: the last-synced StrongLifts session, if any.
|
|
|
|
Merges sessions across EVERY device directory and returns the highest-HLC
|
|
one. It used to read a single hardcoded ``devices/phone/log.json``, which
|
|
silently went stale the moment the phone moved to a per-install uuid
|
|
(ffc6c72): this machine kept happily returning a session from 2026-07-27
|
|
while newer ones sat unread one directory over.
|
|
|
|
- Nothing configured anywhere: ``(None, None)`` -- benign, sync is optional.
|
|
- Nothing pushed yet: ``(None, None)``.
|
|
- A real sync error (network, bad token, backend unreachable):
|
|
``(None, <message>)``.
|
|
- Success: ``(payload_dict, None)``.
|
|
"""
|
|
client = sync_client()
|
|
if client is None:
|
|
return None, None
|
|
|
|
try:
|
|
merged = _merge_device_records(
|
|
client, _session_records, "StrongLifts sessions", strict=True
|
|
)
|
|
except RemoteSyncError as exc:
|
|
_logger.warning(
|
|
"Could not fetch synced workout logs under %s: %s — falling back "
|
|
"to ADB/HTTP verification",
|
|
_DEVICES_PREFIX,
|
|
exc,
|
|
)
|
|
return None, str(exc)
|
|
|
|
if not merged:
|
|
return None, None
|
|
|
|
_rid, (payload, _hlc) = max(merged.items(), key=lambda item: item[1][1])
|
|
return payload, None
|
|
|
|
|
|
def pull_all_manual_records() -> list[tuple[str, dict]]:
|
|
"""Return all synced manual-workout records across every device log.
|
|
|
|
Merges every ``devices/<device>/log.json`` under the sync prefix (phone,
|
|
pc, …), keeping the highest-HLC copy of each record id — records are
|
|
id-stable, so the same workout mirrored into two device logs dedups to one.
|
|
Best-effort: an unconfigured token, an unreachable repo, or a corrupt device
|
|
log yields fewer/no records rather than raising — manual sync, like session
|
|
sync, is optional.
|
|
"""
|
|
client = sync_client()
|
|
if client is None:
|
|
return []
|
|
|
|
merged = _merge_device_records(client, _manual_records, "manual workouts")
|
|
return [(rid, payload) for rid, (payload, _hlc) in merged.items()]
|