Improved upload

Brand/Database.swift

@@ -8,5 +8,4 @@ import Foundation
 //
 let databaseName                    = "nextcloud.realm"
 let tableAccountBackup              = "tableAccountBackup.json"
-let fileMetadataStore               = "metadata.json"
-let databaseSchemaVersion: UInt64   = 403
+let databaseSchemaVersion: UInt64   = 404

Brand/NCBrand.swift

@@ -76,7 +76,7 @@ final class NCBrandOptions: @unchecked Sendable {
     let httpMaximumConnectionsPerHostInUpload: Int = 8
 
     // Max request/download/upload process
-    let numMaximumProcess: Int = 50
+    let numMaximumProcess: Int = 20
 
     // Number of failed attempts after reset app
     let resetAppPasscodeAttempts: Int = 10

File Provider Extension/FileProviderData.swift

@@ -224,7 +224,6 @@ class FileProviderData: NSObject {
             metadata.sessionSelector = ""
             metadata.sessionDate = nil
             metadata.sessionTaskIdentifier = 0
-            metadata.progress = 0
             metadata.status = NCGlobal.shared.metadataStatusNormal
 
             await self.database.addMetadataAsync(metadata)

Share/NCShareExtension.swift

@@ -411,22 +411,7 @@ extension NCShareExtension {
         if metadata.isDirectoryE2EE {
             error = await NCNetworkingE2EEUpload().upload(metadata: metadata, session: session, controller: self)
         } else if metadata.chunk > 0 {
-            var numChunks = 0
-            var counterUpload: Int = 0
-            hud.pieProgress(text: NSLocalizedString("_wait_file_preparation_", comment: ""))
-
-            let results = await NCNetworking.shared.uploadChunkFile(metadata: metadata) { num in
-                numChunks = num
-            } counterChunk: { counter in
-                self.hud.progress(num: Float(counter), total: Float(numChunks))
-            } startFilesChunk: { _ in
-                self.hud.setText(NSLocalizedString("_keep_active_for_upload_", comment: ""))
-            } requestHandler: { _ in
-                self.hud.progress(num: Float(counterUpload), total: Float(numChunks))
-                counterUpload += 1
-            } assembling: {
-                self.hud.setText(NSLocalizedString("_wait_", comment: ""))
-            }
+            let results = await NCNetworking.shared.uploadChunk(metadata: metadata, hud: hud)
             error = results.error
         } else {
             let fileNameLocalPath = utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId,

iOSClient/AppDelegate.swift

@@ -315,30 +315,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
     func application(_ application: UIApplication, handleEventsForBackgroundURLSession identifier: String, completionHandler: @escaping () -> Void) {
         nkLog(debug: "Handle events For background URLSession: \(identifier)")
-        backgroundSessionCompletionHandler = completionHandler
 
-        // Starts a temporary background task to ensure that a potential flush
-        // of the MetadataStore JSON can complete even if the app is resumed
-        // briefly for background URLSession events.
-        //
-        // The flush runs only if the cache exceeds ~1 MB (~2000 item), preventing oversized
-        // in-memory data from persisting too long. The task is safely ended
-        // either in its expiration handler or after the operation completes.
-        bgTask = UIApplication.shared.beginBackgroundTask(withName: "MetadataStore.flush") {
-            UIApplication.shared.endBackgroundTask(self.bgTask)
-            self.bgTask = .invalid
+        if NCManageDatabase.shared.openRealmBackground() {
+            WidgetCenter.shared.reloadAllTimelines()
         }
 
-        Task.detached(priority: .background) {
-            let cacheIsHuge = await NCMetadataStore.shared.cacheIsHuge(thresholdBytes: 1 * 1024 * 1024)
-            let count = await NCMetadataStore.shared.cacheCount()
-            if cacheIsHuge {
-                nkLog(tag: NCGlobal.shared.logTagTransferStore, emoji: .start, message: "Forced Sync Realm triggered — \(count) items (~1 MB threshold reached)")
-                await NCMetadataStore.shared.forcedSyncRealm()
-            } else {
-                nkLog(tag: NCGlobal.shared.logTagTransferStore, emoji: .info, message: "No forced Sync Realm required — \(count) items in cache")
-            }
-        }
+        backgroundSessionCompletionHandler = completionHandler
     }
 
     // MARK: - Push Notifications
@@ -397,7 +379,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 Task {
                     await NCNetworking.shared.transferDispatcher.notifyAllDelegatesAsync { delegate in
                         try? await Task.sleep(nanoseconds: 500_000_000)
-                        delegate.transferRequestData(serverUrl: nil)
+                        delegate.transferReloadData(serverUrl: nil, requestData: true, status: nil)
                     }
                 }
             } else if let navigationController = UIStoryboard(name: "NCNotification", bundle: nil).instantiateInitialViewController() as? UINavigationController,

iOSClient/Data/NCManageDatabase+AutoUpload.swift

@@ -46,6 +46,16 @@ extension NCManageDatabase {
         }
     }
 
+    func addAutoUploadTransferAsync(_ items: [tableAutoUploadTransfer]) async {
+        guard !items.isEmpty else {
+            return
+        }
+
+        await performRealmWriteAsync { realm in
+            realm.add(items, update: .all)
+        }
+    }
+
     func deleteAutoUploadTransferAsync(account: String,
                                        autoUploadServerUrlBase: String) async {
         await performRealmWriteAsync { realm in

iOSClient/Data/NCManageDatabase+LivePhoto.swift

@@ -30,36 +30,37 @@ extension NCManageDatabase {
 
     // MARK: - Realm Write
 
-    func setLivePhotoImage(account: String, serverUrlFileName: String, fileId: String) async {
-        let serverUrlFileNameNoExt = (serverUrlFileName as NSString).deletingPathExtension
-        let primaryKey = account + serverUrlFileNameNoExt
-
-        await performRealmWriteAsync { realm in
-            if let result = realm.object(ofType: tableLivePhoto.self, forPrimaryKey: primaryKey) {
-                result.serverUrlFileNameImage = serverUrlFileName
-                result.fileIdImage = fileId
-            } else {
-                let addObject = tableLivePhoto(account: account, serverUrlFileNameNoExt: serverUrlFileNameNoExt)
-                addObject.serverUrlFileNameImage = serverUrlFileName
-                addObject.fileIdImage = fileId
-                realm.add(addObject, update: .all)
-            }
+    func setLivePhotoVideo(metadatas: [tableMetadata]) async {
+        guard !metadatas.isEmpty else {
+            return
         }
-    }
-
-    func setLivePhotoVideo(account: String, serverUrlFileName: String, fileId: String) async {
-        let serverUrlFileNameNoExt = (serverUrlFileName as NSString).deletingPathExtension
-        let primaryKey = account + serverUrlFileNameNoExt
 
         await performRealmWriteAsync { realm in
-            if let result = realm.object(ofType: tableLivePhoto.self, forPrimaryKey: primaryKey) {
-                result.serverUrlFileNameVideo = serverUrlFileName
-                result.fileIdVideo = fileId
-            } else {
-                let addObject = tableLivePhoto(account: account, serverUrlFileNameNoExt: serverUrlFileNameNoExt)
-                addObject.serverUrlFileNameVideo = serverUrlFileName
-                addObject.fileIdVideo = fileId
-                realm.add(addObject, update: .all)
+            for metadata in metadatas {
+                let serverUrlFileNameNoExt = (metadata.serverUrlFileName as NSString).deletingPathExtension
+                let primaryKey = metadata.account + serverUrlFileNameNoExt
+                if let result = realm.object(ofType: tableLivePhoto.self, forPrimaryKey: primaryKey) {
+                    if metadata.isVideo {
+                        // Update existing (only the provided fields)
+                        result.serverUrlFileNameVideo = metadata.serverUrlFileName
+                        result.fileIdVideo = metadata.fileId
+                    } else if metadata.isImage {
+                        result.serverUrlFileNameImage = metadata.serverUrlFileName
+                        result.fileIdImage = metadata.fileId
+                    }
+                } else {
+                    // Insert new — ensure the initializer sets the same PK used above
+                    let addObject = tableLivePhoto(account: metadata.account, serverUrlFileNameNoExt: serverUrlFileNameNoExt)
+                    if metadata.isVideo {
+                        addObject.serverUrlFileNameVideo = metadata.serverUrlFileName
+                        addObject.fileIdVideo = metadata.fileId
+                        realm.add(addObject, update: .modified)
+                    } else if metadata.isImage {
+                        addObject.serverUrlFileNameImage = metadata.serverUrlFileName
+                        addObject.fileIdImage = metadata.fileId
+                        realm.add(addObject, update: .modified)
+                    }
+                }
             }
         }
     }

iOSClient/Data/NCManageDatabase+Metadata+Session.swift

@@ -35,8 +35,7 @@ extension NCManageDatabase {
                                  selector: String? = nil,
                                  status: Int? = nil,
                                  etag: String? = nil,
-                                 errorCode: Int? = nil,
-                                 progress: Double? = nil) async -> tableMetadata? {
+                                 errorCode: Int? = nil) async -> tableMetadata? {
         var query: NSPredicate = NSPredicate()
         if let ocId {
             query = NSPredicate(format: "ocId == %@", ocId)
@@ -96,10 +95,6 @@ extension NCManageDatabase {
             if let errorCode {
                 metadata.errorCode = errorCode
             }
-
-            if let progress {
-                metadata.progress = progress
-            }
         }
 
         return await performRealmReadAsync { realm in
@@ -110,34 +105,6 @@ extension NCManageDatabase {
         }
     }
 
-    func setMetadataProgress(fileName: String,
-                             serverUrl: String,
-                             taskIdentifier: Int,
-                             progress: Double) async {
-        await performRealmWriteAsync { realm in
-            guard let metadata = realm.objects(tableMetadata.self)
-                .filter("fileName == %@ AND serverUrl == %@ and sessionTaskIdentifier == %d", fileName, serverUrl, taskIdentifier)
-                .first else {
-                return
-            }
-            metadata.progress = progress
-            print(progress)
-        }
-    }
-
-    func setMetadataProgress(ocId: String,
-                             progress: Double) async {
-        await performRealmWriteAsync { realm in
-            guard let metadata = realm.objects(tableMetadata.self)
-                .filter("ocId == %@", ocId)
-                .first else {
-                return
-            }
-            metadata.progress = progress
-            print(progress)
-        }
-    }
-
     /// Asynchronously sets a metadata record into "wait download" state.
     /// - Parameters:
     ///   - ocId: The object ID of the metadata.
@@ -164,7 +131,6 @@ extension NCManageDatabase {
             metadata.sessionSelector = selector
             metadata.status = NCGlobal.shared.metadataStatusWaitDownload
             metadata.sessionDate = Date()
-            metadata.progress = 0
         }
 
         return await performRealmReadAsync { realm in
@@ -194,7 +160,6 @@ extension NCManageDatabase {
             metadata.sessionSelector = ""
             metadata.sessionDate = nil
             metadata.status = NCGlobal.shared.metadataStatusNormal
-            metadata.progress = 0
             return metadata
         }