From d8e69cacf20653ec6e04373863ba62a79728a925 Mon Sep 17 00:00:00 2001
From: Manuel Bua <manuel.bua@gmail.com>
Date: Sat, 25 Jul 2020 21:03:18 +0200
Subject: [PATCH] Pad bar name with spaces (approx. size due to escape codes)

---
 v2/internal/progress/progress.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/v2/internal/progress/progress.go b/v2/internal/progress/progress.go
index fa1d3b97..b40f1d2f 100644
--- a/v2/internal/progress/progress.go
+++ b/v2/internal/progress/progress.go
@@ -52,8 +52,8 @@ func (p *Progress) SetupTemplateProgressbar(templateId string, requestCount int6
 		uiBarName = uiBarName[:MaxLen] + ".."
 	}
 
-	barName := color.BrightYellow(uiBarName).String()
-	bar := p.setupProgressbar(barName, requestCount, priority)
+	uiBarName = fmt.Sprintf(fmt.Sprintf("%%-%ds", MaxLen), "[" + color.BrightYellow(uiBarName).String() + "]")
+	bar := p.setupProgressbar(uiBarName, requestCount, priority)
 
 	p.bars[templateId] = &Bar{
 		bar:          bar,
@@ -62,13 +62,6 @@ func (p *Progress) SetupTemplateProgressbar(templateId string, requestCount int6
 	}
 }
 
-func pluralize(count int64, singular, plural string) string {
-	if count > 1 {
-		return plural
-	}
-	return singular
-}
-
 // Creates and returns a progress bar that tracks all the requests progress.
 // This is only useful when multiple templates are processed within the same run.
 func (p *Progress) SetupGlobalProgressbar(hostCount int64, templateCount int, requestCount int64) {
@@ -85,7 +78,7 @@ func (p *Progress) SetupGlobalProgressbar(hostCount int64, templateCount int, re
 		color.Bold(color.Cyan(hostCount)),
 		pluralize(hostCount, "host", "hosts"))
 
-	bar := p.setupProgressbar(barName, requestCount, 0)
+	bar := p.setupProgressbar("[" + barName + "]", requestCount, 0)
 
 	p.gbar = &Bar{
 		bar:          bar,
@@ -94,6 +87,13 @@ func (p *Progress) SetupGlobalProgressbar(hostCount int64, templateCount int, re
 	}
 }
 
+func pluralize(count int64, singular, plural string) string {
+	if count > 1 {
+		return plural
+	}
+	return singular
+}
+
 // Update progress tracking information and increments the request counter by one unit.
 // If a global progress bar is present it will be updated as well.
 func (p *Progress) Update(templateId string) {
@@ -130,7 +130,7 @@ func (p *Progress) setupProgressbar(name string, total int64, priority int) *mpb
 		mpb.BarNoPop(),
 		mpb.BarRemoveOnComplete(),
 		mpb.PrependDecorators(
-			decor.Name(fmt.Sprintf("[%s]", name), decor.WCSyncSpaceR),
+			decor.Name(name, decor.WCSyncSpaceR),
 			decor.CountersNoUnit(color.BrightBlue(" %d/%d").String(), decor.WCSyncSpace),
 			decor.NewPercentage(color.Bold("%d").String(), decor.WCSyncSpace),
 		),