Merge pull request #136 from howeyc/long-running

schollz · web-flow · commit 9ee549ee41a6 · 2022-09-03T07:18:27.000-07:00
Handle very-slow iterations
diff --git a/progressbar.go b/progressbar.go
@@ -747,8 +747,10 @@ func renderProgressBar(c config, s *state) (int, error) {
 		}
 		if averageRate > 1 {
 			bytesString += fmt.Sprintf("%0.0f %s/s", averageRate, c.iterationString)
-		} else {
+		} else if averageRate*60 > 1 {
 			bytesString += fmt.Sprintf("%0.0f %s/min", 60*averageRate, c.iterationString)
+		} else {
+			bytesString += fmt.Sprintf("%0.0f %s/hr", 3600*averageRate, c.iterationString)
 		}
 	}
 	if bytesString != "" {

Original file line number	Diff line number	Diff line change
`@@ -747,8 +747,10 @@ func renderProgressBar(c config, s *state) (int, error) {`
`747`	`747`	`}`
`748`	`748`	`if averageRate > 1 {`
`749`	`749`	`bytesString += fmt.Sprintf("%0.0f %s/s", averageRate, c.iterationString)`
`750`		`- } else {`
	`750`	`+ } else if averageRate*60 > 1 {`
`751`	`751`	`bytesString += fmt.Sprintf("%0.0f %s/min", 60*averageRate, c.iterationString)`
	`752`	`+ } else {`
	`753`	`+ bytesString += fmt.Sprintf("%0.0f %s/hr", 3600*averageRate, c.iterationString)`
`752`	`754`	`}`
`753`	`755`	`}`
`754`	`756`	`if bytesString != "" {`