potyarkin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

operations: call Rcat in Copy when size is -1 - #2832

Browse source
This commit is contained in:
Cnly 2019-01-07 16:26:53 +08:00 • committed by Nick Craig-Wood
parent 6e153781a7
commit b8b53901e8
1 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
fs/operations/operations.go
View file

@ -287,23 +287,34 @@ func Copy(f fs.Fs, dst fs.Object, remote string, src fs.Object) (newDst fs.Objec
if err != nil { if err != nil {
err = errors.Wrap(err, "failed to open source object") err = errors.Wrap(err, "failed to open source object")
} else { } else {
in := accounting.NewAccount(in0, src).WithBuffer() // account and buffer the transfer if src.Size() == -1 {
var wrappedSrc fs.ObjectInfo = src // -1 indicates unknown size. Use Rcat to handle both remotes supporting and not supporting PutStream.
// We try to pass the original object if possible if doUpdate {
if src.Remote() != remote { actionTaken = "Copied (Rcat, replaced existing)"
wrappedSrc = &overrideRemoteObject{Object: src, remote: remote} } else {
} actionTaken = "Copied (Rcat, new)"
if doUpdate { }
actionTaken = "Copied (replaced existing)" dst, err = Rcat(f, remote, in0, src.ModTime())
err = dst.Update(in, wrappedSrc, hashOption)
} else {
actionTaken = "Copied (new)"
dst, err = f.Put(in, wrappedSrc, hashOption)
}
closeErr := in.Close()
if err == nil {
newDst = dst newDst = dst
err = closeErr } else {
in := accounting.NewAccount(in0, src).WithBuffer() // account and buffer the transfer
var wrappedSrc fs.ObjectInfo = src
// We try to pass the original object if possible
if src.Remote() != remote {
wrappedSrc = &overrideRemoteObject{Object: src, remote: remote}
}
if doUpdate {
actionTaken = "Copied (replaced existing)"
err = dst.Update(in, wrappedSrc, hashOption)
} else {
actionTaken = "Copied (new)"
dst, err = f.Put(in, wrappedSrc, hashOption)
}
closeErr := in.Close()
if err == nil {
newDst = dst
err = closeErr
}
} }
} }
} }