TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

copy: account for server side copy bytes and obey --max-transfer

Browse source
This commit is contained in:
Nick Craig-Wood 2019-03-20 17:17:15 +00:00
parent 9ee9fe3885
commit 626f0d1886
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/operations/operations.go
View file

@ -274,9 +274,14 @@ func Copy(f fs.Fs, dst fs.Object, remote string, src fs.Object) (newDst fs.Objec
// is same underlying remote // is same underlying remote
actionTaken = "Copied (server side copy)" actionTaken = "Copied (server side copy)"
if doCopy := f.Features().Copy; doCopy != nil && (SameConfig(src.Fs(), f) || (SameRemoteType(src.Fs(), f) && f.Features().ServerSideAcrossConfigs)) { if doCopy := f.Features().Copy; doCopy != nil && (SameConfig(src.Fs(), f) || (SameRemoteType(src.Fs(), f) && f.Features().ServerSideAcrossConfigs)) {
// Check transfer limit for server side copies
if fs.Config.MaxTransfer >= 0 && accounting.Stats.GetBytes() >= int64(fs.Config.MaxTransfer) {
return nil, accounting.ErrorMaxTransferLimitReached
}
newDst, err = doCopy(src, remote) newDst, err = doCopy(src, remote)
if err == nil { if err == nil {
dst = newDst dst = newDst
accounting.Stats.Bytes(dst.Size()) // account the bytes for the server side transfer
} }
} else { } else {
err = fs.ErrorCantCopy err = fs.ErrorCantCopy