drwasabi
/
bombadillo
forked from sloum/bombadillo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added search to actions and fixed regular type 7 functionality. It had been dropping the last char.

This commit is contained in:
sloumdrone 2019-03-23 08:29:05 -07:00
parent 26f80dafbc
commit d63fa88d3d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bombadillo.go
View File

@ -73,12 +73,15 @@ func search(u string) error {
fmt.Print("Enter form input: ") fmt.Print("Enter form input: ")
cui.MoveCursorTo(screen.Height - 1, 17) cui.MoveCursorTo(screen.Height - 1, 17)
entry := cui.GetLine() entry := cui.GetLine()
searchurl := fmt.Sprintf("%s\t%s", u, entry[:len(entry) - 1]) quickMessage("Searching...", false)
searchurl := fmt.Sprintf("%s\t%s", u, entry)
sv, err := gopher.Visit(searchurl) sv, err := gopher.Visit(searchurl)
if err != nil { if err != nil {
quickMessage("Searching...", true)
return err return err
} }
history.Add(sv) history.Add(sv)
quickMessage("Searching...", true)
return nil return nil
} }
@ -130,6 +133,9 @@ func simple_command(a string) error {
return go_home() return go_home()
case "B", "BOOKMARKS": case "B", "BOOKMARKS":
toggle_bookmarks() toggle_bookmarks()
case "SEARCH":
return search(options["searchengine"])
default: default:
return fmt.Errorf("Unknown action %q", a) return fmt.Errorf("Unknown action %q", a)
} }
@ -249,7 +255,7 @@ func do_command_as(action string, values []string) error {
} }
return fmt.Errorf("Unable to set %s, it does not exist",values[0]) return fmt.Errorf("Unable to set %s, it does not exist",values[0])
} }
return fmt.Errorf("This method has not been built") return fmt.Errorf("Unknown command structure")
} }
func do_link_command_as(action, target string, values []string) error { func do_link_command_as(action, target string, values []string) error {

2
cmdparse/lexer.go
View File

@ -74,7 +74,7 @@ func (s *scanner) scanText() Token {
capInput := strings.ToUpper(buf.String()) capInput := strings.ToUpper(buf.String())
switch capInput { switch capInput {
case "DELETE", "ADD", "WRITE", "SET", "RECALL", "R", case "DELETE", "ADD", "WRITE", "SET", "RECALL", "R", "SEARCH",
"W", "A", "D", "S", "Q", "QUIT", "B", "BOOKMARKS", "H", "HOME": "W", "A", "D", "S", "Q", "QUIT", "B", "BOOKMARKS", "H", "HOME":
return Token{Action, capInput} return Token{Action, capInput}
} }