diff --git a/internal/commands/process/orchestrator/orchestrator.go b/internal/commands/process/orchestrator/orchestrator.go index 5a29a3199..d65809ad6 100644 --- a/internal/commands/process/orchestrator/orchestrator.go +++ b/internal/commands/process/orchestrator/orchestrator.go @@ -77,7 +77,7 @@ func (orchestrator *Orchestrator) Scan( } func (orchestrator *Orchestrator) waitForScan(fileComplete chan struct{}, totalCount int) { - progressBar := bearerprogress.GetProgressBar(totalCount, orchestrator.config, "files") + progressBar := bearerprogress.GetProgressBar(totalCount, orchestrator.config) count := 0 defer func() { diff --git a/internal/report/output/privacy/privacy.go b/internal/report/output/privacy/privacy.go index e07b4784d..6ed4ee316 100644 --- a/internal/report/output/privacy/privacy.go +++ b/internal/report/output/privacy/privacy.go @@ -108,7 +108,7 @@ func AddReportData(reportData *outputtypes.ReportData, config settings.Config) e output.StdErrLog("Evaluating rules") } - bar := progressbar.GetProgressBar(len(config.Rules), config, "rules") + bar := progressbar.GetProgressBar(len(config.Rules), config) subjectRuleFailures := make(map[string]RuleFailureSummary) thirdPartyRuleFailures := make(map[string]map[string]RuleFailureSummary) diff --git a/internal/report/output/security/security.go b/internal/report/output/security/security.go index 151179fe6..bc9701ee4 100644 --- a/internal/report/output/security/security.go +++ b/internal/report/output/security/security.go @@ -137,7 +137,7 @@ func evaluateRules( var bar *progressbar.ProgressBar if !builtIn { - bar = bearerprogressbar.GetProgressBar(len(rules), config, "rules") + bar = bearerprogressbar.GetProgressBar(len(rules), config) } var fingerprints []string diff --git a/internal/util/progressbar/progressbar.go b/internal/util/progressbar/progressbar.go index a323d06d8..99cfb6853 100644 --- a/internal/util/progressbar/progressbar.go +++ b/internal/util/progressbar/progressbar.go @@ -6,7 +6,7 @@ import ( "github.com/schollz/progressbar/v3" ) -func GetProgressBar(filesLength int, config settings.Config, display_type string) *progressbar.ProgressBar { +func GetProgressBar(filesLength int, config settings.Config) *progressbar.ProgressBar { hideProgress := config.Scan.HideProgressBar || config.Scan.Quiet || config.Debug return progressbar.NewOptions(filesLength, progressbar.OptionSetVisibility(!hideProgress), @@ -18,8 +18,6 @@ func GetProgressBar(filesLength int, config settings.Config, display_type string progressbar.OptionOnCompletion(func() { output.ErrorWriter().Write([]byte("\n")) //nolint:all,errcheck }), - progressbar.OptionShowIts(), - progressbar.OptionSetItsString(display_type), progressbar.OptionSetDescription(" └"), progressbar.OptionSetTheme(progressbar.Theme{ Saucer: "=",