mirror of
https://github.com/charmbracelet/gum
synced 2024-05-22 08:06:43 +02:00
f4d198396f
* feat(spin): Add support for `--show-error` for the spinner. This makes it so that if the `--show-error` flag is provided then the full output of the command will be printed if the command fails. This kind of works in conjuncture with `--show-output` in that if the command succeeds only STDOUT is pushed. If the command fails both `STDOUT` and `STDERR` are pushed. This builds off of https://github.com/charmbracelet/gum/pull/371 Resolves #55 * chore: Fix formatting --------- Co-authored-by: Elliot Courant <me@elliotcourant.dev>
72 lines
1.8 KiB
Go
72 lines
1.8 KiB
Go
package spin
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/charmbracelet/bubbles/spinner"
|
|
tea "github.com/charmbracelet/bubbletea"
|
|
"github.com/mattn/go-isatty"
|
|
|
|
"github.com/charmbracelet/gum/internal/exit"
|
|
)
|
|
|
|
// Run provides a shell script interface for the spinner bubble.
|
|
// https://github.com/charmbracelet/bubbles/spinner
|
|
func (o Options) Run() error {
|
|
isTTY := isatty.IsTerminal(os.Stdout.Fd())
|
|
|
|
s := spinner.New()
|
|
s.Style = o.SpinnerStyle.ToLipgloss()
|
|
s.Spinner = spinnerMap[o.Spinner]
|
|
m := model{
|
|
spinner: s,
|
|
title: o.TitleStyle.ToLipgloss().Render(o.Title),
|
|
command: o.Command,
|
|
align: o.Align,
|
|
showOutput: o.ShowOutput && isTTY,
|
|
timeout: o.Timeout,
|
|
hasTimeout: o.Timeout > 0,
|
|
}
|
|
p := tea.NewProgram(m, tea.WithOutput(os.Stderr))
|
|
mm, err := p.Run()
|
|
m = mm.(model)
|
|
|
|
if err != nil {
|
|
return fmt.Errorf("failed to run spin: %w", err)
|
|
}
|
|
|
|
if m.aborted {
|
|
return exit.ErrAborted
|
|
}
|
|
|
|
if err != nil {
|
|
return fmt.Errorf("failed to access stdout: %w", err)
|
|
}
|
|
|
|
// If the command succeeds, and we are printing output and we are in a TTY then push the STDOUT we got to the actual
|
|
// STDOUT for piping or other things.
|
|
if m.status == 0 {
|
|
if o.ShowOutput {
|
|
// BubbleTea writes the View() to stderr.
|
|
// If the program is being piped then put the accumulated output in stdout.
|
|
if !isTTY {
|
|
_, err := os.Stdout.WriteString(m.stdout)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to write to stdout: %w", err)
|
|
}
|
|
}
|
|
}
|
|
} else if o.ShowError {
|
|
// Otherwise if we are showing errors and the command did not exit with a 0 status code then push all of the command
|
|
// output to the terminal. This way failed commands can be debugged.
|
|
_, err := os.Stdout.WriteString(m.output)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to write to stdout: %w", err)
|
|
}
|
|
}
|
|
|
|
os.Exit(m.status)
|
|
return nil
|
|
}
|