b5daedd735
This commit introduces a non-interactive mode for the `collect` commands. When running in a non-interactive session, the progress bar is replaced with a series of thematic Borg quotes, printed in matrix-green text. The quotes are sourced from a `quotes.json` file, which is embedded into the binary using Go's `embed` package. The `pkg/ui` package now contains a `NonInteractivePrompter` that detects the session type and displays the quotes accordingly. The `collect` commands have been updated to use this new prompter, and the underlying `vcs` and `website` packages have been made more robust to handle cases where a progress bar is not provided. This commit also addresses feedback from the code review: - Fixes a formatting inconsistency in `data/quotes.json`. - Updates the `go-colorable` dependency to `v0.1.14`. - Adds a nil-check to the `Write` method in `pkg/ui/progress_writer.go` to prevent panics. - Implements caching for the quotes using `sync.Once` and adds checks for empty quote slices to prevent panics in `pkg/ui/quote.go`. - Refactors the `NonInteractivePrompter` in `pkg/ui/non_interactive_prompter.go` to be more robust and efficient.
74 lines
1.3 KiB
Go
74 lines
1.3 KiB
Go
|
|
package ui
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/fatih/color"
|
|
"github.com/mattn/go-isatty"
|
|
)
|
|
|
|
type NonInteractivePrompter struct {
|
|
stopChan chan struct{}
|
|
quoteFunc func() (string, error)
|
|
started bool
|
|
mu sync.Mutex
|
|
stopOnce sync.Once
|
|
}
|
|
|
|
func NewNonInteractivePrompter(quoteFunc func() (string, error)) *NonInteractivePrompter {
|
|
return &NonInteractivePrompter{
|
|
stopChan: make(chan struct{}),
|
|
quoteFunc: quoteFunc,
|
|
}
|
|
}
|
|
|
|
func (p *NonInteractivePrompter) Start() {
|
|
p.mu.Lock()
|
|
if p.started {
|
|
p.mu.Unlock()
|
|
return
|
|
}
|
|
p.started = true
|
|
p.mu.Unlock()
|
|
|
|
if p.IsInteractive() {
|
|
return // Don't start in interactive mode
|
|
}
|
|
|
|
go func() {
|
|
ticker := time.NewTicker(3 * time.Second)
|
|
defer ticker.Stop()
|
|
|
|
for {
|
|
select {
|
|
case <-p.stopChan:
|
|
return
|
|
case <-ticker.C:
|
|
quote, err := p.quoteFunc()
|
|
if err != nil {
|
|
fmt.Println("Error getting quote:", err)
|
|
continue
|
|
}
|
|
c := color.New(color.FgGreen)
|
|
c.Println(quote)
|
|
}
|
|
}
|
|
}()
|
|
}
|
|
|
|
func (p *NonInteractivePrompter) Stop() {
|
|
if p.IsInteractive() {
|
|
return
|
|
}
|
|
p.stopOnce.Do(func() {
|
|
close(p.stopChan)
|
|
})
|
|
}
|
|
|
|
func (p *NonInteractivePrompter) IsInteractive() bool {
|
|
return isatty.IsTerminal(os.Stdout.Fd()) || isatty.IsCygwinTerminal(os.Stdout.Fd())
|
|
}
|