переход на bubble tea библиотеку
This commit is contained in:
+30
-45
@@ -2,69 +2,54 @@
|
||||
package executor
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"errors"
|
||||
"os/exec"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"golang.org/x/term"
|
||||
)
|
||||
|
||||
var ErrBuiltInExit = errors.New("exit command")
|
||||
var localVars = make(map[string]string)
|
||||
|
||||
func BuildExecutor(oldStateTerminal *term.State, fd *int) func(string) {
|
||||
return func(line string) {
|
||||
line = strings.TrimSpace(line)
|
||||
|
||||
if strings.Contains(line, "=") && !strings.HasPrefix(line, "export ") {
|
||||
parts := strings.SplitN(line, "=", 2)
|
||||
func PrepareCommand(in string) (*exec.Cmd, error) {
|
||||
in = strings.TrimSpace(in)
|
||||
if in == "" {
|
||||
return nil, nil
|
||||
}
|
||||
if strings.Contains(in, "=") && !strings.HasPrefix(in, "export ") {
|
||||
parts := strings.SplitN(in, "=", 2)
|
||||
key := strings.TrimSpace(parts[0])
|
||||
value := strings.TrimSpace(parts[1])
|
||||
|
||||
localVars[key] = value
|
||||
return
|
||||
return nil,nil
|
||||
}
|
||||
|
||||
line = os.Expand(line, GetVariable)
|
||||
in = os.Expand(in, GetVariable)
|
||||
|
||||
if line == "" {
|
||||
return
|
||||
}
|
||||
|
||||
args := strings.Fields(line)
|
||||
command := args[0]
|
||||
commandArgs := args[1:]
|
||||
parts := strings.Fields(in)
|
||||
head := parts[0]
|
||||
args := parts[1:]
|
||||
|
||||
if command == "exit" {
|
||||
fmt.Println("Bye Bye my small deer :3")
|
||||
if oldStateTerminal != nil {
|
||||
_ = term.Restore(*fd, oldStateTerminal)
|
||||
}
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
if command == "cd" {
|
||||
if len(commandArgs) < 1 {
|
||||
fmt.Fprintln(os.Stderr, "cd: argument was skipped")
|
||||
return
|
||||
}
|
||||
if err := os.Chdir(commandArgs[0]); err != nil {
|
||||
fmt.Fprintln(os.Stderr, err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
cmd := exec.Command(command, commandArgs...)
|
||||
cmd.Stdin = os.Stdin
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
||||
if err := cmd.Run(); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Execution error: %v\n", err)
|
||||
}
|
||||
switch head {
|
||||
case "exit":
|
||||
return nil, ErrBuiltInExit
|
||||
case "help":
|
||||
return exec.Command("echo", "noko-shell: available commands: any system command, help, exit"), nil
|
||||
}
|
||||
|
||||
// Поиск системной утилиты в PATH (авто-проверка на существование)
|
||||
fullPath, err := exec.LookPath(head)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Возвращаем подготовленный процесс
|
||||
return exec.Command(fullPath, args...), nil
|
||||
}
|
||||
|
||||
|
||||
func GetVariable(key string) string {
|
||||
if val, exists := localVars[key]; exists {
|
||||
return val
|
||||
|
||||
Reference in New Issue
Block a user