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

operations: factor CommonHash out of Copy for re-use elsewhere

Browse source
This commit is contained in:
Nick Craig-Wood 2020-02-13 14:24:00 +00:00
parent bd9fd629bc
commit f45425e5a9
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
fs/operations/operations.go
View file

@ -321,6 +321,22 @@ func (o *OverrideRemote) GetTier() string {
// Check all optional interfaces satisfied // Check all optional interfaces satisfied
var _ fs.FullObjectInfo = (*OverrideRemote)(nil) var _ fs.FullObjectInfo = (*OverrideRemote)(nil)
// CommonHash returns a single hash.Type and a HashOption with that
// type which is in common between the two fs.Fs.
func CommonHash(fa, fb fs.Info) (hash.Type, *fs.HashesOption) {
// work out which hash to use - limit to 1 hash in common
var common hash.Set
hashType := hash.None
if !fs.Config.IgnoreChecksum {
common = fb.Hashes().Overlap(fa.Hashes())
if common.Count() > 0 {
hashType = common.GetOne()
common = hash.Set(hashType)
}
}
return hashType, &fs.HashesOption{Hashes: common}
}
// Copy src object to dst or f if nil. If dst is nil then it uses // Copy src object to dst or f if nil. If dst is nil then it uses
// remote as the name of the new object. // remote as the name of the new object.
// //
@ -339,17 +355,8 @@ func Copy(ctx context.Context, f fs.Fs, dst fs.Object, remote string, src fs.Obj
maxTries := fs.Config.LowLevelRetries maxTries := fs.Config.LowLevelRetries
tries := 0 tries := 0
doUpdate := dst != nil doUpdate := dst != nil
// work out which hash to use - limit to 1 hash in common hashType, hashOption := CommonHash(f, src.Fs())
var common hash.Set
hashType := hash.None
if !fs.Config.IgnoreChecksum {
common = src.Fs().Hashes().Overlap(f.Hashes())
if common.Count() > 0 {
hashType = common.GetOne()
common = hash.Set(hashType)
}
}
hashOption := &fs.HashesOption{Hashes: common}
var actionTaken string var actionTaken string
for { for {
// Try server side copy first - if has optional interface and // Try server side copy first - if has optional interface and