mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 05:45:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Handle 404 errors from readFileOrFolder as special deletion case in FileProviderEnumerator

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2023-03-09 16:51:31 +01:00
parent 25a09e1704
commit 03c1731fb5
No known key found for this signature in database
GPG key ID: C839200C384636B0
1 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderEnumerator.swift
View file

@ -184,6 +184,20 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
FileProviderEnumerator.readServerUrl(materialMetadataServerUrl, ncAccount: ncAccount, ncKit: ncKit) { [self] _, newMetadatas, updatedMetadatas, deletedMetadatas, readError in FileProviderEnumerator.readServerUrl(materialMetadataServerUrl, ncAccount: ncAccount, ncKit: ncKit) { [self] _, newMetadatas, updatedMetadatas, deletedMetadatas, readError in
guard readError == nil else { guard readError == nil else {
NSLog("Finishing enumeration of changes at %@ with error %@", serverUrl) NSLog("Finishing enumeration of changes at %@ with error %@", serverUrl)
if let nkReadError = readError as? NKError, nkReadError.errorCode == 404 {
NSLog("404 error means item no longer exists. Deleting metadata and reporting as deletion without error")
let dbManager = NextcloudFilesDatabaseManager.shared
if materialMetadata.directory {
dbManager.deleteDirectoryAndSubdirectoriesMetadata(ocId: materialMetadata.ocId)
} else {
dbManager.deleteItemMetadata(ocId: materialMetadata.ocId)
}
allDeletedMetadatas.append(materialMetadata)
}
dispatchGroup.leave() dispatchGroup.leave()
return return
} }
@ -226,6 +240,26 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
FileProviderEnumerator.readServerUrl(serverUrl, ncAccount: ncAccount, ncKit: ncKit) { [self] _, newMetadatas, updatedMetadatas, deletedMetadatas, readError in FileProviderEnumerator.readServerUrl(serverUrl, ncAccount: ncAccount, ncKit: ncKit) { [self] _, newMetadatas, updatedMetadatas, deletedMetadatas, readError in
guard readError == nil else { guard readError == nil else {
NSLog("Finishing enumeration of changes with error") NSLog("Finishing enumeration of changes with error")
if let nkReadError = readError as? NKError, nkReadError.errorCode == 404 {
NSLog("404 error means item no longer exists. Deleting metadata and reporting %@ as deletion without error", serverUrl)
guard let itemMetadata = self.enumeratedItemMetadata else {
NSLog("Invalid enumeratedItemMetadata, could not delete metadata nor report deletion")
observer.finishEnumeratingWithError(readError!)
return
}
let dbManager = NextcloudFilesDatabaseManager.shared
if itemMetadata.directory {
dbManager.deleteDirectoryAndSubdirectoriesMetadata(ocId: itemMetadata.ocId)
} else {
dbManager.deleteItemMetadata(ocId: itemMetadata.ocId)
}
FileProviderEnumerator.completeChangesObserver(observer, anchor: anchor, ncKit: ncKit, newMetadatas: nil, updatedMetadatas: nil, deletedMetadatas: [itemMetadata])
}
observer.finishEnumeratingWithError(readError!) observer.finishEnumeratingWithError(readError!)
return return
} }