mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix erroneous deletion of metadata when updating serverUrl subject directory

Browse Source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2023-03-10 18:51:14 +01:00
parent 2ac3a22523
commit 7c8aab38d2
No known key found for this signature in database
GPG Key ID: C839200C384636B0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
View File

@ -383,7 +383,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
var allFpItemUpdates: [FileProviderItem] = []
var allFpItemDeletionsIdentifiers = Array(allDeletedMetadatas.map { NSFileProviderItemIdentifier($0.ocId) })
DispatchQueue.main.sync {
DispatchQueue.main.sync { // TODO: Find a way to make this non-blocking
for updMetadata in allUpdatedMetadatas {
guard let parentItemIdentifier = parentItemIdentifierFromMetadata(updMetadata) else {
NSLog("Not enumerating change for metadata: %@ %@ as could not get parent item metadata.", updMetadata.ocId, updMetadata.fileName)
@ -464,7 +464,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
}
NSLog("Starting async conversion of NKFiles for serverUrl: %@ for user: %@", serverUrl, ncKitAccount)
DispatchQueue.main.async {
DispatchQueue.main.async { // TODO: Background thread? But avoid crash with Realm
dbManager.convertNKFilesFromDirectoryReadToItemMetadatas(files, account: ncKitAccount) { directoryMetadata, childDirectoriesMetadata, metadatas in
// STORE DATA FOR CURRENTLY SCANNED DIRECTORY
@ -472,7 +472,8 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
// 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
if serverUrl != ncAccount.davFilesUrl {
dbManager.updateDirectoryMetadatasFromItemMetadatas(account: ncKitAccount, parentDirectoryServerUrl: serverUrl, updatedDirectoryItemMetadatas: [directoryMetadata], recordEtag: true)
// Don't use serverUrl here, get the parent serverUrl from retrieved metadata
dbManager.updateDirectoryMetadatasFromItemMetadatas(account: ncKitAccount, parentDirectoryServerUrl: directoryMetadata.serverUrl, updatedDirectoryItemMetadatas: [directoryMetadata], recordEtag: true)
}
// STORE ETAG-LESS DIRECTORY METADATA FOR CHILD DIRECTORIES