diff options
Diffstat (limited to 'helpers')
| -rw-r--r-- | helpers/general.go | 7 | ||||
| -rw-r--r-- | helpers/general_test.go | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/helpers/general.go b/helpers/general.go index cfabab5a9..00caf1ecc 100644 --- a/helpers/general.go +++ b/helpers/general.go @@ -394,11 +394,10 @@ func MD5FromFileFast(r io.ReadSeeker) (string, error) { return hex.EncodeToString(h.Sum(nil)), nil } -// MD5FromFile creates a MD5 hash from the given file. -// It will not close the file. -func MD5FromFile(f afero.File) (string, error) { +// MD5FromReader creates a MD5 hash from the given reader. +func MD5FromReader(r io.Reader) (string, error) { h := md5.New() - if _, err := io.Copy(h, f); err != nil { + if _, err := io.Copy(h, r); err != nil { return "", nil } return hex.EncodeToString(h.Sum(nil)), nil diff --git a/helpers/general_test.go b/helpers/general_test.go index 08fe4890e..1279df439 100644 --- a/helpers/general_test.go +++ b/helpers/general_test.go @@ -272,7 +272,7 @@ func TestFastMD5FromFile(t *testing.T) { req.NoError(err) req.NotEqual(m3, m4) - m5, err := MD5FromFile(bf2) + m5, err := MD5FromReader(bf2) req.NoError(err) req.NotEqual(m4, m5) } @@ -293,7 +293,7 @@ func BenchmarkMD5FromFileFast(b *testing.B) { } b.StartTimer() if full { - if _, err := MD5FromFile(f); err != nil { + if _, err := MD5FromReader(f); err != nil { b.Fatal(err) } } else { |