Marino Faggiana 7 anni fa
parent
commit
a29ae8693d

+ 0 - 33
PickerFileProvider/FileProvider.swift

@@ -96,8 +96,6 @@ class FileProvider: NSFileProviderExtension {
         
         if #available(iOSApplicationExtension 11.0, *) {
             
-            listUpdateItems.removeAll()
-            fileNamePathImport.removeAll()
             listFavoriteIdentifierRank = NCManageDatabase.sharedInstance.getTableMetadatasDirectoryFavoriteIdentifierRank()
             
             // Timer for upload
@@ -620,9 +618,6 @@ class FileProvider: NSFileProviderExtension {
             return
         }
         
-        listUpdateItems.removeAll()
-        fileNamePathImport.removeAll()
-        
         var serverUrl = ""
         
         if parentItemIdentifier == .rootContainer {
@@ -679,9 +674,6 @@ class FileProvider: NSFileProviderExtension {
             return
         }
         
-        listUpdateItems.removeAll()
-        fileNamePathImport.removeAll()
-        
         guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", account, itemIdentifier.rawValue)) else {
             completionHandler(nil)
             return
@@ -733,9 +725,6 @@ class FileProvider: NSFileProviderExtension {
             return
         }
         
-        listUpdateItems.removeAll()
-        fileNamePathImport.removeAll()
-        
         var serverUrlTo = ""
         var fileNameTo = ""
         var directoryIDTo = ""
@@ -802,9 +791,6 @@ class FileProvider: NSFileProviderExtension {
             return
         }
         
-        listUpdateItems.removeAll()
-        fileNamePathImport.removeAll()
-        
         guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", account, itemIdentifier.rawValue)) else {
             completionHandler(nil, NSFileProviderError(.noSuchItem))
             return
@@ -862,9 +848,6 @@ class FileProvider: NSFileProviderExtension {
             return
         }
         
-        listUpdateItems.removeAll()
-        fileNamePathImport.removeAll()
-        
         completionHandler(nil, nil)
         
         /*
@@ -931,9 +914,6 @@ class FileProvider: NSFileProviderExtension {
             return
         }
         
-        listUpdateItems.removeAll()
-        fileNamePathImport.removeAll()
-        
         // Add, Remove (nil)
         NCManageDatabase.sharedInstance.addTag(itemIdentifier.rawValue, tagIOS: tagData)
         
@@ -1107,19 +1087,6 @@ class FileProvider: NSFileProviderExtension {
             return
         }
         
-        let item = try? self.item(for: identifier)
-        if item != nil {
-            var found = false
-            for updateItem in listUpdateItems {
-                if updateItem.itemIdentifier.rawValue == identifier.rawValue {
-                    found = true
-                }
-            }
-            if !found {
-                listUpdateItems.append(item!)
-            }
-        }
-       
         if serverUrl == homeServerUrl {
             NSFileProviderManager.default.signalEnumerator(for: .rootContainer, completionHandler: { (error) in
                 print("send signal rootContainer")

+ 1 - 4
PickerFileProvider/FileProviderEnumerator.swift

@@ -60,10 +60,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
         var metadatas: [tableMetadata]?
 
         if #available(iOSApplicationExtension 11.0, *) {
-            
-            // clear list update items
-            listUpdateItems.removeAll()
-            
+                        
             guard let serverUrl = serverUrl else {
                 observer.finishEnumerating(upTo: nil)
                 return

+ 0 - 3
PickerFileProvider/FileProviderEnumeratorFile.swift

@@ -38,9 +38,6 @@ class FileProviderEnumeratorFile: NSObject, NSFileProviderEnumerator {
     func enumerateItems(for observer: NSFileProviderEnumerationObserver, startingAt page: NSFileProviderPage) {
         
         var items: [NSFileProviderItemProtocol] = []
-
-        // clear list update items
-        listUpdateItems.removeAll()
         
         guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND fileID = %@", account, enumeratedItemIdentifier.rawValue)) else {
             observer.finishEnumerating(upTo: nil)

+ 0 - 4
PickerFileProvider/FileProviderEnumeratorWorkingSet.swift

@@ -39,10 +39,6 @@ class FileProviderEnumeratorWorkingSet: NSObject, NSFileProviderEnumerator {
         
         var items: [NSFileProviderItemProtocol] = []
         
-        // clear list
-        listUpdateItems.removeAll()
-        listFavoriteIdentifierRank.removeAll()
-        
         // Tag
         let tags = NCManageDatabase.sharedInstance.getTags(predicate: NSPredicate(format: "account = %@", account))
         for tag in tags {

+ 10 - 0
PickerFileProvider/FileProviderItem.swift

@@ -179,5 +179,15 @@ class FileProviderItem: NSObject, NSFileProviderItem {
         if let tableTag = NCManageDatabase.sharedInstance.getTag(predicate: NSPredicate(format: "account = %@ AND fileID = %@", metadata.account, metadata.fileID)) {
             tagData = tableTag.tagIOS
         }
+        
+        // Removed (if exists) this Item from listUpdate
+        var counter = 0
+        for updateItem in listUpdateItems {
+            if updateItem.itemIdentifier.rawValue == itemIdentifier.rawValue {
+                listUpdateItems.remove(at: counter)
+                break;
+            }
+            counter += 1
+        }
     }
 }