"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
operations: fix files moved by rclone move not being counted as transfers
Nick Craig-Woodfbdf71ab6456
diff --git a/fs/operations/operations.go b/fs/operations/operations.goindex a7e2f6d50..62d03ab37 100644--- a/fs/operations/operations.go+++ b/fs/operations/operations.go@@ -332,9 +332,29 @@ func SameObject(src, dst fs.Object) bool {//// It returns the destination object if possible. Note that this may// be nil.+//+// This is accounted as a check.func Move(ctx context.Context, fdst fs.Fs, dst fs.Object, remote string, src fs.Object) (newDst fs.Object, err error) {+ return move(ctx, fdst, dst, remote, src, false)+}++// MoveTransfer moves src object to dst or fdst if nil. If dst is nil+// then it uses remote as the name of the new object.+//+// This is identical to Move but is accounted as a transfer.+func MoveTransfer(ctx context.Context, fdst fs.Fs, dst fs.Object, remote string, src fs.Object) (newDst fs.Object, err error) {+ return move(ctx, fdst, dst, remote, src, true)+}++// move - see Move for help+func move(ctx context.Context, fdst fs.Fs, dst fs.Object, remote string, src fs.Object, isTransfer bool) (newDst fs.Object, err error) {ci := fs.GetConfig(ctx)- tr := accounting.Stats(ctx).NewCheckingTransfer(src, "moving")+ var tr *accounting.Transfer+ if isTransfer {+ tr = accounting.Stats(ctx).NewTransfer(src)+ } else {+ tr = accounting.Stats(ctx).NewCheckingTransfer(src, "moving")+ }defer func() {if err == nil {accounting.Stats(ctx).Renames(1)@@ -1695,7 +1715,7 @@ func moveOrCopyFile(ctx context.Context, fdst fs.Fs, fsrc fs.Fs, dstFileName str}// Choose operations- Op := Move+ Op := MoveTransferif cp {Op = Copy}@@ -1797,6 +1817,8 @@ func moveOrCopyFile(ctx context.Context, fdst fs.Fs, fsrc fs.Fs, dstFileName str}// MoveFile moves a single file possibly to a new name+//+// This is treated as a transfer.func MoveFile(ctx context.Context, fdst fs.Fs, fsrc fs.Fs, dstFileName string, srcFileName string) (err error) {return moveOrCopyFile(ctx, fdst, fsrc, dstFileName, srcFileName, false)}diff --git a/fs/sync/sync.go b/fs/sync/sync.goindex 255dfaf1a..18a8b67b7 100644--- a/fs/sync/sync.go+++ b/fs/sync/sync.go@@ -437,7 +437,7 @@ func (s *syncCopyMove) pairCopyOrMove(ctx context.Context, in *pipe, fdst fs.Fs,dst := pair.Dstif s.DoMove {if src != dst {- _, err = operations.Move(ctx, fdst, dst, src.Remote(), src)+ _, err = operations.MoveTransfer(ctx, fdst, dst, src.Remote(), src)} else {// src == dst signals delete the srcerr = operations.DeleteFile(ctx, src)