From b6468a2eeda78ca0e7beaf067e740c880139fc01 Mon Sep 17 00:00:00 2001 From: Thorsten Ball Date: Mon, 13 Jul 2020 11:51:57 +0200 Subject: [PATCH 1/3] Remove unused dependency in ActionLogger --- internal/campaigns/logger.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/campaigns/logger.go b/internal/campaigns/logger.go index eafdef5b00..b49dc9d1f2 100644 --- a/internal/campaigns/logger.go +++ b/internal/campaigns/logger.go @@ -31,8 +31,6 @@ type ActionLogger struct { verbose bool keepLogs bool - highlight func(a ...interface{}) string - progress *progress out io.WriteCloser @@ -50,10 +48,9 @@ func NewActionLogger(verbose, keepLogs bool) *ActionLogger { progress := new(progress) return &ActionLogger{ - verbose: verbose, - keepLogs: keepLogs, - highlight: color.New(color.Bold, color.FgGreen).SprintFunc(), - progress: progress, + verbose: verbose, + keepLogs: keepLogs, + progress: progress, out: &progressWriter{ p: progress, w: os.Stderr, From 7cd3fee3cc54ffdcfcd1b07fa1cc7ad46ce09d69 Mon Sep 17 00:00:00 2001 From: Thorsten Ball Date: Mon, 13 Jul 2020 11:52:11 +0200 Subject: [PATCH 2/3] Fix typo --- internal/campaigns/logger.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/campaigns/logger.go b/internal/campaigns/logger.go index b49dc9d1f2..4be28098a8 100644 --- a/internal/campaigns/logger.go +++ b/internal/campaigns/logger.go @@ -374,10 +374,10 @@ func (w *progressWriter) Write(data []byte) (int, error) { bar += ">" } bar += strings.Repeat(" ", maxLength-len(bar)) - progessText := fmt.Sprintf("[%s] Steps: %d/%d (%s, %s)", bar, w.p.StepsComplete(), w.p.TotalSteps(), boldRed.Sprintf("%d failed", w.p.TotalStepsFailed()), hiGreen.Sprintf("%d patches", w.p.PatchCount())) - fmt.Fprint(w.w, progessText) + progressText := fmt.Sprintf("[%s] Steps: %d/%d (%s, %s)", bar, w.p.StepsComplete(), w.p.TotalSteps(), boldRed.Sprintf("%d failed", w.p.TotalStepsFailed()), hiGreen.Sprintf("%d patches", w.p.PatchCount())) + fmt.Fprint(w.w, progressText) w.shouldClear = true - w.progressLogLength = len(progessText) + w.progressLogLength = len(progressText) return n, err } From 91de8ec03c2cb2c3f6682ca5736279979cc7181e Mon Sep 17 00:00:00 2001 From: Thorsten Ball Date: Mon, 13 Jul 2020 11:52:20 +0200 Subject: [PATCH 3/3] Show progress bar even when printed text has color --- internal/campaigns/logger.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/campaigns/logger.go b/internal/campaigns/logger.go index 4be28098a8..c0ddc9a4c6 100644 --- a/internal/campaigns/logger.go +++ b/internal/campaigns/logger.go @@ -352,7 +352,7 @@ func (w *progressWriter) Write(data []byte) (int, error) { return w.w.Write(data) } - if !bytes.HasSuffix(data, []byte("\n")) { + if !bytes.HasSuffix(data, []byte("\n")) && !bytes.HasSuffix(data, []byte("\n\x1b[0m")) { w.shouldClear = false return w.w.Write(data) }