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

Properly handle renaming folders in FileProviderExtension modifyItem

Browse source 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
This commit is contained in:
Claudio Cambra 2023-02-27 23:04:36 +01:00
parent c3f79eecc6
commit 5f24527270
No known key found for this signature in database
GPG key ID: C839200C384636B0
1 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift
View file

@ -357,6 +357,48 @@ class FileProviderExtension: NSObject, NSFileProviderReplicatedExtension, NKComm
NSLog("About to upload item with identifier: %@ of type: %@ (is folder: %@) and filename: %@ to server url: %@ with contents located at: %@", item.itemIdentifier.rawValue, item.contentType?.identifier ?? "UNKNOWN", itemTemplateIsFolder ? "yes" : "no", item.filename, newServerUrlFileName, fileNameLocalPath)
if itemTemplateIsFolder {
let ocId = item.itemIdentifier.rawValue
guard changedFields.contains(.filename) else {
NSLog("System requested modification for folder with ocID %@ (%@) of something other than folder name.", ocId, newServerUrlFileName)
completionHandler(item, [], false, nil)
return Progress()
}
guard let metadata = dbManager.itemMetadataFromOcId(ocId) else {
NSLog("Could not acquire metadata of item with identifier: %@", ocId)
completionHandler(nil, [], false, NSFileProviderError(.noSuchItem))
return Progress()
}
let oldServerUrlFileName = metadata.serverUrl + "/" + metadata.fileName
self.ncKit.moveFileOrFolder(serverUrlFileNameSource: oldServerUrlFileName,
serverUrlFileNameDestination: newServerUrlFileName,
overwrite: false) { account, error in
guard error == .success else {
NSLog("Could not move folder with name: %@, received error: %@", item.filename, error.errorDescription)
completionHandler(nil, [], false, NSFileProviderError(.serverUnreachable))
return
}
dbManager.renameDirectoryAndPropagateToChildren(ocId: ocId, newServerUrl: newServerUrlFileName, newFileName: item.filename)
guard let newMetadata = dbManager.itemMetadataFromOcId(ocId) else {
NSLog("Could not acquire metadata of item with identifier: %@", ocId)
completionHandler(nil, [], false, NSFileProviderError(.noSuchItem))
return
}
let fpItem = FileProviderItem(metadata: newMetadata, parentItemIdentifier: parentItemIdentifier, ncKit: self.ncKit)
completionHandler(fpItem, [], false, nil)
}
return Progress()
}
self.ncKit.upload(serverUrlFileName: newServerUrlFileName,
fileNameLocalPath: fileNameLocalPath,
requestHandler: { _ in