mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-10 20:27:11 +01:00
Krzysztof kuhy Rudnicki
458f10515b
Some checks failed
Meals logged on the phone stopped reaching the PC, so the gate kept locking for slots that were already logged and the only way through was to spam "nothing". The PC's fetch was never broken: it was faithfully pulling a Firebase that did not contain the phone's meals. The phone had no working publish backstop on either transport: - `checkAndNotify` gated its sync on `due.isNotEmpty`. Logging every meal promptly means nothing is ever due, so the ~15-min periodic task never published. It was a notification job that happened to sync, not a sync timer. It now syncs on every tick it is asked to, then computes due slots from the merged result, so a meal pulled from another device suppresses a nag instead of triggering one. - `backgroundSyncPush` never called `initSyncDeviceId()`. A fresh isolate has its own static state, so `currentSyncDeviceId` fell back to the compile-time 'phone' constant and published to `devices/phone/` rather than the persisted uuid -- which then makes the next foreground push see `unchanged` and skip writing the uuid directory entirely. Separately, on the "Fetch from sync" path itself: `FirebaseSyncError` and `FirebaseAuthError` are siblings of `GitHubSyncError` under `RemoteSyncError`, not subclasses, so every per-request failure of the *primary* backend escaped `pull_shared_log`'s catch tuple and raised a traceback out of a helper documented to fail closed with a reason string. `ConfigError` needed the same treatment by a different route: it subclasses `Exception` directly, so it is outside `RemoteSyncError` too, and is now translated at `_client_for_run`. The PAT is no longer mandatory either. Firebase is primary, but `_read_token` ran before the client was ever built, so a Firebase-only machine could not sync at all -- the commits that fixed this touched only the Dart side. A stalled sync was invisible: the config gates returned silently and `openFirebase` swallowed every error. `dart:developer`'s `log()` does not reach logcat on a release build (verified on device), so logging alone would not have surfaced it. `SyncHealth` records each tick's outcome and the log screen shows a banner when publishing has actually stopped. Also make the real-Tk probes bypass the window manager. A tiling WM retiles a managed toplevel instead of honouring the requested geometry, so `winfo_height` reported 0/1px and the layout and focus-ring assertions failed on noise rather than on any regression -- 8 failures on the dev machine that only passed under Xvfb. `overrideredirect` makes the measurement deterministic with or without a WM; the probes still detect a genuine overflow at 1366x300. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RT8X32S9yDLW1Xf1PDq8z7
60 lines
2.0 KiB
Python
60 lines
2.0 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 crdt_sync import RemoteSyncError
|
|
|
|
from diet_guard._sync import SyncError, run_sync
|
|
|
|
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 RemoteSyncError as exc:
|
|
# The shared base, not GitHubSyncError: Firebase's errors are siblings
|
|
# of GitHub's, so catching only the latter let the primary backend's
|
|
# failures crash this timer-driven command with a traceback.
|
|
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
|