mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 12:07:42 +01:00
Four asks, plus the fixes two review passes turned up. Removals (all unused): - "Repeat last meal" button, and the reward/temptation-bundling prompt it was the sole trigger for. Replaced with a post-log progress card showing kcal against budget, macros, and the adherence streak. - The multi-item meal builder, on both the gate and the phone. The stored `components` field stays: nothing writes it now, but historical composite entries and the food bank still read it and it is part of the wire format. - Meal photos entirely: 13 files, `imagePath`, the photo filter, the wrapper's /blobs/ route, image_picker, and the CAMERA permission. Reminder false alarms had three real causes, all fixed: - Logging never reconciled notifications, so a reminder sat on screen up to 15 minutes after the meal was logged -- on the phone itself. - The background check never pulled, so a PC-logged meal nagged forever until the app was opened. Now mirrors _cli_gate._should_lock: cheap local check, network only when a slot looks due, then re-check. - Meals before 08:00 / after 22:00 were attributed to no slot at all. New slot_for_log/slotForLog clamps them to the first/last slot, byte-identical across Python and Dart. Deliberately separate from elapsed_slots, which would otherwise make every slot fall due at 23:00. Budget history, so lowering the budget stops rewriting the past: - Forward-only (effective_from, kcal) entries; each day is judged against the budget in force then. Verified live: setting 2000 left a 36-day adherence streak and the whole calendar pixel-identical. - Rides as hist:<date> fields on the existing budget record. crdt_sync merges per-field over the union of field names and both devices push the merged log, so a device that predates the feature relays them untouched -- no coordinated rollout, no second document. - The seed guard tests emptiness, not file presence: _sync can write an empty history after merging with a pre-feature peer, and a presence check would then never seed again, silently reclassifying every past day. One shared source of truth for every piece of data: - Body weight now travels as its own `weight` CRDT field. Inside `value` it was collateral damage of whole-map LWW -- any phone budget edit deleted it, and the protein target with it. - Both halves of the food bank sync. The curated half (foods added without eating them) was the last device-local state. The derived half merges with count as the clock, so LWW means max-count-wins; the log stays authoritative for membership, because a CRDT union never shrinks and a peer's stale copy would otherwise resurrect a deleted food permanently. - Bank adapters honour tombstones, and Dart parses bank records defensively: a cast failure there is an Error, not an Exception, so one malformed remote record would have broken phone sync permanently. _test_guard.py blocks any pathlib write to real user state while pytest is in the process, whatever conftest is loaded. A throwaway test run outside the package conftest destroyed a real GitHub token during this work; this makes that class of accident impossible rather than merely discouraged. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
143 lines
5.4 KiB
Dart
143 lines
5.4 KiB
Dart
/// Cross-device log sync orchestration for the diet_guard companion app.
|
|
///
|
|
/// Pulls every other device's pushed log from GitHub-backed dumb storage via
|
|
/// crdt_sync's shared transport ([GitHubClient]/[syncLog]), merges with the
|
|
/// local log via crdt_sync's shared CRDT scheme (`sync_merge.dart` adapts
|
|
/// [FoodEntry]s to/from [Record]), rebuilds the food bank, and pushes this
|
|
/// device's own merged log back up in the new Record-based wire format.
|
|
///
|
|
/// The daily budget syncs alongside the food log in the same tick (see
|
|
/// [_syncBudget]): a sibling `budget.json` per device, merged
|
|
/// last-writer-wins by edit time rather than union-of-immutable-entries,
|
|
/// since a budget (unlike a food-log entry) can be edited repeatedly.
|
|
library;
|
|
|
|
import 'package:crdt_sync/crdt_sync.dart';
|
|
import 'package:diet_guard_app/models/food_entry.dart';
|
|
import 'package:diet_guard_app/services/app_settings_service.dart';
|
|
import 'package:diet_guard_app/services/budget_history_service.dart';
|
|
import 'package:diet_guard_app/services/foodbank_service.dart';
|
|
import 'package:diet_guard_app/services/github_client_factory.dart';
|
|
import 'package:diet_guard_app/services/log_storage_service.dart';
|
|
import 'package:diet_guard_app/services/sync_merge.dart';
|
|
|
|
const _devicesDir = 'diet-guard-sync/devices';
|
|
|
|
/// Runs one full sync tick: pull, merge, persist, push.
|
|
///
|
|
/// Returns the merged log as it now sits on disk locally. Propagates any
|
|
/// [GitHubSyncError] from the client for the caller (auto-sync / the manual
|
|
/// "Sync now" action) to decide how to report.
|
|
Future<DayLog> runSync(GitHubClient client) async {
|
|
final logService = LogStorageService.instance;
|
|
final local = await logService.readLog();
|
|
|
|
final mergedLog = await syncLog(
|
|
client: client,
|
|
deviceId: syncDeviceId,
|
|
pathPrefix: _devicesDir,
|
|
localLog: dayLogToLog(local),
|
|
encode: encodeLogForPush,
|
|
decode: parseRemoteLog,
|
|
filename: 'food_log.json',
|
|
commitMessage: 'diet_guard_app sync',
|
|
);
|
|
|
|
final merged = logToDayLog(mergedLog);
|
|
|
|
await logService.writeLog(merged);
|
|
await FoodBankService.instance.rebuildAndPersist(merged);
|
|
await _syncBudget(client);
|
|
await _syncFoodBank(client);
|
|
await _syncManualBank(client);
|
|
return merged;
|
|
}
|
|
|
|
/// Pulls, merges, persists and pushes the log-derived food bank.
|
|
///
|
|
/// Runs after the local rebuild above, so this device's records already
|
|
/// reflect the merged log; the merge then unions in whatever another device
|
|
/// knows, max-count winning per food. Mirrors `_sync._sync_food_bank`.
|
|
Future<void> _syncFoodBank(GitHubClient client) async {
|
|
final merged = await syncLog(
|
|
client: client,
|
|
deviceId: syncDeviceId,
|
|
pathPrefix: _devicesDir,
|
|
localLog: foodBankToLog(await FoodBankService.instance.readBank()),
|
|
encode: encodeFoodBankForPush,
|
|
decode: parseRemoteFoodBank,
|
|
filename: 'food_bank.json',
|
|
commitMessage: 'diet_guard_app sync',
|
|
);
|
|
await FoodBankService.instance.writeBank(logToFoodBank(merged));
|
|
}
|
|
|
|
/// Pulls, merges, persists and pushes the hand-curated food bank.
|
|
///
|
|
/// Curated entries are the one part of the bank that is not derivable from
|
|
/// the food log, so unlike `food_bank.json` they need a real merge:
|
|
/// last-writer-wins per food name by edit time, union across devices. Mirrors
|
|
/// `_sync._sync_manual_bank`.
|
|
Future<void> _syncManualBank(GitHubClient client) async {
|
|
final local = await FoodBankService.instance.readManualBank();
|
|
final merged = await syncLog(
|
|
client: client,
|
|
deviceId: syncDeviceId,
|
|
pathPrefix: _devicesDir,
|
|
localLog: manualBankToLog(local),
|
|
encode: encodeManualBankForPush,
|
|
decode: parseRemoteManualBank,
|
|
filename: 'food_bank_manual.json',
|
|
commitMessage: 'diet_guard_app sync',
|
|
);
|
|
await FoodBankService.instance.applyMergedManualBank(logToManualBank(merged));
|
|
}
|
|
|
|
/// Pulls other devices' budgets, merges, applies the winner locally, pushes.
|
|
///
|
|
/// Reuses [syncLog] (it always pushes the merged result, even an empty
|
|
/// one -- harmless and consistent with the food-log sync above). This
|
|
/// device contributes nothing to the merge until the goal has been
|
|
/// explicitly set at least once (see
|
|
/// [AppSettingsService.dailyKcalGoalUpdatedAt]), so a fresh install's
|
|
/// unset 2200 default can never spuriously outrank a real budget synced
|
|
/// from elsewhere.
|
|
Future<void> _syncBudget(GitHubClient client) async {
|
|
final updatedAt = AppSettingsService.dailyKcalGoalUpdatedAt;
|
|
final localRecord = updatedAt == null
|
|
? null
|
|
: <String, dynamic>{
|
|
'v': 2,
|
|
'b': AppSettingsService.dailyKcalGoal,
|
|
't': updatedAt.toIso8601String(),
|
|
};
|
|
|
|
final mergedBudgetLog = await syncLog(
|
|
client: client,
|
|
deviceId: syncDeviceId,
|
|
pathPrefix: _devicesDir,
|
|
localLog: budgetToLog(
|
|
localRecord,
|
|
BudgetHistoryService.schedule.entries,
|
|
),
|
|
encode: encodeBudgetForPush,
|
|
decode: parseRemoteBudget,
|
|
filename: 'budget.json',
|
|
commitMessage: 'diet_guard_app sync',
|
|
);
|
|
|
|
// The history merges by field union, so it is applied unconditionally --
|
|
// independently of whether the scalar budget resolved to anything.
|
|
await BudgetHistoryService.instance.applyMerged(
|
|
logToHistory(mergedBudgetLog),
|
|
);
|
|
|
|
final merged = logToBudget(mergedBudgetLog);
|
|
final mergedKcal = merged?['b'];
|
|
if (merged == null || mergedKcal is! int) return;
|
|
await AppSettingsService.instance.applySyncedBudget(
|
|
mergedKcal,
|
|
updatedAt: DateTime.tryParse(merged['t'] as String? ?? ''),
|
|
);
|
|
}
|