From: Claudio Cambra Date: Fri, 10 Mar 2023 23:31:47 +0000 (+0100) Subject: Ensure no metadatas get deleted when updating metadata for scanned directory in FileP... X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~55^2~162 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=79d89c21c7ae173c7e01b38f64f4b8edad9be5e5;p=nextcloud-desktop.git Ensure no metadatas get deleted when updating metadata for scanned directory in FileProviderEnumerator Signed-off-by: Claudio Cambra --- diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift index e7e799fea..d2b82daf3 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift +++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift @@ -513,11 +513,10 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator { // STORE DATA FOR CURRENTLY SCANNED DIRECTORY // We have now scanned this directory's contents, so update with etag in order to not check again if not needed - // unless it's the root container -- this method deletes metadata for directories under the path that we do not - // provide as the updatedDirectoryItemMetadatas, don't do this with root folder or we will purge metadatas wrongly + // unless it's the root container if serverUrl != ncAccount.davFilesUrl { - // Don't use serverUrl here, get the parent serverUrl from retrieved metadata - dbManager.updateDirectoryMetadatasFromItemMetadatas(account: ncKitAccount, parentDirectoryServerUrl: directoryMetadata.serverUrl, updatedDirectoryItemMetadatas: [directoryMetadata], recordEtag: true) + let directoryItemMetadata = dbManager.directoryMetadataFromItemMetadata(directoryItemMetadata: directoryMetadata, recordEtag: true) + dbManager.addDirectoryMetadata(directoryItemMetadata) } // STORE ETAG-LESS DIRECTORY METADATA FOR CHILD DIRECTORIES