mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 20:33:54 +01:00
Krzysztof kuhy Rudnicki
e23f7ac3b4
diet_guard pushed as "pc" (Python), "phone" (Android) and "desktop" (web). A role constant collides the moment a second machine takes the same role, and after a reinstall the new install inherits the previous one's CRDT identity -- the same reasoning home_inventory already records for choosing a uuid. Both halves now mint a uuid once and persist it: the PC in ~/.local/share/diet_guard/.device_id, the app under SharedPreferences 'crdt.nodeId' (the key todo and home_inventory already use). The old constant survives as the legacy id and is passed to sync_log / syncLog, so devices/<legacy>/ is skipped as this device's own. Without that every tick would re-download and re-merge this device's own pre-migration log as though a peer had written it -- idempotent under LWW, but hundreds of KB, 96 times a day. It drops to None once that path is reclaimed; a test covers both states, including a negative control proving the skip is the legacy id's doing. All four documents move together (food_log, food_bank, food_bank_manual, budget), and the hist:<date> fields riding on the budget record are untouched -- merge_record unions field names, so they relay through unchanged. The resolver lives in its own module (_device.py / sync_device_id.dart) because _sync_merge needs it for HLC stamping too and importing _sync there would be a cycle. Dart resolves it asynchronously at startup, before LogStorageService.init(); currentSyncDeviceId falls back to the compile-time role constant until then, so a too-early Hlc stamp gets a valid id rather than crashing. conftest redirects the new id file in the same change that introduces it -- without that a test mints a uuid into the real state dir and this machine's live sync identity is decided by whichever test ran first. Verified by checking ~/.local/share/diet_guard/ before and after: untouched. Verified live, not just against mocks: the sync timer ran mid-change and migrated this machine to f8f46da6. All 358 food_log records and all 100 food_bank records are present under the new path (0 missing vs devices/pc/), and the new log's HLCs carry only its own id -- confirming it did not re-merge the old path as a peer. Python: 687 tests, 100% branch coverage. App: 518 tests, analyzer clean. Pins bumped to crdt-sync-v0.6.0 / crdt_sync_dart-v0.7.0 (pyproject, requirements.txt, .pre-commit-config.yaml, pubspec), and the new library is installed into /usr/bin/python's user site-packages so the production timer does not ImportError on its next tick. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GZH89WEqAjuJT8WZdqc7AP
29 lines
1003 B
Python
29 lines
1003 B
Python
"""This machine's persisted sync identity.
|
|
|
|
Its own module rather than living in :mod:`diet_guard._sync`, because
|
|
:mod:`diet_guard._sync_merge` needs it too for HLC stamping and importing
|
|
``_sync`` from there would be a cycle.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from crdt_sync import DeviceIdentity, load_device_identity
|
|
|
|
from diet_guard._constants import SYNC_DEVICE_ID_FILE, SYNC_LEGACY_DEVICE_ID
|
|
|
|
|
|
def device_identity() -> DeviceIdentity:
|
|
"""Return this machine's sync identity, minting it on first use.
|
|
|
|
Deliberately not cached at import time: the id file is redirected
|
|
per-test, and a module-level constant would freeze whichever value the
|
|
first import happened to see. Reading a small file once per sync tick is
|
|
cheaper than that surprise.
|
|
"""
|
|
return load_device_identity(SYNC_DEVICE_ID_FILE, legacy_id=SYNC_LEGACY_DEVICE_ID)
|
|
|
|
|
|
def device_id() -> str:
|
|
"""Return just this machine's current sync id, for HLC stamping."""
|
|
return device_identity().device_id
|