Use the newer/better progress bar API that includes max on screen update rate to not slow down downloads (#162)

ldemailly · web-flow · commit 18838ffdcf8b · 2025-03-12T11:17:34.000-07:00
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.20
 require (
 	fortio.org/cli v1.9.2
 	fortio.org/log v1.17.1
-	fortio.org/progressbar v0.6.0
+	fortio.org/progressbar v0.7.0
 	fortio.org/testscript v0.3.2
 	fortio.org/version v1.0.4
 )
diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ fortio.org/cli v1.9.2 h1:17eJ8QZPjXHcLBpeCe0QMO/0fj5Bw0ZTxVgL7V9jOqc=
 fortio.org/cli v1.9.2/go.mod h1:7r55OoTV8NXcTvJT4boWk8s3I2LP6TMZh/0LLMJEYw0=
 fortio.org/log v1.17.1 h1:YQoGyZBnXTVIs77/nZw7BppwSOIamP3I092PGBenBZs=
 fortio.org/log v1.17.1/go.mod h1:t58Spg9njjymvRioh5F6qKGSupEsnMjXLGWIS1i3khE=
-fortio.org/progressbar v0.6.0 h1:3v046h92YsWnBLEghtx1d2pBLLqNvMzMA4ANU0rZFXg=
-fortio.org/progressbar v0.6.0/go.mod h1:VZJJVUViaL7WqlQrB8jeeewVM+BTQBLzZ/KTJX+NZF4=
+fortio.org/progressbar v0.7.0 h1:aijGyCAem5nJWPkuth2qh1HPgRFgNby4Lp4Lh/2PIRg=
+fortio.org/progressbar v0.7.0/go.mod h1:VZJJVUViaL7WqlQrB8jeeewVM+BTQBLzZ/KTJX+NZF4=
 fortio.org/struct2env v0.4.1 h1:rJludAMO5eBvpWplWEQNqoVDFZr4RWMQX7RUapgZyc0=
 fortio.org/struct2env v0.4.1/go.mod h1:lENUe70UwA1zDUCX+8AsO663QCFqYaprk5lnPhjD410=
 fortio.org/testscript v0.3.2 h1:ks5V+Y6H6nmeGqnVlZuLdiFwpqXemDkEnyGgCZa/ZNA=
diff --git a/mc/mc.go b/mc/mc.go
@@ -365,9 +365,9 @@ func oneRequest(i int, cfg *Config, result *ResultStats, addr net.IP,
 	}
 	reader := resp.Body
 	if !cfg.NoProgressBar {
-		pb := progressbar.NewAutoReader(resp.Body, resp.ContentLength)
-		pb.Prefix = fmt.Sprintf("%2d ", i)
-		reader = pb
+		bar := progressbar.NewBar()
+		bar.Prefix = fmt.Sprintf("%2d ", i)
+		reader = progressbar.NewAutoReader(bar, resp.Body, resp.ContentLength)
 	}
 	data, err := io.ReadAll(reader)
 	_ = reader.Close() // will close resp.Body too when using the progressbar wrapper.

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ go 1.20`
`5`	`5`	`require (`
`6`	`6`	`fortio.org/cli v1.9.2`
`7`	`7`	`fortio.org/log v1.17.1`
`8`		`- fortio.org/progressbar v0.6.0`
	`8`	`+ fortio.org/progressbar v0.7.0`
`9`	`9`	`fortio.org/testscript v0.3.2`
`10`	`10`	`fortio.org/version v1.0.4`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -365,9 +365,9 @@ func oneRequest(i int, cfg Config, result ResultStats, addr net.IP,`
`365`	`365`	`}`
`366`	`366`	`reader := resp.Body`
`367`	`367`	`if !cfg.NoProgressBar {`
`368`		`- pb := progressbar.NewAutoReader(resp.Body, resp.ContentLength)`
`369`		`- pb.Prefix = fmt.Sprintf("%2d ", i)`
`370`		`- reader = pb`
	`368`	`+ bar := progressbar.NewBar()`
	`369`	`+ bar.Prefix = fmt.Sprintf("%2d ", i)`
	`370`	`+ reader = progressbar.NewAutoReader(bar, resp.Body, resp.ContentLength)`
`371`	`371`	`}`
`372`	`372`	`data, err := io.ReadAll(reader)`
`373`	`373`	`_ = reader.Close() // will close resp.Body too when using the progressbar wrapper.`