Browse Source

increased to 10 upload concurrent

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 years ago
parent
commit
88cc67386f

+ 2 - 2
Nextcloud.xcodeproj/project.pbxproj

@@ -3403,7 +3403,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -3465,7 +3465,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 10;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;

+ 4 - 0
iOSClient/NCGlobal.swift

@@ -322,6 +322,10 @@ class NCGlobal: NSObject {
     let metadataStatusUploading: Int                = 3
     let metadataStatusUploadError: Int              = 4
 
+    // Upload Operation Background
+    //
+    let maxConcurrentOperationUpload                = 10
+
     // Notification Center
     //
     @objc let notificationCenterApplicationDidEnterBackground   = "applicationDidEnterBackground"

+ 1 - 4
iOSClient/Networking/NCAutoUpload.swift

@@ -191,7 +191,6 @@ class NCAutoUpload: NSObject {
 
         var metadatasForUpload: [tableMetadata] = []
         var numStartUpload: Int = 0
-        let maxConcurrentOperationUpload = 5
 
         for metadata in metadatas {
             if NCManageDatabase.shared.getMetadata(predicate: NSPredicate(format: "account == %@ && serverUrl == %@ && fileName == %@ && session != ''", metadata.account, metadata.serverUrl, metadata.fileName)) != nil {
@@ -201,10 +200,8 @@ class NCAutoUpload: NSObject {
         }
         NCManageDatabase.shared.addMetadatas(metadatasForUpload)
 
-        // Max file in Uploadading
-
         let metadatasInUpload = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "status == %d OR status == %d", NCGlobal.shared.metadataStatusInUpload, NCGlobal.shared.metadataStatusUploading))
-        let counterUpload = maxConcurrentOperationUpload - metadatasInUpload.count
+        let counterUpload = NCGlobal.shared.maxConcurrentOperationUpload - metadatasInUpload.count
         if counterUpload <= 0 {
             return completion(0)
         }

+ 4 - 6
iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -30,8 +30,6 @@ class NCNetworkingProcessUpload: NSObject {
 
     var timerProcess: Timer?
 
-    let maxConcurrentOperationUpload = 5
-
     override init() {
         super.init()
         startTimer()
@@ -73,9 +71,9 @@ class NCNetworkingProcessUpload: NSObject {
         NCNetworking.shared.getOcIdInBackgroundSession(queue: DispatchQueue.global(), completion: { listOcId in
 
             for sessionSelector in sessionSelectors {
-                if counterUpload < self.maxConcurrentOperationUpload {
+                if counterUpload < NCGlobal.shared.maxConcurrentOperationUpload {
 
-                    let limit = self.maxConcurrentOperationUpload - counterUpload
+                    let limit = NCGlobal.shared.maxConcurrentOperationUpload - counterUpload
                     let metadatas = NCManageDatabase.shared.getAdvancedMetadatas(predicate: NSPredicate(format: "sessionSelector == %@ AND status == %d", sessionSelector, NCGlobal.shared.metadataStatusWaitUpload), page: 1, limit: limit, sorted: "date", ascending: true)
                     if metadatas.count > 0 {
                         NKCommon.shared.writeLog("PROCESS-UPLOAD find \(metadatas.count) items")
@@ -103,7 +101,7 @@ class NCNetworkingProcessUpload: NSObject {
                         // Is already in upload E2EE / CHUNK ? exit [ ONLY ONE IN QUEUE ]
                         for metadata in metadatasUpload {
                             if metadata.chunk || metadata.e2eEncrypted {
-                                counterUpload = self.maxConcurrentOperationUpload
+                                counterUpload = NCGlobal.shared.maxConcurrentOperationUpload
                                 continue
                             }
                         }
@@ -125,7 +123,7 @@ class NCNetworkingProcessUpload: NSObject {
                                     NCNetworking.shared.upload(metadata: metadata)
                                 }
                                 if metadata.e2eEncrypted || metadata.chunk {
-                                    counterUpload = self.maxConcurrentOperationUpload
+                                    counterUpload = NCGlobal.shared.maxConcurrentOperationUpload
                                 } else {
                                     counterUpload += 1
                                 }