From 0f578fabdd01fbe14dbdcd7ba308a88eaee4fc61 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 20 Mar 2023 16:15:39 +0100 Subject: [PATCH] Use specific signalEnumerator method in FileProviderExtension item renaming instead of reinventing wheel Signed-off-by: Claudio Cambra --- .../FileProviderExt/FileProviderExtension.swift | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift index 67f27c551..acde41f16 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift +++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift @@ -412,14 +412,10 @@ class FileProviderExtension: NSObject, NSFileProviderReplicatedExtension, NKComm // an item metadata the server URL is the parent folder's URL if itemTemplateIsFolder { _ = dbManager.renameDirectoryAndPropagateToChildren(ocId: ocId, newServerUrl: newServerUrlFileName, newFileName: item.filename) - if let fpManager = NSFileProviderManager(for: self.domain) { - fpManager.signalEnumerator(for: .workingSet) { error in - if error != nil { - Logger.fileTransfer.error("Error notifying change in moved directory: \(error)") - } + self.signalEnumerator { error in + if error != nil { + Logger.fileTransfer.error("Error notifying change in moved directory: \(error)") } - } else { - Logger.fileTransfer.warning("Unable to get file provider for domain, will not be able to notify of change in moved directory") } } else { dbManager.renameItemMetadata(ocId: ocId, newServerUrl: parentItemServerUrl, newFileName: item.filename) @@ -617,7 +613,6 @@ class FileProviderExtension: NSObject, NSFileProviderReplicatedExtension, NKComm return } - let dbManager = NextcloudFilesDatabaseManager.shared let materialisedEnumerator = fpManager.enumeratorForMaterializedItems() let materialisedObserver = FileProviderMaterialisedEnumerationObserver(ncKitAccount: ncAccount.ncKitAccount) { _ in completionHandler() -- 2.30.2