From 3ba44eb3409ca11432da2e9ec90af2c8258970c5 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Mon, 15 Apr 2024 22:41:22 +0800 Subject: [PATCH] Greatly simplify item method of FIleProviderExtension by using item storedItem method Signed-off-by: Claudio Cambra --- .../FileProviderExtension.swift | 32 ++----------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift index 881894cb9..cddbdf8a0 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift +++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift @@ -92,37 +92,11 @@ import OSLog request _: NSFileProviderRequest, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void ) -> Progress { - // resolve the given identifier to a record in the model - - Logger.fileProviderExtension.debug( - "Received item request for item with identifier: \(identifier.rawValue, privacy: .public)" - ) - - if identifier == .rootContainer { - guard ncAccount != nil else { - Logger.fileProviderExtension.error( - "Not providing item: \(identifier.rawValue, privacy: .public) as account not set up yet" - ) - completionHandler(nil, NSFileProviderError(.notAuthenticated)) - return Progress() - } - - completionHandler(Item.rootContainer(ncKit: ncKit), nil) - return Progress() - } - - let dbManager = FilesDatabaseManager.shared - - guard let metadata = dbManager.itemMetadataFromFileProviderItemIdentifier(identifier), - let parentItemIdentifier = dbManager.parentItemIdentifierFromMetadata(metadata) - else { + if let item = Item.storedItem(identifier: identifier, usingKit: ncKit) { + completionHandler(item, nil) + } else { completionHandler(nil, NSFileProviderError(.noSuchItem)) - return Progress() } - - completionHandler( - Item(metadata: metadata, parentItemIdentifier: parentItemIdentifier, ncKit: ncKit), nil - ) return Progress() } -- 2.39.5