cloud sync initial sync tvos logic fixes

Signed-off-by: Joseph Mattiello <git@joemattiello.com>

Author: JoeMatt

PVLibrary/Sources/PVLibrary/Cloud Sync/iCloud/CloudKit/CloudKitInitialSyncer.swift

@@ -13,6 +13,8 @@ import PVRealm
 import RealmSwift
 import Combine
 import PVFileSystem
+import PVSettings
+import Defaults
 import RxSwift
 import RxCocoa
 
@@ -216,6 +218,13 @@ public actor CloudKitInitialSyncer {
             return 0
         }
 
+        // metadataOnly: this device is a download-only consumer (e.g. tvOS).
+        // Skip the initial upload sync — all local files came from CloudKit.
+        if !forceSync && Defaults[.cloudKitSyncContentType] == .metadataOnly {
+            ILOG("⏭️ [performInitialSync] Skipping — metadataOnly mode (download-only device)")
+            return 0
+        }
+
         // Check if sync is needed (unless forced)
         if !forceSync {
             DLOG("🔍 [performInitialSync] Checking if initial sync is needed...")
@@ -879,6 +888,13 @@ public actor CloudKitInitialSyncer {
     /// - Parameter forceSync: If true, upload all files regardless of existing records
     /// - Returns: Dictionary mapping directory names to sync counts
     private func syncAllNonDatabaseFiles(forceSync: Bool = false) async -> [String: Int] {
+        // metadataOnly: skip uploading non-database files (battery saves, screenshots, skins).
+        // On tvOS fresh install these files came from CloudKit — re-uploading wastes bandwidth.
+        if !forceSync && Defaults[.cloudKitSyncContentType] == .metadataOnly {
+            DLOG("Skipping non-database file upload — metadataOnly mode")
+            return [:]
+        }
+
         DLOG("Syncing all non-database files to CloudKit...")
 
         do {

PVLibrary/Sources/PVLibrary/Cloud Sync/iCloud/CloudKit/CloudKitSaveStatesSyncer.swift

@@ -9,6 +9,8 @@ import CloudKit
 import os
 import RxSwift
 import RealmSwift
+import PVSettings
+import Defaults
 
 /// Save states syncer for all OS's using CloudKit
 public class CloudKitSaveStatesSyncer: CloudKitSyncer, SaveStatesSyncing {
@@ -949,6 +951,19 @@ public class CloudKitSaveStatesSyncer: CloudKitSyncer, SaveStatesSyncing {
 
             Task {
                 defer { self.isLoadAllInFlight.withLock { $0 = false } }
+
+                // metadataOnly: use the lightweight metadata sync instead of full
+                // conflict resolution, artwork caching, and filesystem probes.
+                if Defaults[.cloudKitSyncContentType] == .metadataOnly {
+                    let syncLog = CloudSyncManager.syncLog
+                    syncLog.event(.start, item: "save/loadAll", status: .skipped, detail: "metadataOnly — using lightweight sync")
+                    let count = await self.syncMetadataOnly()
+                    syncLog.event(.complete, item: "save/loadAll", status: .ok, detail: "metadataOnly processed \(count) records")
+                    await iterationComplete?()
+                    observer(.completed)
+                    return
+                }
+
                 do {
                     let syncLog = CloudSyncManager.syncLog
                     CloudSyncManager.syncLog.event(.start, item: "save/loadAll", status: .inProgress)
@@ -1138,16 +1153,24 @@ public class CloudKitSaveStatesSyncer: CloudKitSyncer, SaveStatesSyncing {
 
             var targetSaveState: PVSaveState?
             var needsRomDownload = false
+            let isMetadataOnly = Defaults[.cloudKitSyncContentType] == .metadataOnly
 
             // Step 2: Handle existing or create new (async work)
             if let existingSaveState = existingSaveState {
-                syncLog.event(.sync, item: "save/\(existingSaveState.id)", status: .inProgress, detail: "handling existing")
-                await self.refreshLocalDownloadState(for: existingSaveState)
-                await self.handleSaveStateConflict(existingSaveState, cloudRecord: record, preferredCoreID: coreHint.coreID, preferredCoreVersion: coreHint.coreVersion)
-                targetSaveState = existingSaveState
-                // If the game isn't downloaded locally, flag for ROM download
-                if existingSaveState.game?.isDownloaded == false {
-                    needsRomDownload = true
+                if isMetadataOnly {
+                    // metadataOnly: skip conflict resolution and filesystem probes,
+                    // just ensure cloudRecordID is linked.
+                    syncLog.event(.sync, item: "save/\(existingSaveState.id)", status: .ok, detail: "metadataOnly — skipping conflict resolution")
+                    targetSaveState = existingSaveState
+                } else {
+                    syncLog.event(.sync, item: "save/\(existingSaveState.id)", status: .inProgress, detail: "handling existing")
+                    await self.refreshLocalDownloadState(for: existingSaveState)
+                    await self.handleSaveStateConflict(existingSaveState, cloudRecord: record, preferredCoreID: coreHint.coreID, preferredCoreVersion: coreHint.coreVersion)
+                    targetSaveState = existingSaveState
+                    // If the game isn't downloaded locally, flag for ROM download
+                    if existingSaveState.game?.isDownloaded == false {
+                        needsRomDownload = true
+                    }
                 }
 
                 // Ensure cloudRecordID is set if it wasn't before
@@ -1167,10 +1190,14 @@ public class CloudKitSaveStatesSyncer: CloudKitSyncer, SaveStatesSyncing {
                 }
             } else if let newSaveState = await self.createSaveStateFromCloudRecord(record, game: frozenGame, originalID: originalSaveStateID, preferredCoreID: coreHint.coreID, preferredCoreVersion: coreHint.coreVersion) {
                 syncLog.event(.download, item: "save/\(newSaveState.id)", status: .ok, detail: "created new save state")
-                await self.markSaveStateForDownload(newSaveState, cloudRecord: record)
+                if !isMetadataOnly {
+                    await self.markSaveStateForDownload(newSaveState, cloudRecord: record)
+                }
                 targetSaveState = newSaveState
                 // New save states from cloud need the ROM downloaded
-                needsRomDownload = true
+                if !isMetadataOnly {
+                    needsRomDownload = true
+                }
             }
             else if frozenGame == nil {
                 // Defer processing until ROM metadata lands to avoid losing this record on fresh installs.
@@ -1184,7 +1211,9 @@ public class CloudKitSaveStatesSyncer: CloudKitSyncer, SaveStatesSyncing {
                                         to: targetSaveState,
                                         preferredCoreID: coreHint.coreID,
                                         preferredCoreVersion: coreHint.coreVersion)
-                if record[CloudKitSchema.SaveStateFields.imageAsset] as? CKAsset != nil {
+                // Skip artwork caching in metadataOnly mode — avoid I/O on every boot
+                if !isMetadataOnly,
+                   record[CloudKitSchema.SaveStateFields.imageAsset] as? CKAsset != nil {
                     await cacheSaveStateArtworkAsset(from: record, for: targetSaveState)
                 }
 

PVLibrary/Sources/PVLibrary/Cloud Sync/iCloud/CloudSyncManager.swift

@@ -530,32 +530,37 @@ public class CloudSyncManager {
             await self?.checkForMissingROMFiles(force: false)
         }
 
-        // Proceed with initial sync (uploads) in parallel
-        updateSyncStatus(.initialSync)
+        // Enqueue initial sync (uploads) AFTER remote fetch completes.
+        // On a fresh install all local data came from CloudKit, so once
+        // fetchRemoteChanges finishes every Realm object already has a
+        // cloudRecordID and isInitialSyncNeeded() returns false — avoiding
+        // thousands of redundant per-file CloudKit queries.
+        enqueueMetadataWork { [weak self] in
+            guard let self else { return }
+            self.updateSyncStatus(.initialSync)
 
-        var hasErrors = false
-        var lastError: Error?
+            var hasErrors = false
+            var lastError: Error?
 
-        // Perform initial sync (this checks if needed internally unless forced)
-        do {
-            let syncCount = await CloudKitInitialSyncer.shared?.performInitialSync(forceSync: false)
-            DLOG("CloudKit initial sync completed - potentially uploaded \(syncCount) new records.")
-        } catch {
-            syncLog.event(.sync, item: "sync/initial", status: .failed, detail: error.localizedDescription)
-            hasErrors = true
-            lastError = error
-            await errorHandler.handle(error: error)
-        }
+            do {
+                let syncCount = await CloudKitInitialSyncer.shared?.performInitialSync(forceSync: false)
+                DLOG("CloudKit initial sync completed - potentially uploaded \(syncCount ?? 0) new records.")
+            } catch {
+                CloudSyncManager.syncLog.event(.sync, item: "sync/initial", status: .failed, detail: error.localizedDescription)
+                hasErrors = true
+                lastError = error
+                await self.errorHandler.handle(error: error)
+            }
 
-        // Update status based on results (do not cancel ongoing remote fetch)
-        if hasErrors {
-            syncLog.event(.sync, item: "sync/cloudkit", status: .failed, detail: "Sync completed with errors")
-            if let error = lastError {
-                updateSyncStatus(.error(CloudSyncError.cloudKitError(error)))
+            if hasErrors {
+                CloudSyncManager.syncLog.event(.sync, item: "sync/cloudkit", status: .failed, detail: "Sync completed with errors")
+                if let error = lastError {
+                    self.updateSyncStatus(.error(CloudSyncError.cloudKitError(error)))
+                }
+            } else {
+                self.updateSyncStatus(.idle)
+                DLOG("Initial sync phase completed successfully.")
             }
-        } else if syncStatus != .error(CloudSyncError.cloudKitError(lastError ?? CloudSyncError.unknown)) {
-            updateSyncStatus(.idle)
-            DLOG("Initial sync phase completed successfully (remote fetch may still be in progress).")
         }
     }