sammyette/Hilbish
2
3
Fork 0
mirror of https://github.com/sammy-ette/Hilbish synced 2025-08-10 02:52:03 +00:00
Code Issues Releases Wiki Activity

feat: ctrl c to cancel input

Browse Source
This commit is contained in:
sammy 2021-04-14 13:20:03 -04:00
parent cd96ac86ac
commit 885c54ed3f
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
main.go
View File

@ -4,10 +4,8 @@ import (
"fmt" "fmt"
"os" "os"
"os/user" "os/user"
"syscall"
"os/signal" "os/signal"
"strings" "strings"
"bufio"
"io" "io"
hooks "hilbish/golibs/bait" hooks "hilbish/golibs/bait"
@ -29,6 +27,7 @@ var commands = map[string]bool{}
var aliases = map[string]string{} var aliases = map[string]string{}
var bait hooks.Bait var bait hooks.Bait
var homedir string var homedir string
var running bool
func main() { func main() {
homedir, _ = os.UserHomeDir() homedir, _ = os.UserHomeDir()
@ -89,13 +88,14 @@ func main() {
} }
} }
HandleSignals() go HandleSignals()
LuaInit(*configflag) LuaInit(*configflag)
readline.Completer = readline.FilenameCompleter readline.Completer = readline.FilenameCompleter
readline.LoadHistory(homedir + "/.hilbish-history") readline.LoadHistory(homedir + "/.hilbish-history")
for { for {
running = false
input, err := readline.String(fmtPrompt()) input, err := readline.String(fmtPrompt())
if err == io.EOF { if err == io.EOF {
// Exit if user presses ^D (ctrl + d) // Exit if user presses ^D (ctrl + d)
@ -117,6 +117,7 @@ func main() {
if err != nil || !strings.HasSuffix(input, "\\") { break } if err != nil || !strings.HasSuffix(input, "\\") { break }
} }
} }
running = true
RunInput(input) RunInput(input)
termwidth, _, err := term.GetSize(0) termwidth, _, err := term.GetSize(0)
@ -126,12 +127,7 @@ func main() {
} }
func ContinuePrompt(prev string) (string, error) { func ContinuePrompt(prev string) (string, error) {
fmt.Print(multilinePrompt) cont, err := readline.String(multilinePrompt)
reader := bufio.NewReader(os.Stdin)
// TODO: use readline here?
cont, err := reader.ReadString('\n')
if err != nil { if err != nil {
fmt.Println("") fmt.Println("")
return "", err return "", err
@ -170,9 +166,14 @@ func fmtPrompt() string {
// do i even have to say // do i even have to say
func HandleSignals() { func HandleSignals() {
c := make(chan os.Signal) c := make(chan os.Signal)
signal.Notify(c, os.Interrupt, syscall.SIGTERM) signal.Notify(c, os.Interrupt)
go func() {
<-c for range c {
}() if !running {
fmt.Println(" // interrupt")
readline.ReplaceLine("", 0)
readline.RefreshLine()
}
}
} }