issue-9: added the RC file
Added the RC file which can be used to load commands on startup. Also added the "echo" command which can be used for debugging.
This commit is contained in:
parent
d9c9e5d845
commit
24304d21c3
8 changed files with 92 additions and 42 deletions
|
|
@ -1,9 +1,13 @@
|
|||
package commandctrl
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/pkg/errors"
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/lmika/audax/internal/common/ui/events"
|
||||
|
|
@ -11,7 +15,7 @@ import (
|
|||
)
|
||||
|
||||
type CommandController struct {
|
||||
commandList *CommandContext
|
||||
commandList *CommandList
|
||||
}
|
||||
|
||||
func NewCommandController() *CommandController {
|
||||
|
|
@ -20,7 +24,7 @@ func NewCommandController() *CommandController {
|
|||
}
|
||||
}
|
||||
|
||||
func (c *CommandController) AddCommands(ctx *CommandContext) {
|
||||
func (c *CommandController) AddCommands(ctx *CommandList) {
|
||||
ctx.parent = c.commandList
|
||||
c.commandList = ctx
|
||||
}
|
||||
|
|
@ -35,6 +39,10 @@ func (c *CommandController) Prompt() tea.Msg {
|
|||
}
|
||||
|
||||
func (c *CommandController) Execute(commandInput string) tea.Msg {
|
||||
return c.execute(ExecContext{FromFile: false}, commandInput)
|
||||
}
|
||||
|
||||
func (c *CommandController) execute(ctx ExecContext, commandInput string) tea.Msg {
|
||||
input := strings.TrimSpace(commandInput)
|
||||
if input == "" {
|
||||
return nil
|
||||
|
|
@ -43,31 +51,65 @@ func (c *CommandController) Execute(commandInput string) tea.Msg {
|
|||
tokens := shellwords.Split(input)
|
||||
command := c.lookupCommand(tokens[0])
|
||||
if command == nil {
|
||||
log.Println("No such command: ", tokens)
|
||||
return events.Error(errors.New("no such command: " + tokens[0]))
|
||||
}
|
||||
|
||||
return command(tokens[1:])
|
||||
return command(ctx, tokens[1:])
|
||||
}
|
||||
|
||||
func (c *CommandController) Alias(commandName string) Command {
|
||||
return func(args []string) tea.Msg {
|
||||
return func(ctx ExecContext, args []string) tea.Msg {
|
||||
command := c.lookupCommand(commandName)
|
||||
if command == nil {
|
||||
log.Println("No such command: ", commandName)
|
||||
return events.Error(errors.New("no such command: " + commandName))
|
||||
}
|
||||
|
||||
return command(args)
|
||||
return command(ctx, args)
|
||||
}
|
||||
}
|
||||
|
||||
func (c *CommandController) lookupCommand(name string) Command {
|
||||
for ctx := c.commandList; ctx != nil; ctx = ctx.parent {
|
||||
log.Printf("Looking in command list: %v", c.commandList)
|
||||
if cmd, ok := ctx.Commands[name]; ok {
|
||||
return cmd
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *CommandController) ExecuteFile(filename string) error {
|
||||
baseFilename := filepath.Base(filename)
|
||||
|
||||
if rcFile, err := os.ReadFile(filename); err == nil {
|
||||
if err := c.executeFile(rcFile, baseFilename); err != nil {
|
||||
return errors.Wrapf(err, "error executing %v", filename)
|
||||
}
|
||||
} else {
|
||||
return errors.Wrapf(err, "error loading %v", filename)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *CommandController) executeFile(file []byte, filename string) error {
|
||||
scnr := bufio.NewScanner(bytes.NewReader(file))
|
||||
|
||||
lineNo := 0
|
||||
for scnr.Scan() {
|
||||
lineNo++
|
||||
line := strings.TrimSpace(scnr.Text())
|
||||
if line == "" {
|
||||
continue
|
||||
} else if line[0] == '#' {
|
||||
continue
|
||||
}
|
||||
|
||||
msg := c.execute(ExecContext{FromFile: true}, line)
|
||||
switch m := msg.(type) {
|
||||
case events.ErrorMsg:
|
||||
log.Printf("%v:%v: error - %v", filename, lineNo, m.Error())
|
||||
case events.StatusMsg:
|
||||
log.Printf("%v:%v: %v", filename, lineNo, string(m))
|
||||
}
|
||||
}
|
||||
return scnr.Err()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,6 @@
|
|||
package commandctrl
|
||||
|
||||
import "context"
|
||||
|
||||
type commandArgContextKeyType struct{}
|
||||
|
||||
var commandArgContextKey = commandArgContextKeyType{}
|
||||
|
||||
func WithCommandArgs(ctx context.Context, args []string) context.Context {
|
||||
return context.WithValue(ctx, commandArgContextKey, args)
|
||||
}
|
||||
|
||||
func CommandArgs(ctx context.Context) []string {
|
||||
args, _ := ctx.Value(commandArgContextKey).([]string)
|
||||
return args
|
||||
type ExecContext struct {
|
||||
// FromFile is true if the command is executed as part of a command
|
||||
FromFile bool
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@ package commandctrl
|
|||
|
||||
import tea "github.com/charmbracelet/bubbletea"
|
||||
|
||||
type Command func(args []string) tea.Msg
|
||||
type Command func(ctx ExecContext, args []string) tea.Msg
|
||||
|
||||
func NoArgCommand(cmd tea.Cmd) Command {
|
||||
return func(args []string) tea.Msg {
|
||||
return func(ctx ExecContext, args []string) tea.Msg {
|
||||
return cmd()
|
||||
}
|
||||
}
|
||||
|
||||
type CommandContext struct {
|
||||
type CommandList struct {
|
||||
Commands map[string]Command
|
||||
|
||||
parent *CommandContext
|
||||
parent *CommandList
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue