clear code

PickerFileProvider/FileProviderEnumerator.swift

@@ -183,14 +183,14 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
         // Report the deleted items
         //
         var itemsDelete = [NSFileProviderItemIdentifier]()
-        for (itemIdentifier, _) in fileProviderSignalDeleteItemIdentifier {
+        for (itemIdentifier, _) in fileProviderSignalDeleteContainerItemIdentifier {
             itemsDelete.append(itemIdentifier)
         }
         
         // Report the updated items
         //
         var itemsUpdate = [FileProviderItem]()
-        for (itemIdentifier, item) in fileProviderSignalUpdateItem {
+        for (itemIdentifier, item) in fileProviderSignalUpdateContainerItem {
             let account = providerData.getAccountFromItemIdentifier(itemIdentifier)
             if account != nil && account == providerData.account {
                 itemsUpdate.append(item)

PickerFileProvider/FileProviderExtension+Actions.swift

@@ -73,7 +73,7 @@ extension FileProviderExtension {
                 
                 let item = FileProviderItem(metadata: metadataDB, parentItemIdentifier: parentItemIdentifier!, providerData: self.providerData)
                 
-                fileProviderSignalUpdateItem[item.itemIdentifier] = item
+                fileProviderSignalUpdateContainerItem[item.itemIdentifier] = item
                 self.signalEnumerator(for: [item.parentItemIdentifier, .workingSet])
                 
                 completionHandler(item, nil)
@@ -111,7 +111,7 @@ extension FileProviderExtension {
         deleteFile(withIdentifier: itemIdentifier, parentItemIdentifier: parentItemIdentifier, metadata: metadata)
 
         // return immediately
-        fileProviderSignalDeleteItemIdentifier[itemIdentifier] = itemIdentifier
+        fileProviderSignalDeleteContainerItemIdentifier[itemIdentifier] = itemIdentifier
         self.signalEnumerator(for: [parentItemIdentifier, .workingSet])
         
         completionHandler(nil)
@@ -180,7 +180,7 @@ extension FileProviderExtension {
             
             let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier, providerData: self.providerData)
                 
-            fileProviderSignalUpdateItem[item.itemIdentifier] = item
+            fileProviderSignalUpdateContainerItem[item.itemIdentifier] = item
             self.signalEnumerator(for: [item.parentItemIdentifier, .workingSet])
                 
             completionHandler(item, nil)
@@ -249,7 +249,7 @@ extension FileProviderExtension {
             
             let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier, providerData: self.providerData)
                 
-            fileProviderSignalUpdateItem[item.itemIdentifier] = item
+            fileProviderSignalUpdateContainerItem[item.itemIdentifier] = item
             self.signalEnumerator(for: [item.parentItemIdentifier, .workingSet])
                 
             completionHandler(item, nil)
@@ -293,7 +293,7 @@ extension FileProviderExtension {
         
         let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier, providerData: providerData)
             
-        fileProviderSignalUpdateItem[item.itemIdentifier] = item
+        fileProviderSignalUpdateContainerItem[item.itemIdentifier] = item
         signalEnumerator(for: [.workingSet])
             
         completionHandler(item, nil)
@@ -323,7 +323,7 @@ extension FileProviderExtension {
         
         let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier, providerData: providerData)
             
-        fileProviderSignalUpdateItem[item.itemIdentifier] = item
+        fileProviderSignalUpdateContainerItem[item.itemIdentifier] = item
         signalEnumerator(for: [.workingSet])
             
         completionHandler(item, nil)
@@ -455,7 +455,7 @@ extension FileProviderExtension {
             
             let item = FileProviderItem(metadata: metadataDB, parentItemIdentifier: parentItemIdentifier, providerData: self.providerData)
             
-            fileProviderSignalUpdateItem[item.itemIdentifier] = item
+            fileProviderSignalUpdateContainerItem[item.itemIdentifier] = item
             self.signalEnumerator(for: [item.parentItemIdentifier, .workingSet])
             
             completionHandler(item, nil)

PickerFileProvider/FileProviderExtension+Network.swift

@@ -69,7 +69,7 @@ extension FileProviderExtension {
         }, failure: { (errorMessage, errorCode) in
             
             // remove itemIdentifier on fileProviderSignalDeleteItemIdentifier
-            fileProviderSignalDeleteItemIdentifier.removeValue(forKey: itemIdentifier)
+            fileProviderSignalDeleteContainerItemIdentifier.removeValue(forKey: itemIdentifier)
             
             self.signalEnumerator(for: [parentItemIdentifier, .workingSet])
         })
@@ -104,7 +104,7 @@ extension FileProviderExtension {
 
             let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier, providerData: self.providerData)
             
-            fileProviderSignalUpdateItem[item.itemIdentifier] = item
+            fileProviderSignalUpdateContainerItem[item.itemIdentifier] = item
             self.signalEnumerator(for: [item.parentItemIdentifier, .workingSet])
             
         })
@@ -126,7 +126,7 @@ extension FileProviderExtension {
                 
                 let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier!, providerData: providerData)
             
-                fileProviderSignalDeleteItemIdentifier[item.itemIdentifier] = item.itemIdentifier
+                fileProviderSignalDeleteContainerItemIdentifier[item.itemIdentifier] = item.itemIdentifier
                 signalEnumerator(for: [item.parentItemIdentifier, .workingSet])
             }
         }
@@ -153,7 +153,7 @@ extension FileProviderExtension {
                 
                 let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier, providerData: providerData)
                     
-                fileProviderSignalUpdateItem[item.itemIdentifier] = item
+                fileProviderSignalUpdateContainerItem[item.itemIdentifier] = item
                 signalEnumerator(for: [item.parentItemIdentifier, .workingSet])
             }
             

PickerFileProvider/FileProviderExtension.swift

@@ -27,8 +27,10 @@ import FileProvider
 var timerUpload: Timer?
 
 // Item for signalEnumerator
-var fileProviderSignalDeleteItemIdentifier = [NSFileProviderItemIdentifier:NSFileProviderItemIdentifier]()
-var fileProviderSignalUpdateItem = [NSFileProviderItemIdentifier:FileProviderItem]()
+var fileProviderSignalDeleteContainerItemIdentifier = [NSFileProviderItemIdentifier:NSFileProviderItemIdentifier]()
+var fileProviderSignalUpdateContainerItem = [NSFileProviderItemIdentifier:FileProviderItem]()
+var fileProviderSignalDeleteWorkingSetItemIdentifier = [NSFileProviderItemIdentifier:NSFileProviderItemIdentifier]()
+var fileProviderSignalUpdateWorkingSetItem = [NSFileProviderItemIdentifier:FileProviderItem]()
 
 // Rank favorite
 var listFavoriteIdentifierRank = [String:NSNumber]()
@@ -228,7 +230,7 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
         
         // Update workingSet
         for (itemIdentifier, item) in updateItemsWorkingSet {
-            fileProviderSignalUpdateItem[itemIdentifier] = item
+            fileProviderSignalUpdateContainerItem[itemIdentifier] = item
             self.signalEnumerator(for: [.workingSet])
         }
     }