- save()/saveAndRunDataListeners() now return @discardableResult Bool; listeners only fire on successful save - MoodLogger.updateMood() now recalculates streak, updates Live Activity, and notifies watch (was missing these side effects) - CSV import uses new addBatch()/importMoods() for O(1) side effects instead of O(n) per-row widget reloads and streak calcs - Foreground task ordering: fillInMissingDates() now runs before removeDuplicates() so backfill-created duplicates are caught same cycle - WidgetMoodSaver deletes ALL entries for date (was fetchLimit=1, leaving CloudKit sync duplicates behind) - cleanupPhotoIfNeeded logs warning on failed photo deletion instead of silently orphaning files Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
101 lines
2.8 KiB
Swift
101 lines
2.8 KiB
Swift
//
|
|
// DataController.swift
|
|
// Feels
|
|
//
|
|
// SwiftData controller replacing Core Data PersistenceController.
|
|
//
|
|
|
|
import SwiftData
|
|
import SwiftUI
|
|
import os.log
|
|
|
|
@MainActor
|
|
final class DataController: ObservableObject {
|
|
private static let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "com.tt.feels", category: "DataController")
|
|
static let shared = DataController()
|
|
|
|
private(set) var container: ModelContainer
|
|
|
|
var modelContext: ModelContext {
|
|
container.mainContext
|
|
}
|
|
|
|
|
|
// Listeners for data changes (keeping existing pattern)
|
|
private var editedDataClosure = [() -> Void]()
|
|
|
|
// Computed properties for earliest/latest entries
|
|
var earliestEntry: MoodEntryModel? {
|
|
var descriptor = FetchDescriptor<MoodEntryModel>(
|
|
sortBy: [SortDescriptor(\.forDate, order: .forward)]
|
|
)
|
|
descriptor.fetchLimit = 1
|
|
return try? modelContext.fetch(descriptor).first
|
|
}
|
|
|
|
var latestEntry: MoodEntryModel? {
|
|
var descriptor = FetchDescriptor<MoodEntryModel>(
|
|
sortBy: [SortDescriptor(\.forDate, order: .reverse)]
|
|
)
|
|
descriptor.fetchLimit = 1
|
|
return try? modelContext.fetch(descriptor).first
|
|
}
|
|
|
|
private init() {
|
|
container = SharedModelContainer.createWithFallback(useCloudKit: true)
|
|
}
|
|
|
|
|
|
// MARK: - Listener Management
|
|
|
|
func addNewDataListener(closure: @escaping (() -> Void)) {
|
|
editedDataClosure.append(closure)
|
|
}
|
|
|
|
@discardableResult
|
|
func saveAndRunDataListeners() -> Bool {
|
|
let success = save()
|
|
if success {
|
|
for closure in editedDataClosure {
|
|
closure()
|
|
}
|
|
}
|
|
return success
|
|
}
|
|
|
|
@discardableResult
|
|
func save() -> Bool {
|
|
guard modelContext.hasChanges else { return true }
|
|
do {
|
|
try modelContext.save()
|
|
return true
|
|
} catch {
|
|
Self.logger.error("Failed to save context, retrying: \(error.localizedDescription)")
|
|
do {
|
|
try modelContext.save()
|
|
return true
|
|
} catch {
|
|
Self.logger.critical("Failed to save context after retry: \(error.localizedDescription)")
|
|
return false
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Refresh data from disk to pick up changes made by extensions (widget/watch).
|
|
/// Call this when app becomes active.
|
|
func refreshFromDisk() {
|
|
// SwiftData doesn't have a direct "refresh from disk" API.
|
|
// We achieve this by:
|
|
// 1. Rolling back any unsaved changes (ensures clean state)
|
|
// 2. Triggering listeners to re-fetch data (which will read from disk)
|
|
modelContext.rollback()
|
|
|
|
// Notify listeners to re-fetch their data
|
|
for closure in editedDataClosure {
|
|
closure()
|
|
}
|
|
|
|
Self.logger.debug("Refreshed data from disk")
|
|
}
|
|
}
|