mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-07-04 11:43:07 +02:00
Krzysztof kuhy Rudnicki
e5b80fd610
Pulls every other device's pushed log from GitHub-backed dumb storage, merges it with the local log, and pushes this device's own merged copy back -- the PC half of the diet-guard-app sync plan. - _sync_merge.py: pure union-by-id merge, tombstone always wins, legacy (time, desc) dedup for pre-id entries. Commutative and idempotent. - _sync_github.py: minimal GitHub Contents API client (list/get/put), distinguishing a 404 on an unused path from the repo itself being unreachable. - _sync.py: orchestration -- pull, merge, re-sign every persisted entry regardless of origin, write, rebuild the food bank, push. Re-signing unconditionally is load-bearing: an unsigned phone-origin entry would otherwise be silently dropped on the very next read once a machine holds the shared HMAC key. - _foodbank.rebuild_food_bank(): the "replay a full log into a fresh bank" entrypoint the Python side was missing (the Dart port already had its equivalent). Backs sync's bank-rebuild step. - New diet-guard-sync.service/.timer (15-minute cadence, headless, a separate unit from the gate so a held lock can't stall sync) and a new install.sh step to install them. - Created the private kuhyx/diet-guard-sync GitHub repo for storage. Incidental to this feature: adding the `sync` subcommand pushed _cli.py past the repo's 500-line cap, so `gate`'s CLI glue moved out alongside sync's into _cli_gate.py/_cli_sync.py -- same split pattern already used for the gate window logic itself, not a sync-specific design choice. 338 tests, 100% branch coverage. Verified importing and running cleanly under /usr/bin/python (the production interpreter), not just the dev venv -- the gap that caused the earlier 3-day outage. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FU3f5KQ1GHXsbbSecfVEyF
56 lines
1.8 KiB
Python
56 lines
1.8 KiB
Python
"""CLI handler for the ``sync`` subcommand.
|
|
|
|
Split out from :mod:`diet_guard._cli` to keep that module under the repo's
|
|
500-line cap (see ``CLAUDE.md``'s "feat: split oversized modules" history) --
|
|
the same reason the gate window logic lives across ``_gatelock*.py`` instead
|
|
of one file.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
|
|
from diet_guard._sync import SyncError, run_sync
|
|
from diet_guard._sync_github import GitHubSyncError
|
|
|
|
if TYPE_CHECKING:
|
|
import argparse
|
|
from collections.abc import Callable
|
|
|
|
|
|
def register_sync_subparser(sub: argparse._SubParsersAction) -> None:
|
|
"""Register the ``sync`` subcommand on ``sub``."""
|
|
sub.add_parser(
|
|
"sync",
|
|
help="Pull/merge/push the log with other devices via GitHub.",
|
|
)
|
|
|
|
|
|
def cmd_sync(emit: Callable[[str], None]) -> int:
|
|
"""Run one sync tick and report what happened via ``emit``.
|
|
|
|
Errors are caught here rather than left to propagate: a sync failure
|
|
(missing PAT, network error, repo misconfigured) is routine enough on a
|
|
timer-driven command that the CLI should report it and exit non-zero,
|
|
not crash with a traceback.
|
|
|
|
Args:
|
|
emit: A one-line output sink (``_cli._emit``, kept private to that
|
|
module -- passed in rather than imported, so this module has no
|
|
reach-in dependency on ``_cli``'s internals).
|
|
|
|
Returns:
|
|
0 on a successful sync, 1 if it could not run or failed partway.
|
|
"""
|
|
try:
|
|
merged = run_sync()
|
|
except SyncError as exc:
|
|
emit(f"sync not configured: {exc}")
|
|
return 1
|
|
except GitHubSyncError as exc:
|
|
emit(f"sync failed: {exc}")
|
|
return 1
|
|
total_entries = sum(len(entries) for entries in merged.values())
|
|
emit(f"synced: {total_entries} entries across {len(merged)} day(s).")
|
|
return 0
|