marinofaggiana 4 years ago
parent
commit
a16666e071

+ 3 - 3
File Provider Extension/FileProviderData.swift

@@ -155,10 +155,10 @@ class fileProviderData: NSObject {
     // MARK: -
 
     @discardableResult
-    func signalEnumerator(metadata: tableMetadata, delete: Bool = false, update: Bool = false) -> FileProviderItem? {
-        
-        let metadata = tableMetadata.init(value: metadata)
+    func signalEnumerator(ocId: String, delete: Bool = false, update: Bool = false) -> FileProviderItem? {
         
+        guard let metadata = NCManageDatabase.sharedInstance.getMetadataFromOcId(ocId) else { return nil }
+                
         guard let parentItemIdentifier = fileProviderUtility.sharedInstance.getParentItemIdentifier(metadata: metadata, homeServerUrl: fileProviderData.sharedInstance.homeServerUrl) else { return nil }
         
         let item = FileProviderItem(metadata: metadata, parentItemIdentifier: parentItemIdentifier)

+ 3 - 8
File Provider Extension/FileProviderExtension+Actions.swift

@@ -260,7 +260,7 @@ extension FileProviderExtension {
                     metadata.favorite = favorite
                     NCManageDatabase.sharedInstance.addMetadata(metadata)
                     
-                    let item = fileProviderData.sharedInstance.signalEnumerator(metadata: metadata)
+                    let item = fileProviderData.sharedInstance.signalEnumerator(ocId: metadata.ocId)
                     completionHandler(item, nil)
                     
                 } else {
@@ -273,7 +273,7 @@ extension FileProviderExtension {
                     // Errore, remove from listFavoriteIdentifierRank
                     fileProviderData.sharedInstance.listFavoriteIdentifierRank.removeValue(forKey: itemIdentifier.rawValue)
                     
-                    let item = fileProviderData.sharedInstance.signalEnumerator(metadata: metadata)
+                    let item = fileProviderData.sharedInstance.signalEnumerator(ocId: metadata.ocId)
                     completionHandler(item, NSFileProviderError(.serverUnreachable))
                 }
             }
@@ -292,12 +292,7 @@ extension FileProviderExtension {
         // Add, Remove (nil)
         NCManageDatabase.sharedInstance.addTag(ocId, tagIOS: tagData, account: account)
         
-        guard let metadata = NCManageDatabase.sharedInstance.getMetadataFromOcId(ocId) else {
-            completionHandler(nil, NSFileProviderError(.noSuchItem))
-            return
-        }
-        
-        let item = fileProviderData.sharedInstance.signalEnumerator(metadata: metadata)
+        let item = fileProviderData.sharedInstance.signalEnumerator(ocId: ocId)
         completionHandler(item, nil)
     }
     

+ 2 - 2
File Provider Extension/FileProviderExtension+NetworkingDelegate.swift

@@ -43,7 +43,7 @@ extension FileProviderExtension: NCNetworkingDelegate {
             // New file
             if ocId != ocIdTemp {
                 // Signal update
-                fileProviderData.sharedInstance.signalEnumerator(metadata: metadata, delete: true)
+                fileProviderData.sharedInstance.signalEnumerator(ocId: metadata.ocId, delete: true)
             }
                         
             metadata.fileName = fileName
@@ -71,7 +71,7 @@ extension FileProviderExtension: NCNetworkingDelegate {
             }
             
             // Signal update
-            fileProviderData.sharedInstance.signalEnumerator(metadata: metadata, update: true)
+            fileProviderData.sharedInstance.signalEnumerator(ocId: metadata.ocId, update: true)
             
         } else {
            

+ 2 - 2
File Provider Extension/FileProviderExtension.swift

@@ -245,7 +245,7 @@ class FileProviderExtension: NSFileProviderExtension {
                 self.outstandingSessionTasks[url] = task
                 NSFileProviderManager.default.register(task!, forItemWithIdentifier: NSFileProviderItemIdentifier(identifier.rawValue)) { (error) in }
                 
-                fileProviderData.sharedInstance.signalEnumerator(metadata: metadata, delete: true, update: true)
+                fileProviderData.sharedInstance.signalEnumerator(ocId: metadata.ocId, delete: true, update: true)
             }
             
         }) { (account, etag, date, length, error, errorCode, errorDescription) in
@@ -277,7 +277,7 @@ class FileProviderExtension: NSFileProviderExtension {
                 completionHandler(NSFileProviderError(.noSuchItem))
             }
             
-            fileProviderData.sharedInstance.signalEnumerator(metadata: metadata, delete: true, update: true)
+            fileProviderData.sharedInstance.signalEnumerator(ocId: metadata.ocId, delete: true, update: true)
         }
     }