From 0dacceea2eacf5294984acae2996f4e11ebb8254 Mon Sep 17 00:00:00 2001 From: Denis Romanov Date: Fri, 4 Nov 2022 23:00:51 +0300 Subject: [PATCH] Print saucer head in format string --- progressbar.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/progressbar.go b/progressbar.go index 1077be2..044350f 100644 --- a/progressbar.go +++ b/progressbar.go @@ -826,7 +826,6 @@ func renderProgressBar(c config, s *state) (int, error) { saucerHead = c.theme.SaucerHead s.isAltSaucerHead = true } - saucer += saucerHead } /* @@ -874,10 +873,11 @@ func renderProgressBar(c config, s *state) (int, error) { } } } else if rightBrac == "" { - str = fmt.Sprintf("%4d%% %s%s%s%s %s", + str = fmt.Sprintf("%4d%% %s%s%s%s%s %s", s.currentPercent, c.theme.BarStart, saucer, + saucerHead, strings.Repeat(c.theme.SaucerPadding, repeatAmount), c.theme.BarEnd, sb.String()) @@ -889,10 +889,11 @@ func renderProgressBar(c config, s *state) (int, error) { } } else { if s.currentPercent == 100 { - str = fmt.Sprintf("%4d%% %s%s%s%s %s", + str = fmt.Sprintf("%4d%% %s%s%s%s%s %s", s.currentPercent, c.theme.BarStart, saucer, + saucerHead, strings.Repeat(c.theme.SaucerPadding, repeatAmount), c.theme.BarEnd, sb.String()) @@ -906,10 +907,11 @@ func renderProgressBar(c config, s *state) (int, error) { str = fmt.Sprintf("\r%s%s", c.description, str) } } else { - str = fmt.Sprintf("%4d%% %s%s%s%s %s [%s:%s]", + str = fmt.Sprintf("%4d%% %s%s%s%s%s %s [%s:%s]", s.currentPercent, c.theme.BarStart, saucer, + saucerHead, strings.Repeat(c.theme.SaucerPadding, repeatAmount), c.theme.BarEnd, sb.String(),