"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
moveOrCopyFile: avoid panic on --dry-run
nielash88e516adee46
diff --git a/fs/operations/operations.go b/fs/operations/operations.goindex efa3d4bab..b71e6adc5 100644--- a/fs/operations/operations.go+++ b/fs/operations/operations.go@@ -1770,6 +1770,10 @@ func moveOrCopyFile(ctx context.Context, fdst fs.Fs, fsrc fs.Fs, dstFileName str// move it back to the intended destination. This is required// to avoid issues with certain remotes and avoid file deletion.if !cp && fdst.Name() == fsrc.Name() && fdst.Features().CaseInsensitive && dstFileName != srcFileName && strings.EqualFold(dstFilePath, srcFilePath) {+ if SkipDestructive(ctx, srcFileName, "rename to "+dstFileName) {+ // avoid fatalpanic on --dry-run (trying to access non-existent tmpObj)+ return nil+ }// Create random name to temporarily move file totmpObjName := dstFileName + "-rclone-move-" + random.String(8)tmpObjFail, err := fdst.NewObject(ctx, tmpObjName)diff --git a/fs/operations/operations_test.go b/fs/operations/operations_test.goindex 19d58ea30..325db1748 100644--- a/fs/operations/operations_test.go+++ b/fs/operations/operations_test.go@@ -997,6 +997,23 @@ func TestCaseInsensitiveMoveFile(t *testing.T) {r.CheckRemoteItems(t, file2Capitalized)}+func TestCaseInsensitiveMoveFileDryRun(t *testing.T) {+ ctx := context.Background()+ ctx, ci := fs.AddConfig(ctx)+ r := fstest.NewRun(t)+ if !r.Fremote.Features().CaseInsensitive {+ return+ }++ ci.DryRun = true+ file1 := r.WriteObject(ctx, "hello", "world", t1)+ r.CheckRemoteItems(t, file1)++ err := operations.MoveFile(ctx, r.Fremote, r.Fremote, "HELLO", file1.Path)+ require.NoError(t, err)+ r.CheckRemoteItems(t, file1)+}+func TestMoveFileBackupDir(t *testing.T) {ctx := context.Background()ctx, ci := fs.AddConfig(ctx)