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

hasher: look for cached hash if passed hash unexpectedly blank

nielash9b650d35179b
diff --git a/backend/hasher/object.go b/backend/hasher/object.go
index ef6349b0f..1003807c8 100644
--- a/backend/hasher/object.go
+++ b/backend/hasher/object.go
@@ -71,7 +71,14 @@ func (o *Object) Hash(ctx context.Context, hashType hash.Type) (hashVal string,
f := o.f
if f.passHashes.Contains(hashType) {
fs.Debugf(o, "pass %s", hashType)
- return o.Object.Hash(ctx, hashType)
+ hashVal, err = o.Object.Hash(ctx, hashType)
+ if hashVal != "" {
+ return hashVal, err
+ }
+ if err != nil {
+ fs.Debugf(o, "error passing %s: %v", hashType, err)
+ }
+ fs.Debugf(o, "passed %s is blank -- trying other methods", hashType)
}
if !f.suppHashes.Contains(hashType) {
fs.Debugf(o, "unsupp %s", hashType)