From add3e4d888d1b6417f6f17021f4f252c58ca829f Mon Sep 17 00:00:00 2001 From: linhaotong Date: Sat, 29 Apr 2023 15:55:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(hash):=20=E4=BF=AE=E5=A4=8D=E5=B9=B6?= =?UTF-8?q?=E5=8F=91=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/hash.go | 1 + cmd/unitmainImpl.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/hash.go b/cmd/hash.go index b804e24..ba92c3f 100644 --- a/cmd/hash.go +++ b/cmd/hash.go @@ -40,6 +40,7 @@ func (r *FileHash) Hash(h hash.Hash) (s string, err error) { if _, err = r.File.Seek(0, 0); err != nil { return } + h.Reset() r.ProgressRecorder.Reset() if _, err = r.copyBuffer(h, r.File, buf); err != nil { if err == errStop { diff --git a/cmd/unitmainImpl.go b/cmd/unitmainImpl.go index 6ad2469..430b0bd 100644 --- a/cmd/unitmainImpl.go +++ b/cmd/unitmainImpl.go @@ -283,7 +283,7 @@ showResult: info.WriteString(fmt.Sprintf("%s: %s\r\n", hashAlg.Name, s)) } } - info.WriteString(fmt.Sprintf("总耗时: %s\r\n", time.Since(t))) - info.WriteString(fmt.Sprintf("平均速度: %s/s\r\n", humanize.IBytes(uint64(float64(fileInfo.Size())/time.Since(t).Seconds())))) + info.WriteString(fmt.Sprintf("耗时: %s\r\n", time.Since(t))) + info.WriteString(fmt.Sprintf("速度: %s/s\r\n", humanize.IBytes(uint64(float64(fileInfo.Size())/time.Since(t).Seconds())))) f.MemoLogger.Lines().Add(info.String()) }