From 8661841c447e40a4d2b6a1a231c65892b0815045 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Wed, 15 Mar 2023 12:47:08 +0100 Subject: [PATCH] Remove unnecessary local file operations in FileProviderExt Signed-off-by: Claudio Cambra --- .../FileProviderEnumerator.swift | 6 +--- .../FileProviderExt/LocalFilesUtils.swift | 28 ------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift index c270c65dd..58ef39053 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift +++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift @@ -294,7 +294,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator { // MARK: - Helper methods - private static func completeEnumerationObserver(_ observer: NSFileProviderEnumerationObserver, ncKit: NextcloudKit, numPage: Int, itemMetadatas: [NextcloudItemMetadataTable], createLocalFileOrDirectory: Bool = true) { + private static func completeEnumerationObserver(_ observer: NSFileProviderEnumerationObserver, ncKit: NextcloudKit, numPage: Int, itemMetadatas: [NextcloudItemMetadataTable]) { var items: [NSFileProviderItem] = [] @@ -304,10 +304,6 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator { continue } - if createLocalFileOrDirectory { - createFileOrDirectoryLocally(metadata: itemMetadata) - } - if let parentItemIdentifier = NextcloudFilesDatabaseManager.shared.parentItemIdentifierFromMetadata(itemMetadata) { let item = FileProviderItem(metadata: itemMetadata, parentItemIdentifier: parentItemIdentifier, ncKit: ncKit) Logger.enumeration.debug("Will enumerate item with ocId: \(itemMetadata.ocId) and name: \(itemMetadata.fileName, privacy: OSLogPrivacy.auto(mask: .hash))") diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/LocalFilesUtils.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/LocalFilesUtils.swift index 470e23219..0a9d1eaa4 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/LocalFilesUtils.swift +++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/LocalFilesUtils.swift @@ -50,16 +50,6 @@ func pathForFileProviderExtFiles() -> URL? { return folderPathUrl } -@discardableResult func localPathForNCDirectory(directoryMetadata: NextcloudDirectoryMetadataTable) throws -> URL { - let ocId = directoryMetadata.ocId - return try localPathForNCDirectory(ocId: ocId) -} - -@discardableResult func localPathForNCDirectory(itemMetadata: NextcloudItemMetadataTable) throws -> URL { - let ocId = itemMetadata.ocId - return try localPathForNCDirectory(ocId: ocId) -} - @discardableResult func localPathForNCFile(ocId: String, fileNameView: String) throws -> URL { let fileFolderPathUrl = try localPathForNCDirectory(ocId: ocId) let filePathUrl = fileFolderPathUrl.appendingPathComponent(fileNameView) @@ -71,21 +61,3 @@ func pathForFileProviderExtFiles() -> URL? { return filePathUrl } - -@discardableResult func localPathForNCFile(itemMetadata: NextcloudItemMetadataTable) throws -> URL { - let ocId = itemMetadata.ocId - let fileNameView = itemMetadata.fileNameView - return try localPathForNCFile(ocId: ocId, fileNameView: fileNameView) -} - -func createFileOrDirectoryLocally(metadata: NextcloudItemMetadataTable) { - do { - if metadata.directory { - try localPathForNCDirectory(ocId: metadata.ocId) - } else { - try localPathForNCFile(itemMetadata: metadata) - } - } catch let error { - Logger.enumeration.error("Could not create NC file or directory locally, received error: \(error, privacy: .public)") - } -} -- 2.30.2