cleaning (#3874)

Signed-off-by: Marino Faggiana <marino.faggiana@nextcloud.com>

Author: marinofaggiana

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -366,9 +366,6 @@ extension NCManageDatabase {
     }
 
     func getMetadataProcess() async -> [tableMetadata] {
-        let existingFileNames = await NCNetworking.shared.metadataTranfersSuccess.getServerUrlFileNames()
-        let excludedSet = Set(existingFileNames)  // O(1) membership check
-
         return await core.performRealmReadAsync { realm in
             let predicate = NSPredicate(format: "status != %d", NCGlobal.shared.metadataStatusNormal)
             let sortDescriptors = [
@@ -381,12 +378,7 @@ extension NCManageDatabase {
                 .filter(predicate)
                 .sorted(by: sortDescriptors)
 
-            // Filter out all metadata whose serverUrlFileName is in excludedSet
-            let filtered = results.filter { metadata in
-                return !excludedSet.contains(metadata.serverUrlFileName)
-            }
-
-            let sliced = filtered.prefix(limit)
+            let sliced = results.prefix(limit)
             return sliced.map { $0.detachedCopy() }
         } ?? []
     }
@@ -484,6 +476,14 @@ extension NCManageDatabase {
         }
     }
 
+    func deleteMetadataAsync(ocId: String) async {
+        await core.performRealmWriteAsync { realm in
+            if let object = realm.object(ofType: tableMetadata.self, forPrimaryKey: ocId) {
+                realm.delete(object)
+            }
+        }
+    }
+
     func replaceMetadataAsync(ocId: String, metadata: tableMetadata) async {
         let detached = metadata.detachedCopy()
 

iOSClient/Data/NCMetadataTranfersSuccess.swift

@@ -39,21 +39,12 @@ actor NCMetadataTranfersSuccess {
         tranfersSuccess
     }
 
-    func getMetadata(ocIdTransfer: String) async -> tableMetadata? {
-        return tranfersSuccess.filter({ $0.ocIdTransfer == ocIdTransfer }).first
-    }
-
-    func getServerUrlFileNames() async -> [String] {
-        return tranfersSuccess.map { $0.serverUrlFileName }
-    }
-
     func exists(serverUrlFileName: String) async -> Bool {
         return tranfersSuccess.filter({ $0.serverUrlFileName == serverUrlFileName }).first != nil
     }
 
     func flush() async {
-        let isInBackground = NCNetworking.shared.isInBackground()
-        let snapshot: [tableMetadata] = tranfersSuccess
+        let metadatas: [tableMetadata] = tranfersSuccess
         tranfersSuccess.removeAll(keepingCapacity: true)
 
         NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterMetadataTranfersSuccessFlush)
@@ -62,7 +53,7 @@ actor NCMetadataTranfersSuccess {
         var metadatasLivePhoto: [tableMetadata] = []
         var autoUploads: [tableAutoUploadTransfer] = []
 
-        for metadata in snapshot {
+        for metadata in metadatas {
             let results = await NCNetworking.shared.helperMetadataSuccess(metadata: metadata)
             if let localFile = results.localFile {
                 metadatasLocalFiles.append(localFile)
@@ -75,8 +66,7 @@ actor NCMetadataTranfersSuccess {
             }
         }
 
-        let ocIds = snapshot.map(\.ocIdTransfer)
-        await NCManageDatabase.shared.replaceMetadatasAsync(ocId: ocIds, metadatas: snapshot)
+        await NCManageDatabase.shared.addMetadatasAsync(metadatas)
 
         // Local File
         await NCManageDatabase.shared.addLocalFilesAsync(metadatas: metadatasLocalFiles)
@@ -87,23 +77,20 @@ actor NCMetadataTranfersSuccess {
         // Create Live Photo metadatas
         await NCManageDatabase.shared.setLivePhotoVideo(metadatas: metadatasLivePhoto)
 
-        // Set livePhoto on Server
-#if !EXTENSION
-        if !isInBackground {
+        if !NCNetworking.shared.isInBackground() {
+
+            // Set livePhoto on Server
             let accounts = Set(metadatasLivePhoto.map { $0.account })
             for account in accounts {
                 await NCNetworking.shared.setLivePhoto(account: account)
                 if isAppInBackground {
                     return
                 }
             }
-        }
-#endif
 
-        // TransferDispatcher — notify outside of shared-state mutation
-        if !isInBackground {
+            // TransferDispatcher — notify outside of shared-state mutation
             await NCNetworking.shared.transferDispatcher.notifyAllDelegates { delegate in
-                for metadata in snapshot {
+                for metadata in metadatas {
                     delegate.transferChange(status: NCGlobal.shared.networkingStatusUploaded,
                                             account: metadata.account,
                                             serverUrl: metadata.serverUrl,
@@ -115,6 +102,6 @@ actor NCMetadataTranfersSuccess {
             }
         }
 
-        nkLog(tag: NCGlobal.shared.logTagMetadataTransfers, message: "Flush successful (\(snapshot.count))", consoleOnly: true)
+        nkLog(tag: NCGlobal.shared.logTagMetadataTransfers, message: "Flush successful (\(metadatas.count))", consoleOnly: true)
     }
 }

iOSClient/Networking/NCNetworking+NextcloudKitDelegate.swift

@@ -145,7 +145,7 @@ extension NCNetworking {
                                             date: date)
                     } else {
 #if !EXTENSION
-                        await NCManageDatabase.shared.clearMetadatasSessionAsync(ocId: metadata.ocId)
+                        await NCManageDatabase.shared.deleteMetadataAsync(ocId: metadata.ocId)
                         await NCNetworking.shared.metadataTranfersSuccess.append(metadata: metadata,
                                                                                  ocId: ocId,
                                                                                  date: date,

iOSClient/Networking/NCNetworking+Task.swift

@@ -286,9 +286,8 @@ extension NCNetworking {
     func verifyZombie() async {
         // UPLOADING-FOREGROUND
         //
-        if let metadatas = await NCManageDatabase.shared.getMetadatasAsync(predicate: NSPredicate(format: "session == %@ AND status == %d",
-                                                                                                  sessionUpload,
-                                                                                                  self.global.metadataStatusUploading)) {
+        if let metadatas = await NCManageDatabase.shared.getMetadatasAsync(
+            predicate: NSPredicate(format: "session == %@ AND status == %d", sessionUpload, self.global.metadataStatusUploading)) {
             for metadata in metadatas {
                 guard let nkSession = NextcloudKit.shared.nkCommonInstance.nksessions.session(forAccount: metadata.account) else {
                     await NCManageDatabase.shared.deleteMetadataAsync(id: metadata.ocId)
@@ -297,7 +296,7 @@ extension NCNetworking {
                 }
 
                 // Verify in Metadata Transfer Success
-                guard await metadataTranfersSuccess.getMetadata(ocIdTransfer: metadata.ocIdTransfer) == nil else {
+                guard await !metadataTranfersSuccess.exists(serverUrlFileName: metadata.serverUrlFileName) else {
                     continue
                 }