progress demo tweaks (#371)

Author: jedib0t

cmd/demo-progress/demo.go

@@ -13,6 +13,7 @@ import (
 
 var (
 	flagAutoStop           = flag.Bool("auto-stop", false, "Auto-stop rendering?")
+	flagCustomRenderer     = flag.Bool("custom-renderer", false, "Use custom render functions with rainbow colors")
 	flagHideETA            = flag.Bool("hide-eta", false, "Hide the ETA?")
 	flagHideETAOverall     = flag.Bool("hide-eta-overall", false, "Hide the ETA in the overall tracker?")
 	flagHideOverallTracker = flag.Bool("hide-overall", false, "Hide the Overall Tracker?")
@@ -27,7 +28,6 @@ var (
 	flagRandomDefer        = flag.Bool("rnd-defer", false, "Introduce random deferred starts")
 	flagRandomRemove       = flag.Bool("rnd-remove", false, "Introduce random remove of trackers on completion")
 	flagRandomLogs         = flag.Bool("rnd-logs", false, "Output random logs in the middle of tracking")
-	flagCustomRender       = flag.Bool("custom-render", false, "Use custom render functions with rainbow colors")
 
 	messageColors = []text.Color{
 		text.FgRed,
@@ -42,6 +42,51 @@ var (
 	timeStart = time.Now()
 )
 
+// customTrackerDeterminateRenderer creates a progress bar using rainbow colors for determinate progress
+func customTrackerDeterminateRenderer(value int64, total int64, maxLen int) string {
+	progress := float64(value) / float64(total)
+	completed := int(progress * float64(maxLen))
+
+	var result strings.Builder
+	for i := 0; i < maxLen; i++ {
+		if i < completed {
+			// Use rainbow colors based on position in the progress bar
+			colorIdx := (i * 6) / maxLen // Map position to 6 rainbow colors
+			colors := []text.Color{
+				text.FgRed,
+				text.FgYellow,
+				text.FgGreen,
+				text.FgCyan,
+				text.FgBlue,
+				text.FgMagenta,
+			}
+			if colorIdx >= len(colors) {
+				colorIdx = len(colors) - 1
+			}
+			result.WriteString(colors[colorIdx].Sprint("█"))
+		} else {
+			result.WriteString(text.FgHiBlack.Sprint("░"))
+		}
+	}
+
+	return result.String()
+}
+
+// customTrackerIndeterminateRenderer creates a progress bar using rotating rainbow colors for indeterminate progress
+func customTrackerIndeterminateRenderer(maxLen int) string {
+	// For indeterminate progress, use rotating rainbow colors
+	colors := []text.Color{
+		text.FgRed,
+		text.FgYellow,
+		text.FgGreen,
+		text.FgCyan,
+		text.FgBlue,
+		text.FgMagenta,
+	}
+	idx := int(time.Now().UnixNano()/100000000) % len(colors)
+	return colors[idx].Sprint(strings.Repeat("█", maxLen))
+}
+
 func getMessage(idx int64, units *progress.Units) string {
 	var message string
 	switch units {
@@ -121,51 +166,6 @@ func trackSomething(pw progress.Writer, idx int64, updateMessage bool) {
 	}
 }
 
-// customTrackerRender creates a progress bar using rainbow colors for determinate progress
-func customTrackerRender(value int64, total int64, maxLen int) string {
-	progress := float64(value) / float64(total)
-	completed := int(progress * float64(maxLen))
-
-	var result strings.Builder
-	for i := 0; i < maxLen; i++ {
-		if i < completed {
-			// Use rainbow colors based on position in the progress bar
-			colorIdx := (i * 6) / maxLen // Map position to 6 rainbow colors
-			colors := []text.Color{
-				text.FgRed,
-				text.FgYellow,
-				text.FgGreen,
-				text.FgCyan,
-				text.FgBlue,
-				text.FgMagenta,
-			}
-			if colorIdx >= len(colors) {
-				colorIdx = len(colors) - 1
-			}
-			result.WriteString(colors[colorIdx].Sprint("█"))
-		} else {
-			result.WriteString(text.FgHiBlack.Sprint("░"))
-		}
-	}
-
-	return result.String()
-}
-
-// customTrackerIndeterminateRender creates a progress bar using rotating rainbow colors for indeterminate progress
-func customTrackerIndeterminateRender(maxLen int) string {
-	// For indeterminate progress, use rotating rainbow colors
-	colors := []text.Color{
-		text.FgRed,
-		text.FgYellow,
-		text.FgGreen,
-		text.FgCyan,
-		text.FgBlue,
-		text.FgMagenta,
-	}
-	idx := int(time.Now().UnixNano()/100000000) % len(colors)
-	return colors[idx].Sprint(strings.Repeat("█", maxLen))
-}
-
 func main() {
 	flag.Parse()
 	fmt.Printf("Tracking Progress of %d trackers ...\n\n", *flagNumTrackers)
@@ -193,10 +193,9 @@ func main() {
 	pw.Style().Visibility.Pinned = *flagShowPinned
 
 	// set up custom render functions if flag is enabled
-	if *flagCustomRender {
-		pw.Style().Renderer.TrackerDeterminate = customTrackerRender
-		pw.Style().Renderer.TrackerIndeterminate = customTrackerIndeterminateRender
-		fmt.Println("Using custom render functions with rainbow colors!")
+	if *flagCustomRenderer {
+		pw.Style().Renderer.TrackerDeterminate = customTrackerDeterminateRenderer
+		pw.Style().Renderer.TrackerIndeterminate = customTrackerIndeterminateRenderer
 	}
 
 	// call Render() in async mode; yes we don't have any trackers at the moment