mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-20 22:52:25 +01:00
_sync.py 498 -> 165, into siblings that each own one concern:
_sync_client.py picking a backend and building the remote store
_sync_banks.py pull/merge/push for the food bank and the budget
_sync_paths.py the kuhyx/syncs wire layout, shared by both
_sync_errors.py SyncError, so _sync and _sync_client need not import
each other
The patch targets moved with the code they guard, which is the whole risk of
this commit. unittest.mock.patch and monkeypatch.setattr both bind to a
*module object*, so a patch left pointing at _sync after CONFIG_FILE and
SYNC_TOKEN_FILE moved to _sync_client redirects nothing. That is not
hypothetical here: the first run of the suite took 9m18s instead of 7s and
raised 401s, because tests were reaching the real GitHub API with a fake
token. Repointed:
conftest SYNC_TOKEN_FILE, CONFIG_FILE -> _sync_client
test_sync* GitHubSyncClient (30 patch sites) -> _sync_client
test_backend mirror/firebase_client_for -> _sync_client
The repo's own _test_guard caught the same leak independently, which is the
behaviour worth keeping: two guards, both fail-closed.
test_sync.py 482 -> 205, splitting the budget and pull/revision classes into
siblings and the shared fakes into _sync_fakes.py.
conftest.py 284 -> 155, moving the Tk/gatelock fixtures to _gate_fixtures.py.
Importing them back is what registers them (pytest_plugins is an error in a
non-root conftest), and they are named in __all__ because ruff's autofix
otherwise deletes the "unused" import and silently disables Tk blocking --
it did exactly that once here. Verified afterwards with a canary asserting
_gatelock.tk is still a MagicMock, not merely that the suite passes.
Verified: 692 tests / 100% coverage unchanged; ~/.local/share/diet_guard
byte-identical before and after the run; cd /tmp && python3 -m diet_guard sync
-> 402 entries, exit 0. Gate 47 -> 44.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MK3HCZrM75sRHL1gL8usve
72 lines
2.2 KiB
Python
72 lines
2.2 KiB
Python
"""Entry <-> ``crdt_sync.Record`` adapters for diet_guard's cross-device sync.
|
|
|
|
diet_guard's own on-disk ``food_log.json`` format is unchanged (a
|
|
:class:`~diet_guard._state.DayLog`: date string -> list of entry dicts) --
|
|
only the GitHub-synced wire format and the cross-device merge algorithm go
|
|
through ``crdt_sync``'s ``Record``/``Log``/``Hlc`` primitives, the same ones
|
|
every other kuhy app that syncs this way uses (see ``~/crdt-sync``).
|
|
|
|
Split into three submodules for file size, along the same seams the tests
|
|
already use:
|
|
|
|
* :mod:`._daylog` -- the food log itself, including the legacy-format fallback
|
|
* :mod:`._budget` -- the budget record and its ``hist:`` history fields
|
|
* :mod:`._banks` -- the derived and curated halves of the food bank
|
|
|
|
Everything public is re-exported here, so ``from diet_guard.sync_merge import
|
|
parse_remote_log`` reaches the same object the flat module exposed. (The
|
|
``merge_logs`` these adapters feed is ``crdt_sync``'s, imported directly by
|
|
:mod:`diet_guard._sync` -- it was never defined here.)
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from diet_guard.sync_merge._banks import (
|
|
food_bank_to_log,
|
|
log_to_food_bank,
|
|
log_to_manual_bank,
|
|
manual_bank_to_log,
|
|
parse_remote_food_bank,
|
|
parse_remote_manual_bank,
|
|
)
|
|
from diet_guard.sync_merge._budget import (
|
|
_budget_hlc,
|
|
budget_to_log,
|
|
log_to_budget,
|
|
log_to_history,
|
|
parse_remote_budget,
|
|
)
|
|
from diet_guard.sync_merge._daylog import (
|
|
_entry_hlc,
|
|
_legacy_entry_id,
|
|
daylog_to_log,
|
|
entry_to_record,
|
|
log_to_daylog,
|
|
parse_remote_log,
|
|
record_to_entry,
|
|
)
|
|
|
|
__all__ = [
|
|
# Private helpers the tests reach for directly. Re-exported deliberately:
|
|
# they were importable from the flat module, and dropping them here would
|
|
# break those tests for a naming reason rather than a behavioural one.
|
|
"_budget_hlc",
|
|
"_entry_hlc",
|
|
"_legacy_entry_id",
|
|
"budget_to_log",
|
|
"daylog_to_log",
|
|
"entry_to_record",
|
|
"food_bank_to_log",
|
|
"log_to_budget",
|
|
"log_to_daylog",
|
|
"log_to_food_bank",
|
|
"log_to_history",
|
|
"log_to_manual_bank",
|
|
"manual_bank_to_log",
|
|
"parse_remote_budget",
|
|
"parse_remote_food_bank",
|
|
"parse_remote_log",
|
|
"parse_remote_manual_bank",
|
|
"record_to_entry",
|
|
]
|