Marino Faggiana 7 年之前
父节点
当前提交
3be48cc033
共有 2 个文件被更改,包括 12 次插入9 次删除
  1. 1 0
      Picker/DocumentPickerViewController.swift
  2. 11 9
      PickerFileProvider/FileProvider.swift

+ 1 - 0
Picker/DocumentPickerViewController.swift

@@ -566,6 +566,7 @@ extension DocumentPickerViewController {
                         CCUtility.setServerUrlExt(self!.serverUrl)
                         CCUtility.setServerUrlExt(self!.serverUrl)
 
 
                         self?.dismissGrantingAccess(to: self?.destinationURL)
                         self?.dismissGrantingAccess(to: self?.destinationURL)
+                        
                     } else {
                     } else {
                     
                     
                         // Upload fileName to Cloud
                         // Upload fileName to Cloud

+ 11 - 9
PickerFileProvider/FileProvider.swift

@@ -106,17 +106,9 @@ class FileProvider: NSFileProviderExtension, CCNetworkingDelegate {
             return
             return
         }
         }
         
         
-        guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "fileID == %@", fileID)) else {
-            self.stopProvidingItem(at: url)
-            return
-        }
-        
         let fileName = url.lastPathComponent
         let fileName = url.lastPathComponent
         
         
-        if (fileName != metadata.fileName) {
-            self.stopProvidingItem(at: url)
-            return
-        }
+        
         
         
         let uploadID = k_uploadSessionID + CCUtility.createRandomString(16)
         let uploadID = k_uploadSessionID + CCUtility.createRandomString(16)
         let destinationURLDirectoryUser = URL(string: "file://\(directoryUser!)/\(uploadID)".addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)!
         let destinationURLDirectoryUser = URL(string: "file://\(directoryUser!)/\(uploadID)".addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)!
@@ -144,6 +136,16 @@ class FileProvider: NSFileProviderExtension, CCNetworkingDelegate {
             
             
         } else {
         } else {
         
         
+            guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "fileID == %@", fileID)) else {
+                self.stopProvidingItem(at: url)
+                return
+            }
+            
+            if (fileName != metadata.fileName) {
+                self.stopProvidingItem(at: url)
+                return
+            }
+            
             // Prepare for send Metadata
             // Prepare for send Metadata
             metadata.fileID = uploadID
             metadata.fileID = uploadID
             metadata.sessionID = uploadID
             metadata.sessionID = uploadID