Ver código fonte

remove : FILEID_IMPORT_METADATA_TEMP now fileID = directoryID + fileName

Marino Faggiana 6 anos atrás
pai
commit
4f33438729

+ 1 - 4
PickerFileProvider/FileProviderData.swift

@@ -41,10 +41,7 @@ class FileProviderData: NSObject {
     // metadata Selector Post
     let selectorPostImportDocument = "importDocument"
     let selectorPostItemChanged = "itemChanged"
-    
-    // Metadata Temp for Import
-    let FILEID_IMPORT_METADATA_TEMP = k_uploadSessionID + "FILE_PROVIDER_EXTENSION"
-    
+        
     // Max item for page
     let itemForPage = 20
 

+ 4 - 4
PickerFileProvider/FileProviderExtension+Actions.swift

@@ -418,7 +418,7 @@ extension FileProviderExtension {
                 }
             
                 let fileName = self.createFileName(fileURL.lastPathComponent, directoryID: tableDirectory.directoryID, serverUrl: serverUrl)
-                let fileNamePathDirectory = self.providerData.fileProviderStorageURL!.path + "/" + self.providerData.FILEID_IMPORT_METADATA_TEMP + tableDirectory.directoryID + fileName
+                let fileNamePathDirectory = self.providerData.fileProviderStorageURL!.path + "/" + tableDirectory.directoryID + fileName
             
                 do {
                     try FileManager.default.createDirectory(atPath: fileNamePathDirectory, withIntermediateDirectories: true, attributes: nil)
@@ -434,12 +434,12 @@ extension FileProviderExtension {
             
                 // Metadata TEMP
                 metadata.account = self.providerData.account
-                metadata.assetLocalIdentifier = self.providerData.FILEID_IMPORT_METADATA_TEMP + tableDirectory.directoryID + fileName
+                metadata.assetLocalIdentifier = tableDirectory.directoryID + fileName
                 metadata.date = NSDate()
                 metadata.directory = false
                 metadata.directoryID = tableDirectory.directoryID
                 metadata.etag = ""
-                metadata.fileID = self.providerData.FILEID_IMPORT_METADATA_TEMP + tableDirectory.directoryID + fileName
+                metadata.fileID = tableDirectory.directoryID + fileName
                 metadata.size = size
                 metadata.status = Double(k_metadataStatusHide)
                 metadata.fileName = fileName
@@ -451,7 +451,7 @@ extension FileProviderExtension {
                     let metadataNet = CCMetadataNet()
                     
                     metadataNet.account = self.providerData.account
-                    metadataNet.assetLocalIdentifier = self.providerData.FILEID_IMPORT_METADATA_TEMP + tableDirectory.directoryID + fileName
+                    metadataNet.assetLocalIdentifier = tableDirectory.directoryID + fileName
                     metadataNet.fileName = fileName
                     metadataNet.path = fileNamePathDirectory
                     metadataNet.selector = selectorUploadFile

+ 1 - 0
PickerFileProvider/FileProviderExtension+Network.swift

@@ -193,6 +193,7 @@ extension FileProviderExtension {
         
         let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier, providerData: providerData)
 
+        // Register for bytesSent
         NSFileProviderManager.default.register(task, forItemWithIdentifier: NSFileProviderItemIdentifier(item.itemIdentifier.rawValue)) { (error) in }
         
         providerData.queueTradeSafe.sync(flags: .barrier) {

+ 1 - 1
PickerFileProvider/FileProviderExtension.swift

@@ -275,7 +275,7 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
             }
             
             // is Upload [Office 365 !!!]
-            if metadata.sessionTaskIdentifier > 0 || metadata.fileID.contains(k_uploadSessionID) {
+            if metadata.sessionTaskIdentifier > 0 || metadata.fileID.contains(metadata.directoryID + metadata.fileName) {
                 completionHandler(nil)
                 return
             }