Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

operations: fix TransformFile when can't server-side copy/move

nielash359260c49dea
diff --git a/fs/operations/operations.go b/fs/operations/operations.go
index d8366c252..f89284c4f 100644
--- a/fs/operations/operations.go
+++ b/fs/operations/operations.go
@@ -493,6 +493,9 @@ func move(ctx context.Context, fdst fs.Fs, dst fs.Object, remote string, src fs.
}
}
// Move not found or didn't work so copy dst <- src
+ if origRemote != remote {
+ dst = nil
+ }
newDst, err = Copy(ctx, fdst, dst, origRemote, src)
if err != nil {
fs.Errorf(src, "Not deleting source as copy failed: %v", err)
diff --git a/fs/sync/sync_transform_test.go b/fs/sync/sync_transform_test.go
index 0c81f9ed2..8d0621095 100644
--- a/fs/sync/sync_transform_test.go
+++ b/fs/sync/sync_transform_test.go
@@ -437,6 +437,36 @@ func TestTransformFile(t *testing.T) {
r.CheckRemoteListing(t, []fstest.Item{fstest.NewItem("toe/toe/toe.txt", "hello world", t1)}, []string{"tictacempty_dir", "tictactoe", "tictactoe/tictactoe", "toe", "toe/toe"})
}
+func TestManualTransformFile(t *testing.T) {
+ ctx := context.Background()
+ r := fstest.NewRun(t)
+
+ r.Flocal.Features().DisableList([]string{"Copy", "Move"})
+ r.Fremote.Features().DisableList([]string{"Copy", "Move"})
+
+ err := transform.SetOptions(ctx, "all,prefix=tac", "all,prefix=tic")
+ require.NoError(t, err)
+ r.WriteFile("toe/toe/toe.txt", "hello world", t1)
+ _, err = operations.MkdirModTime(ctx, r.Flocal, "empty_dir", t1)
+ require.NoError(t, err)
+
+ r.Mkdir(ctx, r.Fremote)
+ ctx = predictDstFromLogger(ctx)
+ err = MoveDir(ctx, r.Fremote, r.Flocal, true, true)
+ testLoggerVsLsf(ctx, r.Fremote, r.Flocal, operations.GetLoggerOpt(ctx).JSON, t)
+ require.NoError(t, err)
+
+ r.CheckLocalListing(t, []fstest.Item{}, []string{})
+ r.CheckRemoteListing(t, []fstest.Item{fstest.NewItem("tictactoe/tictactoe/tictactoe.txt", "hello world", t1)}, []string{"tictacempty_dir", "tictactoe", "tictactoe/tictactoe"})
+
+ err = transform.SetOptions(ctx, "all,trimprefix=tic", "all,trimprefix=tac")
+ require.NoError(t, err)
+ err = operations.TransformFile(ctx, r.Fremote, "tictactoe/tictactoe/tictactoe.txt")
+ require.NoError(t, err)
+ r.CheckLocalListing(t, []fstest.Item{}, []string{})
+ r.CheckRemoteListing(t, []fstest.Item{fstest.NewItem("toe/toe/toe.txt", "hello world", t1)}, []string{"tictacempty_dir", "tictactoe", "tictactoe/tictactoe", "toe", "toe/toe"})
+}
+
func TestBase64(t *testing.T) {
ctx := context.Background()
r := fstest.NewRun(t)