Browse Source

reorg upload

marinofaggiana 4 years ago
parent
commit
275bc4ddd5

+ 2 - 4
iOSClient/Main/Create cloud/NCCreateFormUploadAssets.swift

@@ -461,10 +461,8 @@ class NCCreateFormUploadAssets: XLFormViewController, NCSelectDelegate {
                 
             } else {
                 
-                NCManageDatabase.shared.addMetadatas(metadatasNOConflict)
-                NCManageDatabase.shared.addMetadatas(metadatasMOV)
-                
-                self.appDelegate.networkingProcessUpload?.startProcess()
+                self.appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: metadatasNOConflict)
+                self.appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: metadatasMOV)                
             }
         
             DispatchQueue.main.async {self.dismiss(animated: true, completion: nil)  }

+ 1 - 3
iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -227,9 +227,7 @@ extension NCCreateFormUploadConflictDelegate {
             
         } else {
             
-            NCManageDatabase.shared.addMetadatas(metadatasNOConflict)
-            
-            appDelegate.networkingProcessUpload?.startProcess()
+            appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: metadatasNOConflict)
         }
                 
         dismiss(animated: true)

+ 2 - 4
iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -576,10 +576,8 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
         
         NCUtility.shared.stopActivityIndicator()
 
-        NCManageDatabase.shared.addMetadata(metadata)
-        
-        appDelegate.networkingProcessUpload?.startProcess()
-                        
+        appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: [metadata])
+
         // Request delete all image scanned
         let alertController = UIAlertController(title: "", message: NSLocalizedString("_delete_all_scanned_images_", comment: ""), preferredStyle: .alert)
         

+ 2 - 4
iOSClient/Main/Create cloud/NCCreateFormUploadVoiceNote.swift

@@ -257,10 +257,8 @@ class NCCreateFormUploadVoiceNote: XLFormViewController, NCSelectDelegate, AVAud
         
         CCUtility.copyFile(atPath: self.fileNamePath, toPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView))
                    
-        NCManageDatabase.shared.addMetadata(metadata)
-                
-        appDelegate.networkingProcessUpload?.startProcess()
-        
+        appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: [metadata])
+
         self.dismiss(animated: true, completion: nil)
     }
     

+ 1 - 1
iOSClient/Main/NCFunctionCenter.swift

@@ -372,7 +372,7 @@ import NCCommunication
             metadataForUpload.size = NCUtilityFileSystem.shared.getFileSize(filePath: filePath)
             metadataForUpload.status = NCGlobal.shared.metadataStatusWaitUpload
             
-            NCManageDatabase.shared.addMetadata(metadataForUpload)
+            appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: [metadataForUpload])
             
         } catch { }
     }

+ 1 - 2
iOSClient/Main/NCPickerViewController.swift

@@ -173,8 +173,7 @@ class NCDocumentPickerViewController: NSObject, UIDocumentPickerDelegate {
                         
                         } else {
                             
-                            NCManageDatabase.shared.addMetadata(metadataForUpload)
-                            appDelegate.networkingProcessUpload?.startProcess()
+                            appDelegate.networkingProcessUpload?.createProcessUploads(metadatas: [metadataForUpload])
                         }
                         
                     } catch {

+ 17 - 0
iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -167,5 +167,22 @@ class NCNetworkingProcessUpload: NSObject {
             }
         })
     }
+    
+    //MARK: -
+    
+    @objc func createProcessUploads(metadatas: [tableMetadata], autoUpload: Bool = false) {
+        
+        var metadatasForUpload: [tableMetadata] = []
+        
+        for metadata in metadatas {
+            metadatasForUpload.append(metadata)
+            
+            //NCManageDatabase.shared.addMetadataForAutoUpload(metadata)
+        }
+        
+        NCManageDatabase.shared.addMetadatas(metadatasForUpload)
+        
+        startProcess()
+    }
 }