deblan-mirror/gum
deblan-mirror/gum
1
0
Fork 0
mirror of https://github.com/charmbracelet/gum synced 2024-06-15 20:15:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(spin): stdout streaming (#467)

Browse source
This commit is contained in:
Maas Lalani 2023-12-21 15:09:00 -05:00 committed by GitHub
parent 4a00db207a
commit 6a275b423f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
spin/spin.go
View file

@ -15,12 +15,14 @@
package spin package spin
import ( import (
"os"
"os/exec" "os/exec"
"strings" "strings"
"time" "time"
"github.com/charmbracelet/gum/internal/exit" "github.com/charmbracelet/gum/internal/exit"
"github.com/charmbracelet/gum/timeout" "github.com/charmbracelet/gum/timeout"
"github.com/mattn/go-isatty"
"github.com/charmbracelet/bubbles/spinner" "github.com/charmbracelet/bubbles/spinner"
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
@ -56,8 +58,12 @@ func commandStart(command []string) tea.Cmd {
} }
cmd := exec.Command(command[0], args...) //nolint:gosec cmd := exec.Command(command[0], args...) //nolint:gosec
cmd.Stdout = &outbuf if isatty.IsTerminal(os.Stdout.Fd()) {
cmd.Stderr = &errbuf cmd.Stdout = &outbuf
cmd.Stderr = &errbuf
} else {
cmd.Stdout = os.Stdout
}
_ = cmd.Run() _ = cmd.Run()
@ -82,8 +88,8 @@ func (m model) Init() tea.Cmd {
) )
} }
func (m model) View() string { func (m model) View() string {
if m.quitting { if m.quitting && m.showOutput {
return "" return strings.TrimPrefix(errbuf.String()+"\n"+outbuf.String(), "\n")
} }
var str string var str string