Add cross-device grocery list sync via Nextcloud Cookbook API
Store a _groceryState JSON field on each recipe to track which ingredients have been added, completed, or removed. Uses per-item last-writer-wins conflict resolution with ISO 8601 timestamps. Debounced push (2s) avoids excessive API calls; pull reconciles on recipe open and app launch. Includes a settings toggle to enable/disable sync. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -14,6 +14,11 @@ class GroceryListManager: ObservableObject {
|
||||
|
||||
let localStore = GroceryList()
|
||||
let remindersStore = RemindersGroceryStore()
|
||||
var syncManager: GroceryStateSyncManager?
|
||||
|
||||
/// Recipe IDs modified by our own CRUD — skip these in the onDataChanged callback
|
||||
/// to avoid duplicate syncs.
|
||||
private var recentlyModifiedByUs: Set<String> = []
|
||||
|
||||
private var mode: GroceryListMode {
|
||||
GroceryListMode(rawValue: UserSettings.shared.groceryListMode) ?? .inApp
|
||||
@@ -23,11 +28,29 @@ class GroceryListManager: ObservableObject {
|
||||
remindersStore.onDataChanged = { [weak self] in
|
||||
guard let self else { return }
|
||||
if self.mode == .appleReminders {
|
||||
let previousDict = self.groceryDict
|
||||
self.groceryDict = self.remindersStore.groceryDict
|
||||
|
||||
// Only sync recipes that changed externally (e.g. checked off in Reminders app),
|
||||
// not ones we just modified ourselves.
|
||||
for recipeId in self.remindersStore.groceryDict.keys {
|
||||
guard !self.recentlyModifiedByUs.contains(recipeId) else { continue }
|
||||
// Detect if item count changed (external add/remove/complete)
|
||||
let oldCount = previousDict[recipeId]?.items.count ?? 0
|
||||
let newCount = self.remindersStore.groceryDict[recipeId]?.items.count ?? 0
|
||||
if oldCount != newCount {
|
||||
self.syncManager?.scheduleSync(forRecipeId: recipeId)
|
||||
}
|
||||
}
|
||||
self.recentlyModifiedByUs.removeAll()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func configureSyncManager(appState: AppState) {
|
||||
syncManager = GroceryStateSyncManager(appState: appState, groceryManager: self)
|
||||
}
|
||||
|
||||
// MARK: - Grocery Operations
|
||||
|
||||
func addItem(_ itemName: String, toRecipe recipeId: String, recipeName: String? = nil) {
|
||||
@@ -36,9 +59,11 @@ class GroceryListManager: ObservableObject {
|
||||
localStore.addItem(itemName, toRecipe: recipeId, recipeName: recipeName)
|
||||
groceryDict = localStore.groceryDict
|
||||
case .appleReminders:
|
||||
recentlyModifiedByUs.insert(recipeId)
|
||||
remindersStore.addItem(itemName, toRecipe: recipeId, recipeName: recipeName)
|
||||
groceryDict = remindersStore.groceryDict
|
||||
}
|
||||
syncManager?.scheduleSync(forRecipeId: recipeId)
|
||||
}
|
||||
|
||||
func addItems(_ items: [String], toRecipe recipeId: String, recipeName: String? = nil) {
|
||||
@@ -47,9 +72,11 @@ class GroceryListManager: ObservableObject {
|
||||
localStore.addItems(items, toRecipe: recipeId, recipeName: recipeName)
|
||||
groceryDict = localStore.groceryDict
|
||||
case .appleReminders:
|
||||
recentlyModifiedByUs.insert(recipeId)
|
||||
remindersStore.addItems(items, toRecipe: recipeId, recipeName: recipeName)
|
||||
groceryDict = remindersStore.groceryDict
|
||||
}
|
||||
syncManager?.scheduleSync(forRecipeId: recipeId)
|
||||
}
|
||||
|
||||
func deleteItem(_ itemName: String, fromRecipe recipeId: String) {
|
||||
@@ -58,9 +85,10 @@ class GroceryListManager: ObservableObject {
|
||||
localStore.deleteItem(itemName, fromRecipe: recipeId)
|
||||
groceryDict = localStore.groceryDict
|
||||
case .appleReminders:
|
||||
recentlyModifiedByUs.insert(recipeId)
|
||||
remindersStore.deleteItem(itemName, fromRecipe: recipeId)
|
||||
// Cache update happens async in RemindersGroceryStore via onDataChanged
|
||||
}
|
||||
syncManager?.scheduleSync(forRecipeId: recipeId)
|
||||
}
|
||||
|
||||
func deleteGroceryRecipe(_ recipeId: String) {
|
||||
@@ -69,18 +97,25 @@ class GroceryListManager: ObservableObject {
|
||||
localStore.deleteGroceryRecipe(recipeId)
|
||||
groceryDict = localStore.groceryDict
|
||||
case .appleReminders:
|
||||
recentlyModifiedByUs.insert(recipeId)
|
||||
remindersStore.deleteGroceryRecipe(recipeId)
|
||||
}
|
||||
syncManager?.scheduleSync(forRecipeId: recipeId)
|
||||
}
|
||||
|
||||
func deleteAll() {
|
||||
let recipeIds = Array(groceryDict.keys)
|
||||
switch mode {
|
||||
case .inApp:
|
||||
localStore.deleteAll()
|
||||
groceryDict = localStore.groceryDict
|
||||
case .appleReminders:
|
||||
recentlyModifiedByUs.formUnion(recipeIds)
|
||||
remindersStore.deleteAll()
|
||||
}
|
||||
for recipeId in recipeIds {
|
||||
syncManager?.scheduleSync(forRecipeId: recipeId)
|
||||
}
|
||||
}
|
||||
|
||||
func toggleItemChecked(_ groceryItem: GroceryRecipeItem) {
|
||||
|
||||
Reference in New Issue
Block a user