Improve non-TTY output for progress indicators with status bars.

LawnGnome · LawnGnome · commit 19b6ec559f32 · 2020-10-07T17:31:38.000-07:00
diff --git a/internal/output/progress_with_status_bars.go b/internal/output/progress_with_status_bars.go
@@ -15,7 +15,7 @@ func newProgressWithStatusBars(bars []ProgressBar, statusBars []*StatusBar, o *O
 	}
 
 	if !o.caps.Isatty {
-		newProgressWithStatusBarsSimple(barPtrs, statusBars, o)
+		return newProgressWithStatusBarsSimple(barPtrs, statusBars, o)
 	}
 
 	return newProgressWithStatusBarsTTY(barPtrs, statusBars, o, opts)
diff --git a/internal/output/progress_with_status_bars_simple.go b/internal/output/progress_with_status_bars_simple.go
@@ -16,6 +16,28 @@ func (p *progressWithStatusBarsSimple) Complete() {
 	writeStatusBars(p.Output, p.statusBars)
 }
 
+func (p *progressWithStatusBarsSimple) StatusBarUpdatef(i int, format string, args ...interface{}) {
+	if p.statusBars[i] != nil {
+		p.statusBars[i].Updatef(format, args...)
+	}
+}
+
+func (p *progressWithStatusBarsSimple) StatusBarCompletef(i int, format string, args ...interface{}) {
+	if p.statusBars[i] != nil {
+		wasComplete := p.statusBars[i].completed
+		p.statusBars[i].Completef(format, args...)
+		if !wasComplete {
+			writeStatusBar(p.Output, p.statusBars[i])
+		}
+	}
+}
+
+func (p *progressWithStatusBarsSimple) StatusBarResetf(i int, label, format string, args ...interface{}) {
+	if p.statusBars[i] != nil {
+		p.statusBars[i].Resetf(label, format, args...)
+	}
+}
+
 func newProgressWithStatusBarsSimple(bars []*ProgressBar, statusBars []*StatusBar, o *Output) *progressWithStatusBarsSimple {
 	p := &progressWithStatusBarsSimple{
 		progressSimple: &progressSimple{
@@ -35,6 +57,7 @@ func newProgressWithStatusBarsSimple(bars []*ProgressBar, statusBars []*StatusBa
 			case <-ticker.C:
 				if p.Output.opts.Verbose {
 					writeBars(p.Output, p.bars)
+					writeStatusBars(p.Output, p.statusBars)
 				}
 
 			case c := <-p.done:

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func newProgressWithStatusBars(bars []ProgressBar, statusBars []StatusBar, o O`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`if !o.caps.Isatty {`
`18`		`- newProgressWithStatusBarsSimple(barPtrs, statusBars, o)`
	`18`	`+ return newProgressWithStatusBarsSimple(barPtrs, statusBars, o)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`return newProgressWithStatusBarsTTY(barPtrs, statusBars, o, opts)`