lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix humanize's FormatByteRate() to work with 0s duration

Browse Source 
On Windows, occasionally:

t := time.Now()
...
humanize.FormatByteRate(size, time.Since(t))

will result in time.Since returning 0. This commit clamps the duration to be
at least 1 nanosecond.
This commit is contained in:
Arran Walker 2018-10-24 14:57:05 +00:00
parent a6add718c8
commit 41ab43cbe6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/humanize/humanize.go
View File

@ -146,7 +146,7 @@ func FormatByteRate(s uint64, d time.Duration) string {
f := float64(s)
if f != 0 {
f = f / d.Seconds()
f = f / math.Max(time.Nanosecond.Seconds(), d.Seconds())
e = math.Floor(log(f, 1000))
if e <= eps {
// The result of math.Floor(log(r, 1000)) can be

3
tools/humanize/humanize_test.go
View File

@ -273,7 +273,8 @@ func TestFormateByteRate(t *testing.T) {
"format petabytes exact": {uint64(1.3 * math.Pow(10, 12)), time.Second, "1.3 TB/s"},
"format terabytes exact": {uint64(1.3 * math.Pow(10, 15)), time.Second, "1.3 PB/s"},
"format bytes (non-second)": {uint64(10 * math.Pow(10, 0)), 2 * time.Second, "5 B/s"},
"format bytes (non-second)": {uint64(10 * math.Pow(10, 0)), 2 * time.Second, "5 B/s"},
"format bytes (zero-second)": {uint64(10 * math.Pow(10, 0)), 0, "10 GB/s"},
} {
t.Run(desc, c.Assert)
}