"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
fichier: fix server side move - fixes #7856
Nick Craig-Wood3f2074901ace
diff --git a/backend/fichier/fichier.go b/backend/fichier/fichier.goindex 4a2caf5bf..5ebc8a6db 100644--- a/backend/fichier/fichier.go+++ b/backend/fichier/fichier.go@@ -441,23 +441,28 @@ func (f *Fs) Move(ctx context.Context, src fs.Object, remote string) (fs.Object,fs.Debugf(src, "Can't move - not same remote type")return nil, fs.ErrorCantMove}+ srcFs := srcObj.fs// Find current directory ID- _, currentDirectoryID, err := f.dirCache.FindPath(ctx, remote, false)+ srcLeaf, srcDirectoryID, err := srcFs.dirCache.FindPath(ctx, srcObj.remote, false)if err != nil {return nil, err}// Create temporary object- dstObj, leaf, directoryID, err := f.createObject(ctx, remote)+ dstObj, dstLeaf, dstDirectoryID, err := f.createObject(ctx, remote)if err != nil {return nil, err}// If it is in the correct directory, just rename itvar url string- if currentDirectoryID == directoryID {- resp, err := f.renameFile(ctx, srcObj.file.URL, leaf)+ if srcDirectoryID == dstDirectoryID {+ // No rename needed+ if srcLeaf == dstLeaf {+ return src, nil+ }+ resp, err := f.renameFile(ctx, srcObj.file.URL, dstLeaf)if err != nil {return nil, fmt.Errorf("couldn't rename file: %w", err)}@@ -466,11 +471,16 @@ func (f *Fs) Move(ctx context.Context, src fs.Object, remote string) (fs.Object,}url = resp.URLs[0].URL} else {- folderID, err := strconv.Atoi(directoryID)+ dstFolderID, err := strconv.Atoi(dstDirectoryID)if err != nil {return nil, err}- resp, err := f.moveFile(ctx, srcObj.file.URL, folderID, leaf)+ rename := dstLeaf+ // No rename needed+ if srcLeaf == dstLeaf {+ rename = ""+ }+ resp, err := f.moveFile(ctx, srcObj.file.URL, dstFolderID, rename)if err != nil {return nil, fmt.Errorf("couldn't move file: %w", err)}