diff --git a/go.mod b/go.mod index 78afc7e..e4358c7 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,7 @@ go 1.13 require ( github.com/charmbracelet/bubbletea v0.8.3-0.20200622174044-8bab4bce9a84 github.com/mattn/go-runewidth v0.0.9 - github.com/muesli/termenv v0.5.3-0.20200617154346-da5de72b61c0 - golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 // indirect + github.com/muesli/termenv v0.5.3-0.20200625163851-04b5c30e4c04 ) replace github.com/charmbracelet/bubbletea => ../bubbletea diff --git a/go.sum b/go.sum index cd67450..ac2da72 100644 --- a/go.sum +++ b/go.sum @@ -6,19 +6,17 @@ github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHX github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/muesli/termenv v0.5.3-0.20200617154346-da5de72b61c0 h1:IASsj5pQ478TEN9TLiuhP+ugUQEotZ1QdzQvcJUQ1dM= -github.com/muesli/termenv v0.5.3-0.20200617154346-da5de72b61c0/go.mod h1:O1/I6sw+6KcrgAmcs6uiUVr7Lui+DNVbHTzt9Lm/PlI= +github.com/muesli/termenv v0.5.3-0.20200625163851-04b5c30e4c04 h1:Wr876oXlAk6avTWi0daXAriOr+r5fqIuyDmtNc/KwY0= +github.com/muesli/termenv v0.5.3-0.20200625163851-04b5c30e4c04/go.mod h1:O1/I6sw+6KcrgAmcs6uiUVr7Lui+DNVbHTzt9Lm/PlI= github.com/pkg/term v0.0.0-20200520122047-c3ffed290a03 h1:pd4YKIqCB0U7O2I4gWHgEUA2mCEOENmco0l/bM957bU= github.com/pkg/term v0.0.0-20200520122047-c3ffed290a03/go.mod h1:Z9+Ul5bCbBKnbCvdOWbLqTHhJiYV414CURZJba6L8qA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw= -golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM= golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200620081246-981b61492c35 h1:wb/9mP8eUAmHfkM8RmpeLq6nUA7c2i5+bQOtcDftjaE= -golang.org/x/sys v0.0.0-20200620081246-981b61492c35/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 h1:5/PjkGUjvEU5Gl6BxmvKRPpqo2uNMv4rcHBMwzk/st8= +golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/spinner/spinner.go b/spinner/spinner.go index ad6ec87..97e3eed 100644 --- a/spinner/spinner.go +++ b/spinner/spinner.go @@ -7,25 +7,17 @@ import ( "github.com/muesli/termenv" ) -// Spinner is a set of frames used in animating the spinner. -type Spinner = int - -// Available types of spinners -const ( - Line Spinner = iota - Dot -) - const ( defaultFPS = time.Second / 10 ) +// Spinner is a set of frames used in animating the spinner. +type Spinner = []string + var ( - // Spinner frames - spinners = map[Spinner][]string{ - Line: {"|", "/", "-", "\\"}, - Dot: {"⣾ ", "⣽ ", "⣻ ", "⢿ ", "⡿ ", "⣟ ", "⣯ ", "⣷ "}, - } + // Some spinners to choose from. You could also make your own. + Line = Spinner([]string{"|", "/", "-", "\\"}) + Dot = Spinner([]string{"⣾ ", "⣽ ", "⣻ ", "⢿ ", "⡿ ", "⣟ ", "⣯ ", "⣷ "}) color = termenv.ColorProfile().Color ) @@ -35,7 +27,7 @@ var ( type Model struct { // Type is the set of frames to use. See Spinner. - Type Spinner + Frames Spinner // FPS is the speed at which the ticker should tick FPS time.Duration @@ -58,8 +50,8 @@ type Model struct { // NewModel returns a model with default values. func NewModel() Model { return Model{ - Type: Line, - FPS: defaultFPS, + Frames: Line, + FPS: defaultFPS, } } @@ -72,7 +64,7 @@ type TickMsg struct{} func Update(msg tea.Msg, m Model) (Model, tea.Cmd) { if _, ok := msg.(TickMsg); ok { m.frame++ - if m.frame >= len(spinners[m.Type]) { + if m.frame >= len(m.Frames) { m.frame = 0 } return m, Tick(m) @@ -82,22 +74,21 @@ func Update(msg tea.Msg, m Model) (Model, tea.Cmd) { // View renders the model's view. func View(model Model) string { - s := spinners[model.Type] - if model.frame >= len(s) { - return "[error]" + if model.frame >= len(model.Frames) { + return "error" } - str := s[model.frame] + frame := model.Frames[model.frame] if model.ForegroundColor != "" || model.BackgroundColor != "" { return termenv. - String(str). + String(frame). Foreground(color(model.ForegroundColor)). Background(color(model.BackgroundColor)). String() } - return str + return frame } // Tick is the command used to advance the spinner one frame.