Marino Faggiana 6 жил өмнө
parent
commit
087c6fd86e

+ 0 - 4
File Provider Extension/FileProviderData.swift

@@ -34,10 +34,6 @@ class FileProviderData: NSObject {
     var accountUrl = ""
     var homeServerUrl = ""
         
-    // metadata Selector Post
-    let selectorPostImportDocument = "importDocument"
-    let selectorPostItemChanged = "itemChanged"
-        
     // Max item for page
     let itemForPage = 20
 

+ 0 - 1
File Provider Extension/FileProviderExtension+Actions.swift

@@ -418,7 +418,6 @@ extension FileProviderExtension {
                     
                     metadata.session = k_upload_session_extension
                     metadata.sessionSelector = selectorUploadFile
-                    metadata.sessionSelectorPost = self.providerData.selectorPostImportDocument
                     metadata.status = Int(k_metadataStatusWaitUpload)
                 }
                 

+ 8 - 14
File Provider Extension/FileProviderExtension+Network.swift

@@ -206,21 +206,16 @@ extension FileProviderExtension {
         // OK
         if errorCode == 0 {
             
-            // importDocument
-            if (selectorPost == providerData.selectorPostImportDocument) {
-                providerData.queueTradeSafe.sync(flags: .barrier) {
-                    let itemIdentifier = NSFileProviderItemIdentifier(metadata.directoryID+fileName)
-                    self.providerData.fileProviderSignalDeleteContainerItemIdentifier[itemIdentifier] = itemIdentifier
-                    self.providerData.fileProviderSignalDeleteWorkingSetItemIdentifier[itemIdentifier] = itemIdentifier
-                }
+            // Remove temp fileID = directoryID + fileName
+            providerData.queueTradeSafe.sync(flags: .barrier) {
+                let itemIdentifier = NSFileProviderItemIdentifier(metadata.directoryID+fileName)
+                self.providerData.fileProviderSignalDeleteContainerItemIdentifier[itemIdentifier] = itemIdentifier
+                self.providerData.fileProviderSignalDeleteWorkingSetItemIdentifier[itemIdentifier] = itemIdentifier
             }
             
-            // itemChanged
-            if (selectorPost == providerData.selectorPostItemChanged) {
-                // Recreate ico
-                CCGraphics.createNewImage(from: fileName, fileID: fileID, extension: NSString(string: fileName).pathExtension, size: "m", imageForUpload: false, typeFile: metadata.typeFile, writeImage: true, optimizedFileName: false)
-            }
-                        
+            // Recreate ico
+            CCGraphics.createNewImage(from: fileName, fileID: fileID, extension: NSString(string: fileName).pathExtension, size: "m", imageForUpload: false, typeFile: metadata.typeFile, writeImage: true, optimizedFileName: false)
+            
             // remove session data
             metadata.session = ""
             metadata.sessionSelector = ""
@@ -276,7 +271,6 @@ extension FileProviderExtension {
         
         metadata.session = k_upload_session_extension
         metadata.sessionSelector = selectorUploadFile
-        metadata.sessionSelectorPost = providerData.selectorPostItemChanged
         metadata.status = Int(k_metadataStatusWaitUpload)
 
         guard let metadataForUpload = NCManageDatabase.sharedInstance.addMetadata(metadata) else {

+ 1 - 1
File Provider Extension/FileProviderExtension.swift

@@ -223,7 +223,7 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
         // Error ? reUpload when touch
         if metadata.status == k_metadataStatusUploadError && metadata.session == k_upload_session_extension {
             
-            if metadata.sessionSelectorPost == providerData.selectorPostImportDocument ||  metadata.sessionSelectorPost == providerData.selectorPostItemChanged {
+            if metadata.session == k_upload_session_extension {
                 self.reUpload(metadata)
             }
                 

+ 1 - 1
File Provider Extension/FileProviderItem.swift

@@ -112,7 +112,7 @@ class FileProviderItem: NSObject, NSFileProviderItem {
             }
             
             // Upload
-            if ((metadata.sessionSelectorPost == providerData.selectorPostImportDocument || metadata.sessionSelectorPost == providerData.selectorPostItemChanged) && metadata.status != k_metadataStatusUploadError) {
+            if (metadata.session == k_upload_session_extension && metadata.status != k_metadataStatusUploadError) {
                 isUpload = true
                 self.isDownloaded = true
                 self.isMostRecentVersionDownloaded = true