Marino Faggiana преди 6 години
родител
ревизия
aade6f223f
променени са 2 файла, в които са добавени 12 реда и са изтрити 30 реда
  1. 10 25
      PickerFileProvider/FileProviderExtension+Network.swift
  2. 2 5
      PickerFileProvider/FileProviderExtension.swift

+ 10 - 25
PickerFileProvider/FileProviderExtension+Network.swift

@@ -273,32 +273,9 @@ extension FileProviderExtension {
             uploadFileImportDocument()
             
         } else {
-        // Error
-            
-            // importDocument
-            if (selectorPost == providerData.selectorPostImportDocument) {
-                
-                DispatchQueue.main.asyncAfter(deadline: .now() + providerData.timeReupload) {
-                    
-                    self.uploadFileImportDocument()
-                }
-            }
-            
-            // itemChanged
-            if (selectorPost == providerData.selectorPostItemChanged) {
-                
-                let itemIdentifier = providerData.getItemIdentifier(metadata: metadata)
-                
-                let urlString = (providerData.fileProviderStorageURL!.path + "/"  + itemIdentifier.rawValue + "/" + fileName).addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!
-                let url = URL(string: urlString)!
-                
-                DispatchQueue.main.asyncAfter(deadline: .now() + providerData.timeReupload) {
-                    
-                    self.uploadFileItemChanged(for: itemIdentifier, url: url)
-                }
-            }
+        
+            // Error
             
-            // change status to Upload Error
             metadata.status = Int(k_metadataStatusUploadError)
             let metadata = NCManageDatabase.sharedInstance.addMetadata(metadata)
             
@@ -355,4 +332,12 @@ extension FileProviderExtension {
         
         CCNetworking.shared().uploadFile(metadataForUpload, taskStatus: Int(k_taskStatusResume), delegate: self)
     }
+    
+    func reUpload(_ metadata: tableMetadata) {
+        
+        metadata.status = Int(k_metadataStatusWaitUpload)
+        let metadataForUpload = NCManageDatabase.sharedInstance.addMetadata(metadata)
+        
+        CCNetworking.shared().uploadFile(metadataForUpload, taskStatus: Int(k_taskStatusResume), delegate: self)
+    }
 }

+ 2 - 5
PickerFileProvider/FileProviderExtension.swift

@@ -277,12 +277,9 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
             // Error ? reUpload when touch
             if metadata.status == k_metadataStatusUploadError && metadata.session == k_upload_session_extension {
                 
-                if metadata.sessionSelectorPost == providerData.selectorPostImportDocument {
+                if metadata.sessionSelectorPost == providerData.selectorPostImportDocument ||  metadata.sessionSelectorPost == providerData.selectorPostItemChanged {
                     
-                    metadata.status = Int(k_metadataStatusWaitUpload)
-                    _ = NCManageDatabase.sharedInstance.addMetadata(metadata)
-                    
-                    self.uploadFileImportDocument()
+                    self.reUpload(metadata)
                 }
                 
                 completionHandler(nil)