rune/oai-swift
1
0
Fork 0
Code Issues Pull Requests Releases 12 Activity

2.4.2 #8

Merged
rune merged 14 commits from 2.4.2 into main 2026-07-22 15:26:48 +02:00
Conversation 0 Commits 14 Files Changed 13
+10 -1
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5db1b40552 - Show all commits
oAI/Services/BackupService.swift
+10 -1
View File
@@ -220,14 +220,23 @@ final class BackupService {
} }
let localUpdatedAt = settings.favoriteModelsUpdatedAt let localUpdatedAt = settings.favoriteModelsUpdatedAt
let localIds = settings.favoriteModelIds
if remote.updatedAt > localUpdatedAt { if remote.updatedAt > localUpdatedAt {
settings.favoriteModelIds = Set(remote.ids) settings.favoriteModelIds = Set(remote.ids)
settings.favoriteModelsUpdatedAt = remote.updatedAt settings.favoriteModelsUpdatedAt = remote.updatedAt
log.info("Applied \(remote.ids.count) favorite model(s) from iCloud (remote was newer)") log.info("Applied \(remote.ids.count) favorite model(s) from iCloud (remote was newer)")
} else if localUpdatedAt > remote.updatedAt { } else if localUpdatedAt > remote.updatedAt {
await pushFavorites() await pushFavorites()
} else if Set(remote.ids) != localIds {
// Tied timestamps (both empty is the common case: two machines that already had
// favorites before this sync feature existed, neither ever bumped the timestamp).
// Union rather than silently dropping one side's favorites.
settings.favoriteModelIds = localIds.union(remote.ids)
settings.favoriteModelsUpdatedAt = ISO8601DateFormatter().string(from: Date())
await pushFavorites()
log.info("Merged favorites from iCloud (tied timestamps) — union of \(localIds.count) local + \(remote.ids.count) remote")
} }
// Equal timestamps: already in sync, nothing to do. // Equal timestamps and identical sets: already in sync, nothing to do.
} }
// MARK: - Automatic Backup // MARK: - Automatic Backup