devraza/sage
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

feat: nicer help

Browse source
This commit is contained in:
Muhammad Nauman Raza 2024-03-30 12:45:22 +00:00
parent 2d1daf89b6
commit 5341963194
Signed by: devraza
GPG key ID: 91EAD6081011574B
3 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
go.mod
View file

@ -3,6 +3,7 @@ module github.com/devraza/sage
go 1.21.7 go 1.21.7
require ( require (
github.com/charmbracelet/bubbles v0.18.0
github.com/charmbracelet/bubbletea v0.25.0 github.com/charmbracelet/bubbletea v0.25.0
github.com/charmbracelet/lipgloss v0.10.0 github.com/charmbracelet/lipgloss v0.10.0
github.com/prometheus-community/pro-bing v0.4.0 github.com/prometheus-community/pro-bing v0.4.0

2
go.sum
View file

@ -1,5 +1,7 @@
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0=
github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw=
github.com/charmbracelet/bubbletea v0.25.0 h1:bAfwk7jRz7FKFl9RzlIULPkStffg5k6pNt5dywy4TcM= github.com/charmbracelet/bubbletea v0.25.0 h1:bAfwk7jRz7FKFl9RzlIULPkStffg5k6pNt5dywy4TcM=
github.com/charmbracelet/bubbletea v0.25.0/go.mod h1:EN3QDR1T5ZdWmdfDzYcqOCAps45+QIJbLOBxmVNWNNg= github.com/charmbracelet/bubbletea v0.25.0/go.mod h1:EN3QDR1T5ZdWmdfDzYcqOCAps45+QIJbLOBxmVNWNNg=
github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s= github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=

33
main.go
View file

@ -6,6 +6,8 @@ import (
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
"github.com/charmbracelet/bubbles/key"
"github.com/charmbracelet/bubbles/help"
"github.com/prometheus-community/pro-bing" "github.com/prometheus-community/pro-bing"
) )
@ -14,12 +16,34 @@ var (
checkMark = lipgloss.NewStyle().Foreground(lipgloss.Color("42")).SetString("✓") checkMark = lipgloss.NewStyle().Foreground(lipgloss.Color("42")).SetString("✓")
) )
type keyMap struct {
Quit key.Binding
}
func (k keyMap) ShortHelp() []key.Binding {
return []key.Binding{k.Quit}
}
func (k keyMap) FullHelp() [][]key.Binding {
return [][]key.Binding{
{k.Quit},
}
}
var keys = keyMap{
Quit: key.NewBinding(
key.WithKeys("q", "esc", "ctrl+c"),
key.WithHelp("q", "quit"),
),
}
type model struct { type model struct {
keys keyMap
help help.Model
addresses []string addresses []string
} }
func initialModel() model { func initialModel() model {
return model{ return model{
keys: keys,
help: help.New(),
addresses: []string{"100.64.0.1", "100.64.0.2"}, addresses: []string{"100.64.0.1", "100.64.0.2"},
} }
} }
@ -31,8 +55,8 @@ func (m model) Init() tea.Cmd {
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) { switch msg := msg.(type) {
case tea.KeyMsg: case tea.KeyMsg:
switch msg.String() { switch {
case "ctrl+c", "q": case key.Matches(msg, m.keys.Quit):
return m, tea.Quit return m, tea.Quit
} }
} }
@ -49,8 +73,9 @@ func (m model) View() string {
s += fmt.Sprintf("%s %s\n", checkMark, address) s += fmt.Sprintf("%s %s\n", checkMark, address)
} }
} }
s += "\nPress q to quit.\n"
return s helpView := m.help.View(m.keys)
return s + "\n" + helpView
} }
func main() { func main() {