mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-10 19:07:15 +01:00
Krzysztof kuhy Rudnicki
38d66a8492
The periodic diet-guard-sync.timer paid a network round-trip every ~15 min to approximate the two moments the shared log actually changes on this device. Sync now fires on those events instead: * before a lock -- already present in _cli_gate._should_lock, which pulls only when a lock is otherwise due, so a phone-logged meal clears the lock and a not-due tick never touches the network; * after a meal is logged here -- new _sync_events.publish_after_log, wired into all three write paths (_cli_log, _cli_gate, _mcp). This is what stops the PHONE nagging for a slot already logged on the PC, the mirror image of the rule that keeps the phone's own tick unconditional. The gate's publish sits in cmd_gate AFTER MealGate.run() returns, never in the unlock handler: that runs on the Tk thread with the window still up, so a hanging network call would keep the user locked in behind a successful log. It also covers the "Synced from another device" unlock, which hooking log_meal would miss. Accepted trade: a PC that is on but neither logging nor locking no longer pulls, so an inbound phone edit lands at the next log or lock rather than within 15 min. Bounded by slot spacing -- an unlogged day raises a lock. install.sh now disables and removes the installed timer (guarded, since a fresh machine has no such unit and `disable` would abort under `set -euo pipefail`); the .service stays for manual one-off ticks. Every test that logs a meal would otherwise reach the network through the new call sites, so conftest patches publish_after_log at each of the three call sites -- not on _sync_events, so test_sync_events still exercises the real helper. Suite stays at ~8s, which is the actual leak detector. Two files had to be split to commit at all, since file-length passes filenames and both were already over the 250-line cap: _cli.py 466 -> 207, + _cli_args.py, _cli_init.py, _cli_log.py _mcp.py 370 -> 194, + _mcp_server.py (singleton + annotations), _mcp_read.py Their conftest/test patch targets moved in the same commit; a stale target redirects nothing and fails open. Verified: 701 python tests at 100% branch coverage, 555 flutter tests, `python -m diet_guard sync` -> 402 entries/exit 0, `gate --check` -> exit 0, all five MCP tools still register, live ~/.local/share/diet_guard byte-identical. Over-cap files: 44 -> 42. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RA9ynjqXPnexRQnR5oAuCC
101 lines
3.1 KiB
Python
101 lines
3.1 KiB
Python
"""Argument parsing for the diet_guard CLI.
|
|
|
|
Split out of :mod:`diet_guard._cli` to hold the repo's 250-line cap. This is
|
|
the declarative half -- every subcommand and flag the CLI accepts -- kept apart
|
|
from the handlers that act on them, so adding a flag never grows a file that
|
|
also contains logic.
|
|
|
|
Subparsers owned by a sibling handler register themselves through their own
|
|
module (``register_averages_subparser``, ``register_sync_subparser``) rather
|
|
than being spelled out here, so a subcommand's flags live next to its code.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
|
|
from diet_guard._cli_averages import register_averages_subparser
|
|
from diet_guard._cli_sync import register_sync_subparser
|
|
|
|
|
|
def parse_args(argv: list[str]) -> argparse.Namespace:
|
|
"""Parse diet_guard CLI arguments."""
|
|
parser = argparse.ArgumentParser(
|
|
prog="diet_guard",
|
|
description="Log calories and check your daily budget.",
|
|
)
|
|
sub = parser.add_subparsers(dest="command", required=True)
|
|
|
|
sub.add_parser(
|
|
"init",
|
|
help="Compute your starting daily budget from biometrics.",
|
|
)
|
|
|
|
ate = sub.add_parser("ate", help="Log a meal you just ate.")
|
|
ate.add_argument("description", help='What you ate, e.g. "big mac".')
|
|
ate.add_argument(
|
|
"--grams",
|
|
type=float,
|
|
default=None,
|
|
help="Portion size in grams (default: OFF serving size, else 100 g).",
|
|
)
|
|
ate.add_argument(
|
|
"--kcal",
|
|
type=float,
|
|
default=None,
|
|
help="Calories entered manually; skips the food bank and OFF lookup.",
|
|
)
|
|
ate.add_argument(
|
|
"--protein",
|
|
type=float,
|
|
default=None,
|
|
help="Protein in grams (recorded with --kcal to seed the food bank).",
|
|
)
|
|
ate.add_argument(
|
|
"--carbs",
|
|
type=float,
|
|
default=None,
|
|
help="Carbohydrate in grams (recorded with --kcal).",
|
|
)
|
|
ate.add_argument(
|
|
"--fat",
|
|
type=float,
|
|
default=None,
|
|
help="Fat in grams (recorded with --kcal).",
|
|
)
|
|
ate.add_argument(
|
|
"--per",
|
|
type=float,
|
|
default=None,
|
|
help="Grams the macros are stated for (e.g. 100 for a per-100 g label);"
|
|
" the typed macros are scaled from this to how much you ate.",
|
|
)
|
|
ate.add_argument(
|
|
"--count",
|
|
type=float,
|
|
default=None,
|
|
help="Number of items eaten (e.g. 5 apples) instead of --grams;"
|
|
" multiplied by the staple's unit weight.",
|
|
)
|
|
|
|
sub.add_parser("status", help="Show today's calories and budget band.")
|
|
sub.add_parser("undo", help="Remove today's most recent entry.")
|
|
register_averages_subparser(sub)
|
|
register_sync_subparser(sub)
|
|
|
|
gate = sub.add_parser(
|
|
"gate",
|
|
help="Log-to-unlock screen gate (intended to be run by a timer).",
|
|
)
|
|
gate.add_argument(
|
|
"--check",
|
|
action="store_true",
|
|
help="Headless: exit 0 if NOT due, 1 if a lock is due. Prints, no window.",
|
|
)
|
|
gate.add_argument(
|
|
"--demo",
|
|
action="store_true",
|
|
help="Show the lock in safe demo mode (local grab + close button).",
|
|
)
|
|
return parser.parse_args(argv)
|