mirror of https://github.com/Hilbis/Hilbish
refactor: move out reprompting and runner handling to functions
makes codefactor happy hopefully. this commit includes a fix to check if after reprompt the user hits ctrl d and just exits cleanlyrunner-prompt
parent
ade570d598
commit
0c3028bb03
86
exec.go
86
exec.go
|
@ -116,51 +116,23 @@ func runInput(input string, priv bool) {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// can only be a string or function so
|
// can only be a string or function so
|
||||||
term := rt.NewTerminationWith(l.MainThread().CurrentCont(), 3, false)
|
input, exitCode, cont, err = runLuaRunner(currentRunner, input)
|
||||||
err = rt.Call(l.MainThread(), currentRunner, []rt.Value{rt.StringValue(input)}, term)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintln(os.Stderr, err)
|
fmt.Fprintln(os.Stderr, err)
|
||||||
cmdFinish(124, input, priv)
|
cmdFinish(124, input, priv)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var runner *rt.Table
|
|
||||||
var ok bool
|
|
||||||
runnerRet := term.Get(0)
|
|
||||||
if runner, ok = runnerRet.TryTable(); !ok {
|
|
||||||
fmt.Fprintln(os.Stderr, "runner did not return a table")
|
|
||||||
}
|
|
||||||
|
|
||||||
if code, ok := runner.Get(rt.StringValue("exitCode")).TryInt(); ok {
|
|
||||||
exitCode = uint8(code)
|
|
||||||
}
|
|
||||||
|
|
||||||
if inp, ok := runner.Get(rt.StringValue("input")).TryString(); ok {
|
|
||||||
input = inp
|
|
||||||
}
|
|
||||||
|
|
||||||
if errStr, ok := runner.Get(rt.StringValue("err")).TryString(); ok {
|
|
||||||
err = fmt.Errorf("%s", errStr)
|
|
||||||
}
|
|
||||||
|
|
||||||
if c, ok := runner.Get(rt.StringValue("continue")).TryBool(); ok {
|
|
||||||
cont = c
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if cont {
|
if cont {
|
||||||
for {
|
input, err = reprompt(input)
|
||||||
input, err = continuePrompt(strings.TrimSuffix(input, "\\"))
|
if err == nil {
|
||||||
if err != nil {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
if strings.HasSuffix(cmdString, "\\") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
goto rerun
|
goto rerun
|
||||||
|
} else if err == io.EOF {
|
||||||
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if exErr, ok := isExecError(err); ok {
|
if exErr, ok := isExecError(err); ok {
|
||||||
hooks.Em.Emit("command." + exErr.typ, exErr.cmd)
|
hooks.Em.Emit("command." + exErr.typ, exErr.cmd)
|
||||||
|
@ -171,6 +143,52 @@ func runInput(input string, priv bool) {
|
||||||
cmdFinish(exitCode, input, priv)
|
cmdFinish(exitCode, input, priv)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func reprompt(input string) (string, error) {
|
||||||
|
for {
|
||||||
|
in, err := continuePrompt(strings.TrimSuffix(input, "\\"))
|
||||||
|
if err != nil {
|
||||||
|
return input, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.HasSuffix(in, "\\") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return in, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func runLuaRunner(runr rt.Value, userInput string) (input string, exitCode uint8, continued bool, err error) {
|
||||||
|
term := rt.NewTerminationWith(l.MainThread().CurrentCont(), 3, false)
|
||||||
|
err = rt.Call(l.MainThread(), runr, []rt.Value{rt.StringValue(userInput)}, term)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var runner *rt.Table
|
||||||
|
var ok bool
|
||||||
|
runnerRet := term.Get(0)
|
||||||
|
if runner, ok = runnerRet.TryTable(); !ok {
|
||||||
|
fmt.Fprintln(os.Stderr, "runner did not return a table")
|
||||||
|
}
|
||||||
|
|
||||||
|
if code, ok := runner.Get(rt.StringValue("exitCode")).TryInt(); ok {
|
||||||
|
exitCode = uint8(code)
|
||||||
|
}
|
||||||
|
|
||||||
|
if inp, ok := runner.Get(rt.StringValue("input")).TryString(); ok {
|
||||||
|
input = inp
|
||||||
|
}
|
||||||
|
|
||||||
|
if errStr, ok := runner.Get(rt.StringValue("err")).TryString(); ok {
|
||||||
|
err = fmt.Errorf("%s", errStr)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c, ok := runner.Get(rt.StringValue("continue")).TryBool(); ok {
|
||||||
|
continued = c
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
func handleLua(cmdString string) (string, uint8, error) {
|
func handleLua(cmdString string) (string, uint8, error) {
|
||||||
// First try to load input, essentially compiling to bytecode
|
// First try to load input, essentially compiling to bytecode
|
||||||
chunk, err := l.CompileAndLoadLuaChunk("", []byte(cmdString), rt.TableValue(l.GlobalEnv()))
|
chunk, err := l.CompileAndLoadLuaChunk("", []byte(cmdString), rt.TableValue(l.GlobalEnv()))
|
||||||
|
|
Loading…
Reference in New Issue