"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
combine: fix operations.DirMove across upstreams - fixes #7661
nielash431524445eaf
diff --git a/fs/operations/operations.go b/fs/operations/operations.goindex 116f291e8..1d950e40c 100644--- a/fs/operations/operations.go+++ b/fs/operations/operations.go@@ -2310,7 +2310,10 @@ func DirMove(ctx context.Context, f fs.Fs, srcRemote, dstRemote string) (err errif err == nil {accounting.Stats(ctx).Renames(1)}- return err+ if err != fs.ErrorCantDirMove && err != fs.ErrorDirExists {+ return err+ }+ fs.Infof(f, "Can't DirMove - falling back to file moves: %v", err)}// Load the directory tree into memorydiff --git a/fs/operations/operations_test.go b/fs/operations/operations_test.goindex 4f4cf4cfd..98676ae26 100644--- a/fs/operations/operations_test.go+++ b/fs/operations/operations_test.go@@ -1405,6 +1405,33 @@ func TestDirMove(t *testing.T) {fs.GetModifyWindow(ctx, r.Fremote),)+ // Try with a DirMove method that exists but returns fs.ErrorCantDirMove (ex. combine moving across upstreams)+ // Should fall back to manual move (copy + delete)++ features.DirMove = func(ctx context.Context, src fs.Fs, srcRemote string, dstRemote string) error {+ return fs.ErrorCantDirMove+ }++ assert.NoError(t, operations.DirMove(ctx, r.Fremote, "A3", "A4"))++ for i := range files {+ files[i].Path = strings.ReplaceAll(files[i].Path, "A3/", "A4/")+ }++ fstest.CheckListingWithPrecision(+ t,+ r.Fremote,+ files,+ []string{+ "A4",+ "A4/B1",+ "A4/B2",+ "A4/B1/C1",+ "A4/B1/C2",+ "A4/B1/C3",+ },+ fs.GetModifyWindow(ctx, r.Fremote),+ )}func TestGetFsInfo(t *testing.T) {