From 4963fb7e3a8ebd225cbcef18ba7827244f6a5052 Mon Sep 17 00:00:00 2001 From: kevin olson Date: Tue, 7 May 2024 21:29:07 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20kill=20progress=20bars=20for=20a?= =?UTF-8?q?ctions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mvc.go | 7 +++---- taskin.go | 9 ++++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mvc.go b/mvc.go index 07a098a..82848dd 100644 --- a/mvc.go +++ b/mvc.go @@ -4,7 +4,6 @@ import ( "github.com/charmbracelet/bubbles/spinner" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "os" ) func (r *Runners) Init() tea.Cmd { @@ -32,7 +31,7 @@ func (r *Runners) Update(msg tea.Msg) (tea.Model, tea.Cmd) { for i := range *r { if (*r)[i].State == Running || (*r)[i].State == NotStarted { - if os.Getenv("CI") == "" { + if !IsCI() { newSpinner, cmd := (*r)[i].Spinner.Update(msg) (*r)[i].Spinner = &newSpinner cmds = append(cmds, cmd) @@ -41,7 +40,7 @@ func (r *Runners) Update(msg tea.Msg) (tea.Model, tea.Cmd) { for j := range (*r)[i].Children { if (*r)[i].Children[j].State == Running || (*r)[i].Children[j].State == NotStarted { - if os.Getenv("CI") == "" { + if !IsCI() { newSpinner, cmd := (*r)[i].Children[j].Spinner.Update(msg) (*r)[i].Children[j].Spinner = &newSpinner cmds = append(cmds, cmd) @@ -85,7 +84,7 @@ func (r *Runners) View() string { var view string // check if CI is set, if it is then don't return the view until all tasks are completed or one has failed - if os.Getenv("CI") != "" { + if IsCI() { allDone, _ := r.checkTasksState() if !allDone { return "" diff --git a/taskin.go b/taskin.go index b421bc8..6fca4c7 100644 --- a/taskin.go +++ b/taskin.go @@ -16,7 +16,7 @@ func NewRunner(task Task, cfg Config) Runner { var spinr *spinner.Model - if os.Getenv("CI") == "" { + if !IsCI() { spinnerModel := spinner.New(spinner.WithSpinner(cfg.Spinner)) // Initialize with a spinner model spinnerModel.Style = lipgloss.NewStyle().Foreground(cfg.Colors.Spinner) // Styling spinner spinr = &spinnerModel @@ -36,6 +36,9 @@ func NewRunner(task Task, cfg Config) Runner { } func (task *Task) Progress(current, total int) { + if IsCI() { + return + } task.ShowProgress = TaskProgress{Current: current, Total: total} if !task.Bar.IsAnimating() { task.Bar = progress.New(task.Config.ProgressOptions...) @@ -110,3 +113,7 @@ func New(tasks Tasks, cfg Config) Runners { }() return runners } + +func IsCI() bool { + return os.Getenv("CI") != "" +}