diff options
| author | hachem <im@hachem.wtf> | 2026-08-29 02:51:16 +0200 |
|---|---|---|
| committer | hachem <im@hachem.wtf> | 2026-08-29 02:51:16 +0200 |
| commit | f60177934a18daea3b24a37cf109bb2c7bfaaa72 (patch) | |
| tree | 7b6e20dd7b5c94b9c176e75497c5045dcb589075 /internal | |
| parent | e56d21fa04450d118f76347a96a12d1d5477958f (diff) | |
feat: nicer ui
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/bot/bot.go | 5 | ||||
| -rw-r--r-- | internal/cli/cli.go | 199 | ||||
| -rw-r--r-- | internal/cli/commands.go | 77 | ||||
| -rw-r--r-- | internal/cli/styles.go | 40 | ||||
| -rw-r--r-- | internal/config/config.go | 45 |
5 files changed, 355 insertions, 11 deletions
diff --git a/internal/bot/bot.go b/internal/bot/bot.go index 31c776d..1c8182d 100644 --- a/internal/bot/bot.go +++ b/internal/bot/bot.go @@ -1,12 +1,7 @@ -// Package bot implements Benson's Discord bot, which periodically checks -// configured Modrinth mods for compatibility and posts reports to a channel. package bot import "fmt" -// Run starts the Discord bot and blocks until it is stopped. -// -// TODO: port the Modrinth compatibility checker and Discord integration. func Run() error { fmt.Println("benson bot — not yet implemented") return nil diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 337cb71..4e394e6 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -1,12 +1,199 @@ -// Package cli implements Benson's interactive server-manager REPL. package cli -import "fmt" +import ( + "fmt" + "strings" + + "github.com/charmbracelet/bubbles/spinner" + "github.com/charmbracelet/bubbles/textinput" + tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/lipgloss" + + "github.com/hachem-wtf/benson/internal/config" +) + +type command struct { + name string + desc string + run func(m *model) tea.Cmd +} + +type outputMsg struct { + text string +} + +type model struct { + cfg *config.Config + version string + + input textinput.Model + spin spinner.Model + + commands []command + busy bool + quitting bool + + width int +} -// Run starts the interactive CLI. version is displayed in the banner. -// -// TODO: port the REPL and commands (list-mods, check, generate, merge, clean). func Run(version string) error { - fmt.Printf("benson CLI v%s — not yet implemented\n", version) + cfg, err := config.Load() + if err != nil { + return fmt.Errorf("failed to load %s: %w", config.Path(), err) + } + + _, err = tea.NewProgram(newModel(cfg, version)).Run() + return err +} + +func newModel(cfg *config.Config, version string) *model { + ti := textinput.New() + ti.Placeholder = "type a command… (try 'help')" + ti.Prompt = "" + ti.CharLimit = 128 + ti.Focus() + + sp := spinner.New() + sp.Spinner = spinner.Dot + sp.Style = lipgloss.NewStyle().Foreground(colPrimary) + + m := &model{ + cfg: cfg, + version: version, + input: ti, + spin: sp, + } + m.commands = defaultCommands() + return m +} + +func (m *model) Init() tea.Cmd { + return tea.Batch(textinput.Blink, tea.Println(welcomeBlock(m.cfg, m.version))) +} + +func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { + switch msg := msg.(type) { + case tea.WindowSizeMsg: + m.width = msg.Width + m.input.Width = max(msg.Width-12, 20) + return m, nil + + case tea.KeyMsg: + switch msg.Type { + case tea.KeyCtrlC, tea.KeyCtrlD: + m.quitting = true + return m, tea.Quit + case tea.KeyTab: + if s := m.firstSuggestion(); s != "" { + m.input.SetValue(s) + m.input.CursorEnd() + } + return m, nil + case tea.KeyEnter: + if m.busy { + return m, nil + } + return m, m.submit() + } + + case outputMsg: + m.busy = false + return m, tea.Println(msg.text) + + case spinner.TickMsg: + var cmd tea.Cmd + m.spin, cmd = m.spin.Update(msg) + return m, cmd + } + + var cmd tea.Cmd + m.input, cmd = m.input.Update(msg) + return m, cmd +} + +func (m *model) View() string { + if m.quitting { + return "" + } + return "\n" + m.suggestionRow() + "\n" + m.promptLine() + "\n" +} + +func (m *model) submit() tea.Cmd { + raw := strings.TrimSpace(m.input.Value()) + m.input.Reset() + if raw == "" { + return nil + } + + echo := tea.Println(promptStyle.Render("benson ❯ ") + raw) + + name := strings.ToLower(strings.Fields(raw)[0]) + if name == "?" { + name = "help" + } + + if isExit(name) { + m.quitting = true + return tea.Sequence(echo, tea.Println(mutedStyle.Render("Goodbye!")), tea.Quit) + } + + if c := m.find(name); c != nil { + return tea.Sequence(echo, c.run(m)) + } + + unknown := tea.Println(errorStyle.Render("Unknown command: "+name) + mutedStyle.Render(" · type 'help'")) + return tea.Sequence(echo, unknown) +} + +func (m *model) find(name string) *command { + for i := range m.commands { + if m.commands[i].name == name { + return &m.commands[i] + } + } return nil } + +func isExit(name string) bool { + switch name { + case "exit", "quit", "q": + return true + } + return false +} + +func (m *model) promptLine() string { + if m.busy { + return " " + m.spin.View() + " " + mutedStyle.Render("working…") + } + return promptStyle.Render(" benson ❯ ") + m.input.View() +} + +func (m *model) suggestionRow() string { + cur := strings.ToLower(strings.TrimSpace(m.input.Value())) + + chips := make([]string, 0, len(m.commands)+1) + for _, c := range m.commands { + if cur != "" && strings.HasPrefix(c.name, cur) { + chips = append(chips, chipActiveStyle.Render(c.name)) + } else { + chips = append(chips, chipStyle.Render(c.name)) + } + } + chips = append(chips, chipStyle.Render("exit")) + + return " " + lipgloss.JoinHorizontal(lipgloss.Left, chips...) +} + +func (m *model) firstSuggestion() string { + cur := strings.ToLower(strings.TrimSpace(m.input.Value())) + if cur == "" { + return "" + } + for _, c := range m.commands { + if c.name != cur && strings.HasPrefix(c.name, cur) { + return c.name + } + } + return "" +} diff --git a/internal/cli/commands.go b/internal/cli/commands.go new file mode 100644 index 0000000..1f1f132 --- /dev/null +++ b/internal/cli/commands.go @@ -0,0 +1,77 @@ +package cli + +import ( + "fmt" + "strings" + + tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/lipgloss" + + "github.com/hachem-wtf/benson/internal/config" +) + +func defaultCommands() []command { + return []command{ + { + name: "list-mods", + desc: "List the configured mods", + run: func(m *model) tea.Cmd { + return tea.Println(renderModList(m.cfg)) + }, + }, + { + name: "help", + desc: "Show available commands", + run: func(m *model) tea.Cmd { + return tea.Println(helpBlock(m.commands)) + }, + }, + } +} + +func welcomeBlock(cfg *config.Config, version string) string { + inner := lipgloss.JoinVertical( + lipgloss.Left, + titleStyle.Render("BENSON"), + subtitleStyle.Render("a Minecraft server manager from hell"), + "", + mutedStyle.Render(fmt.Sprintf("Fabric · MC %s · v%s", cfg.MinecraftVersion, version)), + ) + + hint := mutedStyle.Render("Type a command below. Tab autocompletes · Ctrl+C quits.") + + return lipgloss.JoinVertical(lipgloss.Left, bannerStyle.Render(inner), "", hint) +} + +func helpBlock(cmds []command) string { + rows := []string{headingStyle.Render("Commands"), ""} + for _, c := range cmds { + rows = append(rows, " "+bulletStyle.Render(padRight(c.name, 14))+mutedStyle.Render(c.desc)) + } + rows = append(rows, " "+bulletStyle.Render(padRight("exit", 14))+mutedStyle.Render("Exit Benson")) + return lipgloss.JoinVertical(lipgloss.Left, rows...) +} + +func renderModList(cfg *config.Config) string { + rows := []string{ + headingStyle.Render(fmt.Sprintf("Mods for MC %s", cfg.MinecraftVersion)), + "", + } + + if len(cfg.ModrinthMods) == 0 { + rows = append(rows, mutedStyle.Render(" (none configured)")) + } + for _, slug := range cfg.ModrinthMods { + rows = append(rows, " "+bulletStyle.Render("◆ ")+slug) + } + + rows = append(rows, "", mutedStyle.Render(fmt.Sprintf("Total: %d mods", len(cfg.ModrinthMods)))) + return lipgloss.JoinVertical(lipgloss.Left, rows...) +} + +func padRight(s string, n int) string { + if pad := n - len([]rune(s)); pad > 0 { + return s + strings.Repeat(" ", pad) + } + return s +} diff --git a/internal/cli/styles.go b/internal/cli/styles.go new file mode 100644 index 0000000..c0a61e5 --- /dev/null +++ b/internal/cli/styles.go @@ -0,0 +1,40 @@ +package cli + +import "github.com/charmbracelet/lipgloss" + +var ( + colPrimary = lipgloss.Color("#F97316") + colAccent = lipgloss.Color("#A855F7") + colSuccess = lipgloss.Color("#22C55E") + colError = lipgloss.Color("#EF4444") + colWarn = lipgloss.Color("#EAB308") + colMuted = lipgloss.Color("#6B7280") + colInk = lipgloss.Color("#111827") + + bannerStyle = lipgloss.NewStyle(). + Border(lipgloss.RoundedBorder()). + BorderForeground(colPrimary). + Padding(0, 3) + + titleStyle = lipgloss.NewStyle().Bold(true).Foreground(colPrimary) + subtitleStyle = lipgloss.NewStyle().Foreground(colMuted) + + promptStyle = lipgloss.NewStyle().Bold(true).Foreground(colAccent) + + chipStyle = lipgloss.NewStyle(). + Foreground(colMuted). + Padding(0, 1) + + chipActiveStyle = lipgloss.NewStyle(). + Foreground(colInk). + Background(colPrimary). + Bold(true). + Padding(0, 1) + + headingStyle = lipgloss.NewStyle().Bold(true).Foreground(colAccent) + bulletStyle = lipgloss.NewStyle().Foreground(colPrimary) + mutedStyle = lipgloss.NewStyle().Foreground(colMuted) + successStyle = lipgloss.NewStyle().Foreground(colSuccess) + errorStyle = lipgloss.NewStyle().Foreground(colError) + warnStyle = lipgloss.NewStyle().Foreground(colWarn) +) diff --git a/internal/config/config.go b/internal/config/config.go new file mode 100644 index 0000000..35842a1 --- /dev/null +++ b/internal/config/config.go @@ -0,0 +1,45 @@ +package config + +import ( + "encoding/json" + "os" + "path/filepath" +) + +type Config struct { + ChannelID string `json:"channel_id"` + CheckIntervalMinutes int `json:"check_interval_minutes"` + MinecraftVersion string `json:"minecraft_version"` + FabricLoaderVersion string `json:"fabric_loader_version"` + LoaderMetaVersion string `json:"loader_meta_version"` + JavaPath string `json:"java_path"` + ServerLocation string `json:"server_location"` + BackupLocation string `json:"backup_location"` + MergePreCommand string `json:"merge_pre_command"` + MergePostCommand string `json:"merge_post_command"` + ModrinthMods []string `json:"modrinth_mods"` +} + +const Dir = "config" + +func Path() string { + return filepath.Join(Dir, "config.json") +} + +func APIPath() string { + return filepath.Join(Dir, "api.json") +} + +func Load() (*Config, error) { + data, err := os.ReadFile(Path()) + if err != nil { + return nil, err + } + + var c Config + if err := json.Unmarshal(data, &c); err != nil { + return nil, err + } + + return &c, nil +} |
