From 4a297490c154a73899321bafbb55b17050f79e4b Mon Sep 17 00:00:00 2001 From: sloum Date: Sat, 20 Jun 2020 22:33:59 -0700 Subject: [PATCH 01/21] Adds better error messaging for commands and starts the help documentation --- client.go | 184 +++++++++++++++++++++++++++++++++++++++++++++----- help/add.help | 93 +++++++++++++++++++++++++ 2 files changed, 260 insertions(+), 17 deletions(-) create mode 100644 help/add.help diff --git a/client.go b/client.go index 25d7723..6aa76db 100644 --- a/client.go +++ b/client.go @@ -22,6 +22,21 @@ import ( "tildegit.org/sloum/bombadillo/termios" ) +var ERRS = map[string]string{ + "ADD": "`add [target] [name...]`", + "DELETE": "`delete [bookmark-id]`", + "BOOKMARKS": "`bookmarks [[bookmark-id]]`", + "CHECK": "`check [link_id]` or `check [setting]`", + "HOME": "`home`", + "PURGE": "`purge [host]`", + "QUIT": "`quit`", + "RELOAD": "`reload`", + "SEARCH": "`search [[keyword(s)...]]`", + "SET": "`set [setting] [value]`", + "WRITE": "`write [target]`", + "HELP": "`help [[topic]]`", +} + //------------------------------------------------\\ // + + + T Y P E S + + + \\ //--------------------------------------------------\\ @@ -317,9 +332,28 @@ func (c *client) routeCommandInput(com *cmdparse.Command) error { } + func (c *client) simpleCommand(action string) { action = strings.ToUpper(action) switch action { + case "A", "ADD": + c.SetMessage(syntaxErrorMessage("ADD"), true) + c.DrawMessage() + case "S", "SET": + c.SetMessage(syntaxErrorMessage("SET"), true) + c.DrawMessage() + case "D", "DELETE": + c.SetMessage(syntaxErrorMessage("DELETE"), true) + c.DrawMessage() + case "W", "WRITE": + c.SetMessage(syntaxErrorMessage("WRITE"), true) + c.DrawMessage() + case "P", "PURGE": + c.SetMessage(syntaxErrorMessage("PURGE"), true) + c.DrawMessage() + case "C", "CHECK": + c.SetMessage(syntaxErrorMessage("CHECK"), true) + c.DrawMessage() case "Q", "QUIT": cui.Exit(0, "") case "H", "HOME": @@ -351,16 +385,36 @@ func (c *client) simpleCommand(action string) { } } -func (c *client) doCommand(action string, values []string) { - if length := len(values); length != 1 { - c.SetMessage(fmt.Sprintf("Expected 1 argument, received %d", len(values)), true) - c.DrawMessage() - return - } +func (c *client) doCommand(action string, values []string) { switch action { - case "CHECK", "C": + case "A", "ADD": + c.SetMessage(syntaxErrorMessage("ADD"), true) + c.DrawMessage() + case "B", "BOOKMARKS": + c.SetMessage(syntaxErrorMessage("BOOKMARKS"), true) + c.DrawMessage() + case "C", "CHECK": c.displayConfigValue(values[0]) + c.DrawMessage() + case "D", "DELETE": + c.SetMessage(syntaxErrorMessage("DELETE"), true) + c.DrawMessage() + case "?", "HELP": + c.SetMessage(syntaxErrorMessage("HELP"), true) + c.DrawMessage() + case "H", "HOME": + c.SetMessage(syntaxErrorMessage("HOME"), true) + c.DrawMessage() + case "Q", "QUIT": + c.SetMessage(syntaxErrorMessage("QUIT"), true) + c.DrawMessage() + case "R", "RELOAD": + c.SetMessage(syntaxErrorMessage("QUIT"), true) + c.DrawMessage() + case "S", "SET": + c.SetMessage(syntaxErrorMessage("SET"), true) + c.DrawMessage() case "PURGE", "P": err := c.Certs.Purge(values[0]) if err != nil { @@ -411,18 +465,43 @@ func (c *client) doCommand(action string, values []string) { } func (c *client) doCommandAs(action string, values []string) { - if len(values) < 2 { - c.SetMessage(fmt.Sprintf("Expected 2+ arguments, received %d", len(values)), true) - c.DrawMessage() - return - } - - if values[0] == "." { - values[0] = c.PageState.History[c.PageState.Position].Location.Full - } - switch action { + case "B", "BOOKMARKS": + c.SetMessage(syntaxErrorMessage("BOOKMARKS"), true) + c.DrawMessage() + case "C", "CHECK": + c.displayConfigValue(values[0]) + c.DrawMessage() + case "D", "DELETE": + c.SetMessage(syntaxErrorMessage("DELETE"), true) + c.DrawMessage() + case "?", "HELP": + c.SetMessage(syntaxErrorMessage("HELP"), true) + c.DrawMessage() + case "H", "HOME": + c.SetMessage(syntaxErrorMessage("HOME"), true) + c.DrawMessage() + case "P", "PURGE": + c.SetMessage(syntaxErrorMessage("PURGE"), true) + c.DrawMessage() + case "Q", "QUIT": + c.SetMessage(syntaxErrorMessage("QUIT"), true) + c.DrawMessage() + case "R", "RELOAD": + c.SetMessage(syntaxErrorMessage("QUIT"), true) + c.DrawMessage() + case "W", "WRITE": + c.SetMessage(syntaxErrorMessage("WRITE"), true) + c.DrawMessage() case "ADD", "A": + if len(values) < 2 { + c.SetMessage(syntaxErrorMessage("ADD"), true) + c.DrawMessage() + return + } + if values[0] == "." { + values[0] = c.PageState.History[c.PageState.Position].Location.Full + } msg, err := c.BookMarks.Add(values) if err != nil { c.SetMessage(err.Error(), true) @@ -441,8 +520,18 @@ func (c *client) doCommandAs(action string, values []string) { c.Draw() } case "SEARCH": + if len(values) < 2 { + c.SetMessage(syntaxErrorMessage("SEARCH"), true) + c.DrawMessage() + return + } c.search(strings.Join(values, " "), "", "") case "SET", "S": + if len(values) < 2 { + c.SetMessage(syntaxErrorMessage("SET"), true) + c.DrawMessage() + return + } if _, ok := c.Options[values[0]]; ok { val := strings.Join(values[1:], " ") if !validateOpt(values[0], val) { @@ -496,6 +585,36 @@ func (c *client) doLinkCommandAs(action, target string, values []string) { } switch action { + case "B", "BOOKMARKS": + c.SetMessage(syntaxErrorMessage("BOOKMARKS"), true) + c.DrawMessage() + case "C", "CHECK": + c.displayConfigValue(values[0]) + c.DrawMessage() + case "D", "DELETE": + c.SetMessage(syntaxErrorMessage("DELETE"), true) + c.DrawMessage() + case "?", "HELP": + c.SetMessage(syntaxErrorMessage("HELP"), true) + c.DrawMessage() + case "H", "HOME": + c.SetMessage(syntaxErrorMessage("HOME"), true) + c.DrawMessage() + case "P", "PURGE": + c.SetMessage(syntaxErrorMessage("PURGE"), true) + c.DrawMessage() + case "Q", "QUIT": + c.SetMessage(syntaxErrorMessage("QUIT"), true) + c.DrawMessage() + case "R", "RELOAD": + c.SetMessage(syntaxErrorMessage("QUIT"), true) + c.DrawMessage() + case "SEARCH": + c.SetMessage(syntaxErrorMessage("SEARCH"), true) + c.DrawMessage() + case "S", "SET": + c.SetMessage(syntaxErrorMessage("SET"), true) + c.DrawMessage() case "ADD", "A": bm := make([]string, 0, 5) bm = append(bm, links[num]) @@ -593,6 +712,30 @@ func (c *client) doLinkCommand(action, target string) { } switch action { + case "A", "ADD": + c.SetMessage(syntaxErrorMessage("ADD"), true) + c.DrawMessage() + case "?", "HELP": + c.SetMessage(syntaxErrorMessage("HELP"), true) + c.DrawMessage() + case "H", "HOME": + c.SetMessage(syntaxErrorMessage("HOME"), true) + c.DrawMessage() + case "P", "PURGE": + c.SetMessage(syntaxErrorMessage("PURGE"), true) + c.DrawMessage() + case "Q", "QUIT": + c.SetMessage(syntaxErrorMessage("QUIT"), true) + c.DrawMessage() + case "R", "RELOAD": + c.SetMessage(syntaxErrorMessage("QUIT"), true) + c.DrawMessage() + case "SEARCH": + c.SetMessage(syntaxErrorMessage("SEARCH"), true) + c.DrawMessage() + case "S", "SET": + c.SetMessage(syntaxErrorMessage("SET"), true) + c.DrawMessage() case "DELETE", "D": msg, err := c.BookMarks.Delete(num) if err != nil { @@ -1195,3 +1338,10 @@ func findAvailableFileName(fpath, fname string) (string, error) { return savePath, nil } + +func syntaxErrorMessage(action string) string { + if val, ok := ERRS[action]; ok { + return fmt.Sprintf("Incorrect syntax. Try: %s", val) + } + return fmt.Sprintf("Unknown command %q", action) +} diff --git a/help/add.help b/help/add.help new file mode 100644 index 0000000..ef60749 --- /dev/null +++ b/help/add.help @@ -0,0 +1,93 @@ + +Bookmark Management +--------------------------- + +It is easy to add, view, navigate to, and delete bookmarks in Bombadillo. Let's tackle them in that order: + + + ++---------------------------+ ++ Adding Bookmarks + ++---------------------------+ + + +Adding a bookmark is done with the add command and has the following syntax: + +`:add [target] [name...]` + +Like many commands in Bombadillo, you can use an abbreviated form and just type `:a [target] [name...]` + +The available target valies are a url, a link ID that appears on the current page, or the character `.`, which represents the current page itself. + +Examples: + +- `:add gopher://bombadillo.colorfield.space Bombadillo` +- `:a 5 My Favorite Phlog` +- `:add . Dave's Gopherhole` + +If you are missing an element, or the link ID does not exist, Bombadillo will let you know the issue and/or show you the correct syntax. + + + ++---------------------------+ ++ Viewing Bookmarks + ++---------------------------+ + + +Viewing your bookmarks is quite easy. You can use a command or a "hot" key. To toggle the bookmarks bar into and out of view you can press the key `B` (the key combination `shift + b`). The command version is as follows: + +`:bookmarks` or the abbreviated `:b` + +In general, the hot key is likely more comfortable for most users. + +Once the bookmarks bar is visible you can scroll up and down in it with the regular `j` and `k` keys to view your bookmarks if you have more than the height of your temrinal allows on screen at one time. You may notice that you can no longer scroll the page with these keys. This is because the bookmark bar has focus when it is first opened. You can switch focus between the main content and the bookmarks bar by pressing the tab key (``), which will allow you to scroll in whichever area is needed at a given time. + +Closing the bookmarks bar is done the same way as opening it. + + + ++---------------------------+ ++ Navigating To Bookmarks + ++---------------------------+ + + +Navigating to a bookmark is done in much the same way as navigating to a regular link, except there is an additional command paramater. The syntax is as follows: + +`:bookmarks [bookmark-id]` or the abbreviated `:b [bookmark-id]` + +The bookmark-id is shown in the bookmarks bar next to the bookmark name. + +Examples: + +- `:bookmarks 3` +- `:b 21` + +If the bookmark-id you provide does not exist, Bombadillo will let you know. Otherwise, the URL that the selected bookmark represents will be loaded. + + + ++---------------------------+ ++ Deleting Bookmarks + ++---------------------------+ + + +To delete a bookmark you will need to know its ID. This can be found in the bookmarks bar (see above: 'Viewing Bookmarks') next to the bookmark's name. + +The syntax for deleting a bookmark is as follows: + +`:delete [bookmark-id]` or the abbreviated `:d [bookmark-id]` + +Examples: + +- `:delete 3` +- `:d 21` + +If the bookmark-id you provide does not exist, Bombadillo will let you know. Otherwise, the bookmark will be deleted. + + +________________________________ + +This concludes the help section brought up by the following keywords: + +bookmark, bookmarks, a, b, d, add, delete + From 3ffd878ad60d33cce61b02df7c2d00e2f9bfeab2 Mon Sep 17 00:00:00 2001 From: sloum Date: Sun, 21 Jun 2020 10:16:05 -0700 Subject: [PATCH 02/21] Working help requests! --- client.go | 23 +++++++------------- cmdparse/parser.go | 4 ++-- help.go | 35 +++++++++++++++++++++++++++++++ help/{add.help => bookmarks.help} | 0 4 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 help.go rename help/{add.help => bookmarks.help} (100%) diff --git a/client.go b/client.go index 6aa76db..579082c 100644 --- a/client.go +++ b/client.go @@ -22,20 +22,6 @@ import ( "tildegit.org/sloum/bombadillo/termios" ) -var ERRS = map[string]string{ - "ADD": "`add [target] [name...]`", - "DELETE": "`delete [bookmark-id]`", - "BOOKMARKS": "`bookmarks [[bookmark-id]]`", - "CHECK": "`check [link_id]` or `check [setting]`", - "HOME": "`home`", - "PURGE": "`purge [host]`", - "QUIT": "`quit`", - "RELOAD": "`reload`", - "SEARCH": "`search [[keyword(s)...]]`", - "SET": "`set [setting] [value]`", - "WRITE": "`write [target]`", - "HELP": "`help [[topic]]`", -} //------------------------------------------------\\ // + + + T Y P E S + + + \\ @@ -401,8 +387,13 @@ func (c *client) doCommand(action string, values []string) { c.SetMessage(syntaxErrorMessage("DELETE"), true) c.DrawMessage() case "?", "HELP": - c.SetMessage(syntaxErrorMessage("HELP"), true) - c.DrawMessage() + path, err := helpAddress(values[0]) + if err != nil { + c.SetMessage(err.Error(), true) + c.DrawMessage() + } else { + c.Visit(path) + } case "H", "HOME": c.SetMessage(syntaxErrorMessage("HOME"), true) c.DrawMessage() diff --git a/cmdparse/parser.go b/cmdparse/parser.go index dc5870a..39e08ee 100644 --- a/cmdparse/parser.go +++ b/cmdparse/parser.go @@ -94,10 +94,10 @@ func (p *Parser) parseAction() (*Command, error) { case Value: cm.Target = t.val cm.Type = DOLINK - case Word: + case Word, Action: cm.Value = append(cm.Value, t.val) cm.Type = DO - case Action, Whitespace: + case Whitespace: return nil, fmt.Errorf("Found %q (%d), expected value", t.val, t.kind) } t = p.scan() diff --git a/help.go b/help.go new file mode 100644 index 0000000..2a2c07f --- /dev/null +++ b/help.go @@ -0,0 +1,35 @@ +package main + +import ( + "fmt" + "path/filepath" + "strings" +) + +var ERRS = map[string]string{ + "ADD": "`add [target] [name...]`", + "DELETE": "`delete [bookmark-id]`", + "BOOKMARKS": "`bookmarks [[bookmark-id]]`", + "CHECK": "`check [link_id]` or `check [setting]`", + "HOME": "`home`", + "PURGE": "`purge [host]`", + "QUIT": "`quit`", + "RELOAD": "`reload`", + "SEARCH": "`search [[keyword(s)...]]`", + "SET": "`set [setting] [value]`", + "WRITE": "`write [target]`", + "HELP": "`help [[topic]]`", +} + +var helpRoot string = "/usr/local/share/bombadillo/help" + +func helpAddress(section string) (string, error) { + var addr string + switch strings.ToLower(section) { + case "add", "a", "delete", "d", "bookmarks", "bookmark", "b": + addr = "bookmarks.help" + default: + return "", fmt.Errorf("No help section for %q exists", section) + } + return filepath.Join(helpRoot, addr), nil +} diff --git a/help/add.help b/help/bookmarks.help similarity index 100% rename from help/add.help rename to help/bookmarks.help From 975a3e34fd57ed5f67ff93c50de82044982ed0fe Mon Sep 17 00:00:00 2001 From: sloum Date: Sun, 21 Jun 2020 15:53:31 -0700 Subject: [PATCH 03/21] Adds more help files --- help.go | 4 ++ help/bookmarks.help | 74 +++++++++++++++++++++++-------------- help/commands.help | 0 help/finger.help | 0 help/gemini.help | 0 help/general.help | 87 ++++++++++++++++++++++++++++++++++++++++++++ help/gopher.help | 0 help/help.help | 84 ++++++++++++++++++++++++++++++++++++++++++ help/keys.help | 0 help/license.help | 0 help/navigation.help | 0 help/protocols.help | 0 help/resources.help | 0 help/settings.help | 0 help/telnet.help | 0 15 files changed, 221 insertions(+), 28 deletions(-) create mode 100644 help/commands.help create mode 100644 help/finger.help create mode 100644 help/gemini.help create mode 100644 help/general.help create mode 100644 help/gopher.help create mode 100644 help/help.help create mode 100644 help/keys.help create mode 100644 help/license.help create mode 100644 help/navigation.help create mode 100644 help/protocols.help create mode 100644 help/resources.help create mode 100644 help/settings.help create mode 100644 help/telnet.help diff --git a/help.go b/help.go index 2a2c07f..2dbb429 100644 --- a/help.go +++ b/help.go @@ -28,6 +28,10 @@ func helpAddress(section string) (string, error) { switch strings.ToLower(section) { case "add", "a", "delete", "d", "bookmarks", "bookmark", "b": addr = "bookmarks.help" + case "quit", "quitting", "q", "flags", "runtime", "options", "exiting", "exit", "general", "startup", "version", "title": + addr = "general.help" + case "help", "info", "?", "information": + addr = "help.help" default: return "", fmt.Errorf("No help section for %q exists", section) } diff --git a/help/bookmarks.help b/help/bookmarks.help index ef60749..334a01e 100644 --- a/help/bookmarks.help +++ b/help/bookmarks.help @@ -6,81 +6,76 @@ It is easy to add, view, navigate to, and delete bookmarks in Bombadillo. Let's -+---------------------------+ -+ Adding Bookmarks + -+---------------------------+ +-- Adding Bookmarks -- Adding a bookmark is done with the add command and has the following syntax: -`:add [target] [name...]` +`add [target] [name...]` -Like many commands in Bombadillo, you can use an abbreviated form and just type `:a [target] [name...]` +Like many commands in Bombadillo, you can use an abbreviated form and just type `a [target] [name...]` The available target valies are a url, a link ID that appears on the current page, or the character `.`, which represents the current page itself. Examples: -- `:add gopher://bombadillo.colorfield.space Bombadillo` -- `:a 5 My Favorite Phlog` -- `:add . Dave's Gopherhole` +- `add gopher://bombadillo.colorfield.space Bombadillo` +- `a 5 My Favorite Phlog` +- `add . Dave's Gopherhole` If you are missing an element, or the link ID does not exist, Bombadillo will let you know the issue and/or show you the correct syntax. -+---------------------------+ -+ Viewing Bookmarks + -+---------------------------+ +-- Viewing Bookmarks -- -Viewing your bookmarks is quite easy. You can use a command or a "hot" key. To toggle the bookmarks bar into and out of view you can press the key `B` (the key combination `shift + b`). The command version is as follows: +Viewing your bookmarks is quite easy. You can use a command or a "hot" key. To toggle the bookmarks bar into and out of view you can press the key "B" (the key combination "shift" + "b"). The command version, including the abbreviated form, is as follows: -`:bookmarks` or the abbreviated `:b` +- `bookmarks` +- `b` In general, the hot key is likely more comfortable for most users. -Once the bookmarks bar is visible you can scroll up and down in it with the regular `j` and `k` keys to view your bookmarks if you have more than the height of your temrinal allows on screen at one time. You may notice that you can no longer scroll the page with these keys. This is because the bookmark bar has focus when it is first opened. You can switch focus between the main content and the bookmarks bar by pressing the tab key (``), which will allow you to scroll in whichever area is needed at a given time. +Once the bookmarks bar is visible you can scroll up and down in it with the regular "j" and "k" keys to view your bookmarks if you have more than the height of your temrinal allows on screen at one time. You may notice that you can no longer scroll the page with these keys. This is because the bookmark bar has focus when it is first opened. You can switch focus between the main content and the bookmarks bar by pressing the "tab" key, which will allow you to scroll in whichever area is needed at a given time. Closing the bookmarks bar is done the same way as opening it. -+---------------------------+ -+ Navigating To Bookmarks + -+---------------------------+ +-- Navigating To Bookmarks -- -Navigating to a bookmark is done in much the same way as navigating to a regular link, except there is an additional command paramater. The syntax is as follows: +Navigating to a bookmark is done in much the same way as navigating to a regular link, except there is an additional command paramater. The syntax, including the abbreviated version, is as follows: -`:bookmarks [bookmark-id]` or the abbreviated `:b [bookmark-id]` +- `bookmarks [bookmark-id]` +- `b [bookmark-id]` The bookmark-id is shown in the bookmarks bar next to the bookmark name. Examples: -- `:bookmarks 3` -- `:b 21` +- `bookmarks 3` +- `b 21` If the bookmark-id you provide does not exist, Bombadillo will let you know. Otherwise, the URL that the selected bookmark represents will be loaded. -+---------------------------+ -+ Deleting Bookmarks + -+---------------------------+ +-- Deleting Bookmarks -- To delete a bookmark you will need to know its ID. This can be found in the bookmarks bar (see above: 'Viewing Bookmarks') next to the bookmark's name. -The syntax for deleting a bookmark is as follows: +The syntax for deleting a bookmark, including the abbreviated form, is as follows: -`:delete [bookmark-id]` or the abbreviated `:d [bookmark-id]` +- `delete [bookmark-id]` +- `d [bookmark-id]` Examples: -- `:delete 3` -- `:d 21` +- `delete 3` +- `d 21` If the bookmark-id you provide does not exist, Bombadillo will let you know. Otherwise, the bookmark will be deleted. @@ -91,3 +86,26 @@ This concludes the help section brought up by the following keywords: bookmark, bookmarks, a, b, d, add, delete + + +Other sections of the help document: + +`help help` +`help general` +`help navigation` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` +`help license` + + diff --git a/help/commands.help b/help/commands.help new file mode 100644 index 0000000..e69de29 diff --git a/help/finger.help b/help/finger.help new file mode 100644 index 0000000..e69de29 diff --git a/help/gemini.help b/help/gemini.help new file mode 100644 index 0000000..e69de29 diff --git a/help/general.help b/help/general.help new file mode 100644 index 0000000..10c1e8e --- /dev/null +++ b/help/general.help @@ -0,0 +1,87 @@ + +General Opperation +--------------------------- + +This help guide will walk you through starting Bombadillo, including the various flags/options avialable at startup. It will also cover quitting Bombadillo and a few other simple commands that are not covered elsewhere. + + + +-- Starting Bombadillo -- + + +If Bombadillo has been installed somewhere on your system path the starting Bombadillo can be done by opening a terminal and typing `bombadillo` at the prompt. Bombadillo should open up in the existing terminal window. + +If Bombadillo is not on your system path you can either add it to the path and follow the above instructions, or you can navigate to the directory containing the Bombadillo executable and run it. For example, if I was the user "dave" and had the executable in my home folder I might run the following in my terminal's shell: + +- `~/bombadillo` +- `cd && ./bombadillo`. + +Users on Linux that support desktop files can also launch Bombadillo by clicking on the desktop icon (it may be found in a menu or launcher, depending on the system). + +Bombadillo supports a few command line flags to modify its behavior at run time. + +To see the command usage, you can run the following in your terminal's shell: + +`bombadillo -h` + +This will print out the available command line options, as well as the command syntax, and exit. + +To see the version of Bombadillo you are using, you can run the following in your terminal's shell: + +`bombadillo -v` + +This will print out the version and build information, and exit. + +The last command line flag will, for terminal's that support this, change the name of the tab or window that Bombadillo is running in to "Bombadillo". Not all terminals support this behavior, and some that do support it do not support removing it automatically. Most users will not need or want to use this flag, but some users that have a lot of terminal windows open might like to have the name as a reference, so this flag is made available. It can be run as follows: + +`bombadillo -t` + +The last item in this section is not a flag/option, but an argument. Bombadillo accepts a URL when it is invoked. This will cause Bombadillo to navigate directly to the given URL, rather than load your home page. This behavior can be combined with the `-t` flag, but not with the others. + +Examples (run from your terminal's shell): + +- `bombadillo bombadillo.colorfield.space` +- `bombadillo -t gopher://bombadillo.colorfield.space` + + + +-- Exiting Bombadillo -- + + +Exiting Bombadillo can be done four different ways. The simplest is to just press the "q" key. This will exit immediately. Alternatively you may use a command (and an abbreviated form of that command) to exit: + +`quit` +`q` + +Lastly, you can break out of the program by pressing "control" + "c" (while holding the "control" key, press the "c" key). This option should only be used if the program has frozen or you need to exit but the other three ways are not working. + + +________________________________ + +This concludes the help section brought up by the following keywords: + +quit, quitting, q, flags, runtime, options, exit, exiting, general, startup, version, title + + + +Other sections of the help document: + +`help help` +`help navigation` +`help bookmarks` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` +`help license` + + diff --git a/help/gopher.help b/help/gopher.help new file mode 100644 index 0000000..e69de29 diff --git a/help/help.help b/help/help.help new file mode 100644 index 0000000..bd6f9a0 --- /dev/null +++ b/help/help.help @@ -0,0 +1,84 @@ + +Using This Guide +--------------------------- + +The Bombadilo help system is a collection of small "how to" documents about varying aspects of Bombadillo. Some include instructions on what keys to press to achieve certain actions or the syntax for various commands. Others are guides to the kinds of content you will find on the various protocols Bombadillo supports, as well as how Bombadillo interacts with them. Others still are small collections of guides on how certain features work (for example: quitting Bombadillo or writing content to a file). + + + +-- Documentation Syntax -- + + +While reading articles in this help guide you will come across words enclosed in back-ticks, like so: `add 13`. Anytime you see text between back-ticks it represents an actual command that you can run in Bombadillo or your terminal shell. A command will always be noted as a shell command if it is one. Otherwise, you can assume it is a command to be run inside of Bombadillo (see: `help commands`). + +Key presses will be notated with double quotes. For example: "a", "B", "w". Keys that do not correspond to characters will be given by name, such as "tab", "space", or "control". Do note that "b" and "B" are different keys, with the later implying the combination of "shift" + "b" (or, if your "caps lock" is on, just "b"). + +Each page will end with a listing of the keywords that will bring up that page, when combined with the help command. A listing of other pages that can be viewed with the help command will also be included on each page. + + + +-- The Help Command -- + + +The help command can be run in two ways, with an argument and without: + +`help [keyword]` +`help` + +Running only the help command will load this page. When the help command is run with a keyword Bombadillo will attempt to find a page that can be identified by that keyword. All commands will have a page associated with them, as well as some other groupings of like items (commands, keys), and some pages talk about concepts (bookmarks, help, general). Most of the time just think of a single word that describes what you are looking, Bombadillo strives to make getting help intuitive. + + + +-- Contents -- + + +This is a listing of the available help sections (the keyword given below is the main keyword they are identified with, but many others also exist and are given at the bottom of each article). + + 1. help - This page + 2. general - A guide to running and quitting Bombadillo + 3. navigation - How to navigating within a single page, and between pages + 4. saving - How to save documents + 5. commands - A listing of the available commands and their syntax + 6. keys - A listing of the available "hot" keys + 7. search - How to use the default search engine + 8. settings - How to configure Bombadillo to your liking + 9. protocols - A top level guide to each protocol Bombadillo supports +10. gopher - Information about the gopher protocol +11. gemini - Information about the gemini protocol +12. http - Information about the HTTP & HTTPS protocols +13. finger - Information about the finger protocol +13. telnet - Information about the telnet protocol +14. local - Information about how Bombadillo handles local file browsing +15. resources - Places to get additional help or information +16. license - View the software license that Bombadillo is released under + + +________________________________ + +This concludes the help section brought up by the following keywords: + +help, ?, info, information + + + +Other sections of the help document: + +`help general` +`help bookmarks` +`help navigation` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` +`help license` + + diff --git a/help/keys.help b/help/keys.help new file mode 100644 index 0000000..e69de29 diff --git a/help/license.help b/help/license.help new file mode 100644 index 0000000..e69de29 diff --git a/help/navigation.help b/help/navigation.help new file mode 100644 index 0000000..e69de29 diff --git a/help/protocols.help b/help/protocols.help new file mode 100644 index 0000000..e69de29 diff --git a/help/resources.help b/help/resources.help new file mode 100644 index 0000000..e69de29 diff --git a/help/settings.help b/help/settings.help new file mode 100644 index 0000000..e69de29 diff --git a/help/telnet.help b/help/telnet.help new file mode 100644 index 0000000..e69de29 From 8b7e52bd5a6978618ee503120f15871e6a83d729 Mon Sep 17 00:00:00 2001 From: sloum Date: Sun, 21 Jun 2020 21:04:40 -0700 Subject: [PATCH 04/21] Adds help files to Makefile and adds more help content --- Makefile | 8 +- help.go | 16 +- help/license.help | 670 ++++++++++++++++++++++++++++++++++++++++++++++ help/saving.help | 61 +++++ 4 files changed, 753 insertions(+), 2 deletions(-) create mode 100644 help/saving.help diff --git a/Makefile b/Makefile index ddbc4bc..14bc416 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,12 @@ install-bin: build install -d ${DESTDIR}${BINDIR} install -m 0755 ./${BINARY} ${DESTDIR}${BINDIR} +.PHONY: install-help +install-help: + install -d ${DESTDIR}${DATAROOTDIR}/bombadillo/help + install -m 0644 ./help/* ${DESTDIR}${DATAROOTDIR}/bombadillo/help + + .PHONY: clean clean: ${GOCMD} clean @@ -65,6 +71,7 @@ uninstall: clean rm -f ${DESTDIR}${BINDIR}/${BINARY} rm -f ${DESTDIR}${DATAROOTDIR}/applications/bombadillo.desktop rm -f ${DESTDIR}${DATAROOTDIR}/pixmaps/bombadillo-icon.png + rm -rf ${DESTDIR}${DATAROOTDIR}/bombadillo -update-desktop-database 2> /dev/null .PHONY: release @@ -74,6 +81,5 @@ release: GOOS=linux GOARCH=386 ${GOCMD} build ${LDFLAGS} -o ${BINARY}_linux_32 GOOS=darwin GOARCH=amd64 ${GOCMD} build ${LDFLAGS} -o ${BINARY}_darwin_64 - .PHONY: test test: clean build diff --git a/help.go b/help.go index 2dbb429..1c6050b 100644 --- a/help.go +++ b/help.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "os" "path/filepath" "strings" ) @@ -32,8 +33,21 @@ func helpAddress(section string) (string, error) { addr = "general.help" case "help", "info", "?", "information": addr = "help.help" + case "write", "save", "saving", "w", "file", "writing", "download", "downloading", "downloads": + addr = "saving.help" + case "license": + addr = "license.help" default: return "", fmt.Errorf("No help section for %q exists", section) } - return filepath.Join(helpRoot, addr), nil + + fp := filepath.Join(helpRoot, addr) + + _, err := os.Stat(fp) + + if err != nil { + return "", fmt.Errorf("No help section for %q exists", section) + } + + return fp, nil } diff --git a/help/license.help b/help/license.help index e69de29..f65cda2 100644 --- a/help/license.help +++ b/help/license.help @@ -0,0 +1,670 @@ + +License +--------------------------- + +Bombadillo is released under the GNU GPL License and is open source software. At the time of this writing the source code is made available at: + +https://tildegit.org/sloum/bombadillo + +Bombadillo is primarily developed by sloum < sloum AT rawtext.club >, with much appreciated code and guidance by asdf, jboverf, cmccabe, makeworld, and dancek. As well as lots of folks who have made requests and turned in bug reports via the tildegit page. + + + +-- GNU GPL 3 -- + + + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + + + +________________________________ + +This concludes the help section brought up by the following keywords: + +license + + + +Other sections of the help document: + +`help help` +`help general` +`help navigation` +`help bookmarks` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` + + diff --git a/help/saving.help b/help/saving.help new file mode 100644 index 0000000..27d6ae4 --- /dev/null +++ b/help/saving.help @@ -0,0 +1,61 @@ + +Saving To File +--------------------------- + +Bombadillo is able to save your documents for you. In some cases it will try to do so automatically. Bombadillo will attempt to save any document it does not think it can display. For example, an executable file, a zip file, an image (if you have the setting "showimages" set to "false"), etc. In these cases Bombadillo will download the requested file to the path held in the setting "savelocation". This usually defaults to your home directory. For more information on the two settings mentioned above see: + +`help settings` + +There is not a 'save as' option, so all files will be saved as whatever their name is from the server. In the event that a file is loaded from a directory (an index.gmi file, or a gophermap, perhaps), the file will be saved as 'index'. In the event that there is already a file with the same name at your "savelocation" Bombadillo will add a number to the end of the filename (starting at 1 and going up as needed until it finds a name that does not yet exist). This way no files on your system get deleted accidentally. + + + +-- The Write Command -- + + +To write content to a file you will use the `write` command. The syntax is as follows: + +- `write [url]` +- `write [link_id]` +- `write .` + +In the first instance you pass the exact url to the file you would like to download. Bombadillo will download it directly without displaying its contents to you. The same goes for the second example, except instead of a URL you pass it the ID of a link found on the page you are currently viewing. + +The third option works a little bit differently. You pass the character '.', which symbolizes your current location. Bombadillo will not redownload the content and will instead write the contents of its buffer to file. There should be no difference between the two ways of going about it, but it is good to know the difference anyway. + +Examples: + +- `write gopher://bombadillo.colorfield.space/I/images/screenshot1.png` +- `write 3` +- `write .` + + +________________________________ + +This concludes the help section brought up by the following keywords: + +write, w, save, saving, file, writing, download, downloading, downloads + + +Other sections of the help document: + +`help help` +`help general` +`help navigation` +`help bookmarks` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` +`help license` + + From 8baf53d32b183e92e3213907fb308af9aa531f15 Mon Sep 17 00:00:00 2001 From: sloum Date: Tue, 23 Jun 2020 20:31:32 -0700 Subject: [PATCH 05/21] Adds more help sections --- help.go | 6 +++ help/finger.help | 59 +++++++++++++++++++++++++++++ help/gemini.help | 60 +++++++++++++++++++++++++++++ help/keys.help | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 223 insertions(+) diff --git a/help.go b/help.go index 1c6050b..9d2c01f 100644 --- a/help.go +++ b/help.go @@ -37,6 +37,12 @@ func helpAddress(section string) (string, error) { addr = "saving.help" case "license": addr = "license.help" + case "finger": + addr = "finger.help" + case "gemini", "text/gemini": + addr = "gemini.help" + case "keys", "key", "hotkeys", "hotkey", "keymap", "controls": + addr = "keys.help" default: return "", fmt.Errorf("No help section for %q exists", section) } diff --git a/help/finger.help b/help/finger.help index e69de29..1f51412 100644 --- a/help/finger.help +++ b/help/finger.help @@ -0,0 +1,59 @@ + +Finger Protocol +--------------------------- + +The finger protocol originated in the 1970s. It had a long period of usage and then had some serious security flaws found that lead to trouble. Since then the security issues have largely been patched up. Finger can be used to retrieve user and/or system information from a host. + +Gnerally speaking, if a host supports the finger protocol you can often get a list of logged in users, uptime stats, or other information by just querying the host. Querying a user at the host will, if the user provides it, yield the contents of their ".plan" and/or ".project" files. + +Some users and sysadmins get quite creative with what shows up on finger. Some are known to blog, have games, offer weird system stats (cpu temperature), etc. + + + +-- URL Format -- + + +The URL format in Bombadillo is as follows: + +`finger://[user@][host][:port]` + +The user section is optional, but if present must end in `@` (after the user's name). The host is required. The port is also optional, as a default finger port will be used if it is not included (this is fine for most use cases). + + + +-- More Information About Finger -- + + +- https://en.wikipedia.org/wiki/Finger_protocol + + +________________________________ + +This concludes the help section brought up by the following keywords: + +finger + + + +Other sections of the help document: + +`help help` +`help general` +`help bookmarks` +`help navigation` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gopher` + `help gemini` + `help http` + `help telnet` + `help local` +`help resources` +`help license` + + + diff --git a/help/gemini.help b/help/gemini.help index e69de29..2a8f728 100644 --- a/help/gemini.help +++ b/help/gemini.help @@ -0,0 +1,60 @@ + +Gemini Protocol +--------------------------- + +Gemini is a recent internet protocol. As Bombadillo 2.0 was being developed its design was really just getting started and Bombadillo was an early adopter and Bombadillo developers were involved in the discussions around the creation of the protocol. + +Bombadillo's implementation of the gemini protocol is centered around document retrieval, rather than applications. As such, client certificates were tested out but are deprecated in the client. Due to the terminal nature of Bombadillo and a desire to be simple and reliable headings, lists, and blockquotes are rendered literally in text/gemini documents. + + + +-- Bombadillo Gemini Support -- + + +- TLS for every connection to a gemini server +- A TOFU security model when interacting with servers +- Query fields (used for searching/interaction) +- Redirects +- Error messaging support (server errors, client errors, etc) +- Links for text/gemini documents +- Pre-formatted blocks for text/gemini documents (including alt text support) +- Support for relative links in text/gemini documents + + + +-- More information about gemini -- + + +- https://gemini.circumlunar.space/ +- gemini://gemini.circumlunar.space/ + + +________________________________ + +This concludes the help section brought up by the following keywords: + +gemini, text/gemini + + + +Other sections of the help document: + +`help help` +`help general` +`help bookmarks` +`help navigation` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` +`help license` + + diff --git a/help/keys.help b/help/keys.help index e69de29..c6bbbfb 100644 --- a/help/keys.help +++ b/help/keys.help @@ -0,0 +1,98 @@ + +Bombadillo Key Bindings +--------------------------- + +This help page functions as an appendix to let you know the various key bindings avialable to you and their functions. This information is also avialable in your terminal's shell by running `man bombadillo`. + + + +-- Navigating Within A Document -- + + +`j` -> SCROLL DOWN one line in the current document + +`k` -> SCROLL UP one line in the current document + +`d` -> PAGE DOWN in the current document (3/4 page scroll) + +`u` -> PAGE UP in the current document (3/4 page scroll) + +`g` -> SCROLL TO TOP of the current document + +`G` -> SCROLL TO TOP of the current document + + + +-- Navigating Between Documents -- + + +`h` or `b` -> BACK to previously viewed document + +`l` or `f` -> FORWARD to next document + +`R` -> RELOAD the current document + +`0`, `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, or `9` + -> VISIT a LINK in the current document corresponding to the pressed number (`0`, in this case, represents the link labeled "10") + + + +-- Bookmarks -- + + +`B` -> TOGGLE the BOOKMARKS bar in and out of VIEW + +`TAB` -> TOGGLE the FOCUS between the document and the bookmarks bar + + + +-- Search -- + + +`/` -> INITIATE SEARCH in the current document (press `/` then type your query and press `enter` to search) + +`n` -> Scroll to NEXT SEARCH result + +`N` -> Scroll to PREVIOUS SEARCH + + + +-- Other -- + + +`:` or `space` -> INITIATE COMMAND MODE. See: `help commands` for more information on commands + +`q` -> QUIT Bombadillo + + + +________________________________ + +This concludes the help section brought up by the following keywords: + +keys, key, hotkeys, hotkey, keymap, controls + + + +Other sections of the help document: + +`help help` +`help general` +`help bookmarks` +`help navigation` +`help saving` +`help commands` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` +`help license` + + + From 55a31fa8dffabfe4df3aee05a4db8119b8ea4bf9 Mon Sep 17 00:00:00 2001 From: sloum Date: Mon, 29 Jun 2020 21:18:20 -0700 Subject: [PATCH 06/21] Adds more help documentation --- help/gopher.help | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ help/local.help | 0 help/telnet.help | 49 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 help/local.help diff --git a/help/gopher.help b/help/gopher.help index e69de29..d761fbf 100644 --- a/help/gopher.help +++ b/help/gopher.help @@ -0,0 +1,59 @@ + +Gopher Protocol +--------------------------- + +From wikipedia: + +"The Gopher protocol is a communications protocol designed for distributing, searching, and retrieving documents in Internet Protocol networks. The design of the Gopher protocol and user interface is menu-driven." + +Gopher is, for most builds of Bombadillo, the default protocol that is used if no url scheme is provided and was the original protocol Bombadillo was built to support. + + + +-- Bombadillo Gopher Support -- + + +- Support for all item types, including telnet +- Search/query support + + + +-- Gopher URL Structure -- + +A gopher URL has a slightly unique structure: + +gopher://[host][:port]/[gopher-item-type][resource-path] + +Note that the gophertype is not required for a server to return content, but is required for a client (like Bombadillo) to interpret it properly. The port is optional; Bombadillo will use port 70 if no other port is supplies. + + +________________________________ + +This concludes the help section brought up by the following keywords: + +gopher + + + +Other sections of the help document: + +`help help` +`help general` +`help bookmarks` +`help navigation` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gemini` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` +`help license` + + + diff --git a/help/local.help b/help/local.help new file mode 100644 index 0000000..e69de29 diff --git a/help/telnet.help b/help/telnet.help index e69de29..16c69b6 100644 --- a/help/telnet.help +++ b/help/telnet.help @@ -0,0 +1,49 @@ + +Telnet Protocol +--------------------------- + +Telnet is a protocol for connecting to a remote server. Unlike ssh, this is not a secure connection. Bombadillo does not have a built-in telnet system but will reach out to the "telnet" application and use it to open telnet connections from inside of Bombadillo. For this feature to work a suitable program must be avialable on the system. For most users this will be "telnet", though Bombadillo does support using other applications via a user configurable setting (see `help settings`). + +This proxying of responsibility to a remote program works pretty well, but in some cases has been known to provide buggy output. + + + +-- Telnet URL Structure -- + + +Generally speaking, the following structure will be the most common (though Bombadillo will support any structure that the underlying telnet application supports, so long as the scheme "telnet://" is included at the beginning): + +telnet://[host][:port] + + +________________________________ + +This concludes the help section brought up by the following keywords: + +telnet + + + +Other sections of the help document: + +`help help` +`help general` +`help bookmarks` +`help navigation` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help local` +`help resources` +`help license` + + + + From 51cdb686f68fb9a2db66dd28f63661d3d4cc9fde Mon Sep 17 00:00:00 2001 From: sloum Date: Thu, 2 Jul 2020 11:37:00 -0700 Subject: [PATCH 07/21] Adds more help pages --- help.go | 8 ++ help/commands.help | 243 +++++++++++++++++++++++++++++++++++++++++++ help/gemini.help | 9 ++ help/navigation.help | 66 ++++++++++++ 4 files changed, 326 insertions(+) diff --git a/help.go b/help.go index 9d2c01f..1b065ad 100644 --- a/help.go +++ b/help.go @@ -41,8 +41,16 @@ func helpAddress(section string) (string, error) { addr = "finger.help" case "gemini", "text/gemini": addr = "gemini.help" + case "gopher": + addr = "gopher.help" case "keys", "key", "hotkeys", "hotkey", "keymap", "controls": addr = "keys.help" + case "telnet": + addr = "telnet.help" + case "navigating", "navigation", "scroll", "scrolling", "history","links", "link": + addr = "navigation.help" + case "command", "commands", "functions": + addr = "commands.help" default: return "", fmt.Errorf("No help section for %q exists", section) } diff --git a/help/commands.help b/help/commands.help index e69de29..0c22c5b 100644 --- a/help/commands.help +++ b/help/commands.help @@ -0,0 +1,243 @@ + +Bombadillo Commands +--------------------------- + +This help page functions as an appendix to let you know the various commands available to you. Each command will have the syntax, description, and at least one example provided. + +To use any of the commands below you will first need to enter command mode. This is done by pressing the `:` (while not already in command mode). You may then type your command. Once you have typed your command, press enter to execute it. To cancel command execution and return to normal mode press enter with no text provided for the command. Instead of `:` you may, at your option, type ` ` (the space key) instead. In either case a ':' will appear in the bottom left to let you know you are in command mode and can type a command. + +The information in this help guide is largely copied from the Bombadillo man page. you can view this document by entering the following at your terminal's shell prompt (assuming your system administrator, potentially you, installed the man apge): + +- `man bombadillo` + + + +-- add -- + + +Syntax: + +add [url] [name...] +add [link id] [name...] +add . [name...] + +Adds the url (either directly with a url, represented by a link id, or the current url as represented by '.') as a bookmarks labeled by name. `a` can be used instead of the full `add`. + +Examples: + +`add gopher://bombadillo.colorfield.space Bombadillo Homepage` +`a 5 Bombadillo Homepage` +`a . Bombadillo` + + + +-- bookmarks -- + + +Syntax: + +bookmarks +bookmarks [bookmark id] + +When the command is given without an id, the bookmark bar will be toggled open/closed, this can also be accomplished with the "hot" key `B`. When the command is given with a bookmark id Bombadillo will navigate to the URL that is represented by the given bookmark id. In either case, the shorthand `b` can be used rather than the full `bookmarks`. + +Examples: + +`bookmarks 12` +`bookmarks` +`b 7` + + + +-- check -- + + +Syntax: + +check [link id] +check [setting name] + +The check command allows you to see the value of something. You can give it a link id on the current page and it will show you the url that it links to, or you can give it a setting name and it will show you the current value of that setting. The shorthand `c` may be used rather than the full `check`. + +Examples: + +`check 4` +`c webmode` + + + +-- delete -- + + +Syntax: + +delete [bookmark id] + +The delete command is used to remove the bookmark matching the bookmark id that is given to the command. The shorthand `d` may be used rather than the full `delete`. + +Examples: + +`delete 6` +`d 18` + + + +-- help -- + + +Syntax: + +help +help [keyword] + +If the help command is run without a further argument the user will be navigated to the Bombadillo gopher hole's 'Quick Start' page. To view local help files on a particular topic you may pass a relevant keyword to the command. The shorthand `?` may be used rather than the full `help`. + +Examples: + +`help` +`?` +`help commands` +`h general` + + + +-- home -- + + +Syntax: + +home + +Navigates to the url/document set by the 'homeurl' setting. The shorthand 'h' may be used rather than the full 'home'. + +Examples: + +`home` +`h` + + + +-- purge -- + +Syntax: + +purge * +purge [host name] + +Purge is a command used specifically in relation to the gemini protocol. If you want to clear the TLS certificates on file for all gemini hosts you can pass a '*', otherwise pass the host whose certificate you want to clear. In general using purge is considered insecure and not recommended, but is provided as an option for users that want more control of their security choices. Once a certificate has been purged Bombadillo will automatically request a new certificate the next time that particular host is visited. The shorthand `p` may be used rather than the full `purge`. + +Examples: + +`purge *` +`p gemini.circumlunar.space` + + + +-- quit -- + +Syntax: + +quit + +Quit does what it sounds like: it quits Bombadillo. This is the same as preseing the `q` key. The shorthand `q` may be used instead of the full `quit`. + +Examples: + +`quit` +`q` + + + +-- reload -- + +Syntax: + +reload + +The reload command will reload the current page. This entails making a new request and replacing the current history location with the result of that request. The "hot" key `R` can be used to achieve the same result. The shorthand `r` may be used rather than the full `reload`. + +Examples: + +`reload` + + + +-- search -- + +Syntax: + +search +search [keywords...] + +The search command queries you for search terms and submits a search to the search engine set by the 'searchengine' setting. If keywords are supplied then you will not be queried for keywords and the supplied keywords will instead be used for your search. + +Examples: + +`search` +`search bombadillo gopher client` + + + +-- set -- + +Syntax: + +set [setting name] [value] + +The set command sets the value for a given configuration setting. The shorthand `s` can be used instead of the full `set`. To see the value of a setting, use the 'check' command. + +Examples: + +`set webmode lynx` +`s timeout 5` + + + +-- write -- + +Syntax: + +write [url] +write [link id] +write . + +The write command will write a document to a local file at the location set by the configuration setting 'savelocation'. The write command accepts a url, a link id, or the character '.' (representing the current document). The shorthand `w` may be used rather than the full `write`. + +Examples: + +`write 2` +`w gopher://bombadillo.colorfield.space` +`w .` + + + +________________________________ + +This concludes the help section brought up by the following keywords: + +command, commands, functions + + + +Other sections of the help document: + +`help help` +`help general` +`help bookmarks` +`help navigation` +`help saving` +`help keys` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` +`help license` + + + diff --git a/help/gemini.help b/help/gemini.help index 2a8f728..d4d24bc 100644 --- a/help/gemini.help +++ b/help/gemini.help @@ -11,6 +11,8 @@ Bombadillo's implementation of the gemini protocol is centered around document r -- Bombadillo Gemini Support -- +Bombadillo supports: + - TLS for every connection to a gemini server - A TOFU security model when interacting with servers - Query fields (used for searching/interaction) @@ -21,6 +23,13 @@ Bombadillo's implementation of the gemini protocol is centered around document r - Support for relative links in text/gemini documents +Bombadillo does not support: + +- Client certificates +- Special rendering for lists, headings, and blockquotes in text/gemini documents + - Special rendering here refers to font changes or similar + + -- More information about gemini -- diff --git a/help/navigation.help b/help/navigation.help index e69de29..535b185 100644 --- a/help/navigation.help +++ b/help/navigation.help @@ -0,0 +1,66 @@ + +Navigation +--------------------------- + +Navigation in Bombadillo has two components: navigating within a single document and navigating between multiple documents. This guide will cover both. + + + +-- Navigating Within a Document -- + + +Scrolling up and down is accomplished with `k` and `j` respectively. These are so-called "hot" keys. You do not need to enter command mode to use them. `u` and `d` will page up and down. `g` will take you to the top of a document and `G` will take you to the bottom. + +Those are the basics to moving around a single document. For more information on the available key bindings, use: + +`help keys` + + + +-- Navigating Between Multiple Documents -- + + +You can navigate to an address for which you have a URL by entering command mode (type `:`) and then typing or pasting in the address and pressing the enter key to submit your command. + +For protocols that have a concept of links (most of them), pages that have links will show link numbers on the left hand side of Bombadillo next to the text that describes that link. To follow a link enter command mode by typing `:`, followed by the link number and press the enter key to submit your command. + +Bombadillo keeps a temporary 'history' of your navigation while you are browsing. This history is always cleared every time you exit Bombadillo and will hold at most 20 places in your browsing history for a session. To move backward and forward through your history press `b` and `f` respectively. The same can also be done with `h` and `l`. Moving backward and forward does not trigger a reload/refresh of the page data. If you are visiting a page that updates often you may want to press `R` to refresh the page when moving backward and forward through your history. + +To navigate to a bookmarked page you will need the bookmark number. Once you have it you will want to enter command mode by typing `:` and entering `b ` and then the number, followed by the enter key. For example: + +`:b 5` + +For more information on using bookmarks please see: + +`help bookmarks` + + +________________________________ + +This concludes the help section brought up by the following keywords: + +navigation, scroll, scrolling, history, navigating, links, link + + + +Other sections of the help document: + +`help help` +`help general` +`help bookmarks` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` +`help license` + + From 7f3705fba6e22ac481d9bdad7ece8ea72a8277df Mon Sep 17 00:00:00 2001 From: sloum Date: Thu, 16 Jul 2020 22:05:37 -0700 Subject: [PATCH 08/21] Adds more help documentation --- help.go | 8 +++++- help/gemini.help | 25 ++++++++++++++++- help/local.help | 51 ++++++++++++++++++++++++++++++++++ help/protocols.help | 67 +++++++++++++++++++++++++++++++++++++++++++++ help/resources.help | 54 ++++++++++++++++++++++++++++++++++++ 5 files changed, 203 insertions(+), 2 deletions(-) diff --git a/help.go b/help.go index 1b065ad..59aaa2c 100644 --- a/help.go +++ b/help.go @@ -37,9 +37,11 @@ func helpAddress(section string) (string, error) { addr = "saving.help" case "license": addr = "license.help" + case "local", "file": + addr = "local.help" case "finger": addr = "finger.help" - case "gemini", "text/gemini": + case "gemini", "text/gemini", "tls", "tofu": addr = "gemini.help" case "gopher": addr = "gopher.help" @@ -51,6 +53,10 @@ func helpAddress(section string) (string, error) { addr = "navigation.help" case "command", "commands", "functions": addr = "commands.help" + case "protocol", "protocols": + addr = "protocols.help" + case "resources", "links": + addr = "resources.go" default: return "", fmt.Errorf("No help section for %q exists", section) } diff --git a/help/gemini.help b/help/gemini.help index d4d24bc..903930a 100644 --- a/help/gemini.help +++ b/help/gemini.help @@ -31,6 +31,29 @@ Bombadillo does not support: +-- TLS / TOFU -- + + +Bombadillo connects to all gemini servers via TLS. During the TLS connection handshake the server provides a certificate. If this is the first time you have visited this particular host then Bombadillo will save the certificate hash and its expiration automatically and connect you to the site. The next time you visit a document at that same host the certificate offered by the server will be compared to the one on file. If the one on file has expired then the new one will be accepted automatically. If the certificates differ and the one on file has not expired then you will receive an error message from Bombadillo letting you know that "no matching cert was found". Bombadillo will not connect to the site. This is for your protection and is intentional. It makes you make a choice: trust this new certificate or not. Most users will likely decide to trust the new certificate. To have Bombadillo trust the new certificate you must purge the old one. + +To purge a certificate for the host example.com run the following Bombadillo command: + +`purge example.com` + +Now when you visit the site again it will accept the new certificate and file it away as the one to compare against. + +For more info on the purge command, see `help commands` + +Other reasons you may receive an error related to certificates: + +- The server offers a certificate that is expired +- The server offers a certificate that is not yet valid +- The server offers a certificate with a hostname different than the one you are requesting + +If any of the above occur you will be notified. A purge will not solve this problem. Bombadillo, for your safety, will not connect to a site that does not offer a valid TLS certificate. This is by design and will most certainly annoy you when it happens. For that we appologize. + + + -- More information about gemini -- @@ -42,7 +65,7 @@ ________________________________ This concludes the help section brought up by the following keywords: -gemini, text/gemini +gemini, text/gemini, tls, tofu diff --git a/help/local.help b/help/local.help index e69de29..9640818 100644 --- a/help/local.help +++ b/help/local.help @@ -0,0 +1,51 @@ + +Local protocol +--------------------------- + +The local protocol works very similarly to the 'file` protocol implemented in many modern web browsers. It allows you to view and navigate your files and filesystem. + + + +-- Syntax / Usage -- + + +When using the local protocol you should prefix the path you want with 'local://', so to view '/usr/local/bin' you would enter the following address into Bombadillo: + +`local:///user/local/bin` + +You may notice there is a third slash after 'local:', this represents the root directory and must be included in full paths. + +Bombadillo's local protocol will also expand tildes for your home directory ('local://~'). + +Other than those things, navigation works like any other protocol, enter the link ID to navigate around folders or view files. When navigating to a folder the output will appear similar to running 'ls -la' in your shell. It will show hidden files and will output file permissions along with the file names. It does not, however, show file sizes. + + +________________________________ + +This concludes the help section brought up by the following keywords: + +local, file + + + +Other sections of the help document: + +`help help` +`help general` +`help navigation` +`help bookmarks` +`help saving` +`help commands` +`help keys` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` +`help resources` +`help license` + + diff --git a/help/protocols.help b/help/protocols.help index e69de29..0c87499 100644 --- a/help/protocols.help +++ b/help/protocols.help @@ -0,0 +1,67 @@ + +Protocols +--------------------------- + +Bombadillo supports the following protocols: + +- gopher +- gemini +- finger +- local + +With the help of outside software the following additional protocols are supported: + +- telnet +- http +- https + +Any terminal based telnet application can be used and can be set in your settings. + +http(s) is supported by leveraging the rendering abilities of the following terminal based web browsers: + +- lynx +- w3m +- elinks + +Having any of the three available on your path and setting 'webmode' to the appropriate browser will allow you to view http(s) content inside of Bombadillo. To set your webmode, follow this example: + +`set webmode lynx` + +None (will not follow http(s) links at all) and gui are also viable settings. gui will attempt to open http(s) links in your default graphical web browser. + +For more information on any given protocol please see their individual protocol help page(s) (see below). + + +________________________________ + +This concludes the help section brought up by the following keywords: + +protocol, protocols + + +Other sections of the help document: + +`help help` +`help general` +`help navigation` +`help bookmarks` +`help saving` +`help commands` +`help keys` +`help savin` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help resources` +`help license` + + + + + diff --git a/help/resources.help b/help/resources.help index e69de29..c69c172 100644 --- a/help/resources.help +++ b/help/resources.help @@ -0,0 +1,54 @@ + +Resources +--------------------------- + +Additional help resources are available and can be found at the following locations: + +gopher://bombadillo.colorfield.space +https://bombadillo.colorfield.space + +Or in your shell: + +`man bombadillo` + + +You can view the source code for Bombadillo as well: + +https://tildegit.org/sloum/bombadillo + +The README document in the source code repository linked above has detailed build and install instructions as well. + + +________________________________ + +This concludes the help section brought up by the following keywords: + +resources, links + + +Other sections of the help document: + +`help help` +`help general` +`help navigation` +`help bookmarks` +`help saving` +`help commands` +`help keys` +`help saving` +`help search` +`help settings` +`help protocols` + `help gemini` + `help gopher` + `help http` + `help finger` + `help telnet` + `help local` +`help license` + + + + + + From 2f8eedded7969c14de96426d6a09d499e933b2be Mon Sep 17 00:00:00 2001 From: asdf Date: Tue, 8 Sep 2020 13:41:52 +1000 Subject: [PATCH 09/21] Handle input errors while returning to correct terminal mode --- cui/cui.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cui/cui.go b/cui/cui.go index c3ee14a..1ed29d7 100644 --- a/cui/cui.go +++ b/cui/cui.go @@ -102,6 +102,7 @@ func Getch() rune { func GetLine(prefix string) (string, error) { termios.SetLineMode() + defer termios.SetCharMode() reader := bufio.NewReader(os.Stdin) fmt.Print(prefix) @@ -110,7 +111,6 @@ func GetLine(prefix string) (string, error) { return "", err } - termios.SetCharMode() return text[:len(text)-1], nil } From 3031536a0cb87b9b631fe3e195ebf90cbc32f846 Mon Sep 17 00:00:00 2001 From: asdf Date: Tue, 8 Sep 2020 15:10:52 +1000 Subject: [PATCH 10/21] Updated to reflect the current release process --- DEVELOPING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPING.md b/DEVELOPING.md index 4b05842..6ecdc8b 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -25,10 +25,10 @@ Changes are implemented to the default branch when: ### Process for introducing a new change -Please refer to our [notes on contributing](README.md#contributing) to get an understanding of how new changes are initiated, the type of changes accepted and the review process. +Before you begin, please refer to our [notes on contributing](README.md#contributing) to get an understanding of how new changes are initiated, the type of changes accepted and the review process. 1. Create a new feature branch based on the **develop** branch. -1. Raise a pull request (PR) targeting the **develop** branch. +1. Raise a pull request (PR) targeting the current release branch (confirm this in the issue comments before proceeding). 1. The PR is reviewed. 1. If the PR is approved, it is merged. 1. The version number is incremented, along with any other release activity. From 01d071e5109e8f5cdcb5ce920a22c43582bd9220 Mon Sep 17 00:00:00 2001 From: sloum Date: Tue, 8 Sep 2020 21:20:34 -0700 Subject: [PATCH 11/21] Adds spacing to gemini docs to normalize the formatting with gopher docs --- .client.go.swp | Bin 0 -> 49152 bytes .page.go.swp | Bin 0 -> 20480 bytes .url.go.swp | Bin 0 -> 16384 bytes client.go | 1 + gemini/.gemini.go.swp | Bin 0 -> 28672 bytes gemini/gemini.go | 10 ++++++++-- page.go | 10 +++++++--- 7 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .client.go.swp create mode 100644 .page.go.swp create mode 100644 .url.go.swp create mode 100644 gemini/.gemini.go.swp diff --git a/.client.go.swp b/.client.go.swp new file mode 100644 index 0000000000000000000000000000000000000000..839ee1aa961974d07153ae9fac480bbc477b4ff3 GIT binary patch literal 49152 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 3 { alt = strings.TrimSpace(alt[3:]) - splitContent[outputIndex] = fmt.Sprintf("[ %s ]", alt) + splitContent[outputIndex] = fmt.Sprintf("%s[ALT][ %s ]", spacer, alt) outputIndex++ } } else if isPreBlockDeclaration { @@ -401,7 +402,12 @@ func parseGemini(b, currentUrl string) (string, []string) { if inPreBlock && (BlockBehavior == "alt" || BlockBehavior == "neither") { continue } - splitContent[outputIndex] = ln + var leader, tail string = "", "" + if len(ln) > 0 && ln[0] == '#' { + leader = "\033[1m" + tail = "\033[0m" + } + splitContent[outputIndex] = fmt.Sprintf("%s%s%s%s", spacer, leader, ln, tail) outputIndex++ } } diff --git a/page.go b/page.go index ad44ab2..48d9d26 100644 --- a/page.go +++ b/page.go @@ -72,7 +72,8 @@ func (p *Page) WrapContent(width int, color bool) { } width = min(width, 100) counter := 0 - spacer := " " + gopherspacer := " " + geminispacer := " " var content strings.Builder var esc strings.Builder escape := false @@ -126,8 +127,11 @@ func (p *Page) WrapContent(width int, color bool) { content.WriteRune('\n') counter = 0 if p.Location.Mime == "1" { - content.WriteString(spacer) - counter += len(spacer) + content.WriteString(gopherspacer) + counter += len(gopherspacer) + } else if strings.HasSuffix(p.Location.Mime, "gemini") { + content.WriteString(geminispacer) + counter += len(geminispacer) } content.WriteRune(ch) counter++ From 36b256da075f7bd441dfdcdd5bad7ac3e8f3adcf Mon Sep 17 00:00:00 2001 From: sloum Date: Tue, 8 Sep 2020 21:35:59 -0700 Subject: [PATCH 12/21] Removes swap files --- .client.go.swp | Bin 49152 -> 0 bytes .page.go.swp | Bin 20480 -> 0 bytes .url.go.swp | Bin 16384 -> 0 bytes gemini/.gemini.go.swp | Bin 28672 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .client.go.swp delete mode 100644 .page.go.swp delete mode 100644 .url.go.swp delete mode 100644 gemini/.gemini.go.swp diff --git a/.client.go.swp b/.client.go.swp deleted file mode 100644 index 839ee1aa961974d07153ae9fac480bbc477b4ff3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49152 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 Date: Tue, 8 Sep 2020 21:37:01 -0700 Subject: [PATCH 13/21] Updates gitinore to ignore swap files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cb9380e..6f40a17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bombadillo *.asciinema +*.swp From 86ba01b1d922ae5c5f56fd22d8d5b26b1ab3f26e Mon Sep 17 00:00:00 2001 From: asdf Date: Thu, 10 Sep 2020 21:04:10 +1000 Subject: [PATCH 14/21] Updated branch, reduced to implementing improved error messages --- Makefile | 8 +- client.go | 138 +-------- help.go | 91 ++---- help/bookmarks.help | 111 ------- help/commands.help | 243 ---------------- help/finger.help | 59 ---- help/gemini.help | 92 ------ help/general.help | 87 ------ help/gopher.help | 59 ---- help/help.help | 84 ------ help/keys.help | 98 ------- help/license.help | 670 ------------------------------------------- help/local.help | 51 ---- help/navigation.help | 66 ----- help/protocols.help | 67 ----- help/resources.help | 54 ---- help/saving.help | 61 ---- help/settings.help | 0 help/telnet.help | 49 ---- 19 files changed, 32 insertions(+), 2056 deletions(-) delete mode 100644 help/bookmarks.help delete mode 100644 help/commands.help delete mode 100644 help/finger.help delete mode 100644 help/gemini.help delete mode 100644 help/general.help delete mode 100644 help/gopher.help delete mode 100644 help/help.help delete mode 100644 help/keys.help delete mode 100644 help/license.help delete mode 100644 help/local.help delete mode 100644 help/navigation.help delete mode 100644 help/protocols.help delete mode 100644 help/resources.help delete mode 100644 help/saving.help delete mode 100644 help/settings.help delete mode 100644 help/telnet.help diff --git a/Makefile b/Makefile index 14bc416..ddbc4bc 100644 --- a/Makefile +++ b/Makefile @@ -53,12 +53,6 @@ install-bin: build install -d ${DESTDIR}${BINDIR} install -m 0755 ./${BINARY} ${DESTDIR}${BINDIR} -.PHONY: install-help -install-help: - install -d ${DESTDIR}${DATAROOTDIR}/bombadillo/help - install -m 0644 ./help/* ${DESTDIR}${DATAROOTDIR}/bombadillo/help - - .PHONY: clean clean: ${GOCMD} clean @@ -71,7 +65,6 @@ uninstall: clean rm -f ${DESTDIR}${BINDIR}/${BINARY} rm -f ${DESTDIR}${DATAROOTDIR}/applications/bombadillo.desktop rm -f ${DESTDIR}${DATAROOTDIR}/pixmaps/bombadillo-icon.png - rm -rf ${DESTDIR}${DATAROOTDIR}/bombadillo -update-desktop-database 2> /dev/null .PHONY: release @@ -81,5 +74,6 @@ release: GOOS=linux GOARCH=386 ${GOCMD} build ${LDFLAGS} -o ${BINARY}_linux_32 GOOS=darwin GOARCH=amd64 ${GOCMD} build ${LDFLAGS} -o ${BINARY}_darwin_64 + .PHONY: test test: clean build diff --git a/client.go b/client.go index 590f244..a7fa7c1 100644 --- a/client.go +++ b/client.go @@ -320,24 +320,6 @@ func (c *client) routeCommandInput(com *cmdparse.Command) error { func (c *client) simpleCommand(action string) { action = strings.ToUpper(action) switch action { - case "A", "ADD": - c.SetMessage(syntaxErrorMessage("ADD"), true) - c.DrawMessage() - case "S", "SET": - c.SetMessage(syntaxErrorMessage("SET"), true) - c.DrawMessage() - case "D", "DELETE": - c.SetMessage(syntaxErrorMessage("DELETE"), true) - c.DrawMessage() - case "W", "WRITE": - c.SetMessage(syntaxErrorMessage("WRITE"), true) - c.DrawMessage() - case "P", "PURGE": - c.SetMessage(syntaxErrorMessage("PURGE"), true) - c.DrawMessage() - case "C", "CHECK": - c.SetMessage(syntaxErrorMessage("CHECK"), true) - c.DrawMessage() case "Q", "QUIT": cui.Exit(0, "") case "H", "HOME": @@ -364,45 +346,16 @@ func (c *client) simpleCommand(action string) { case "HELP", "?": go c.Visit(helplocation) default: - c.SetMessage(fmt.Sprintf("Unknown action %q", action), true) + c.SetMessage(syntaxErrorMessage(action), true) c.DrawMessage() } } func (c *client) doCommand(action string, values []string) { switch action { - case "A", "ADD": - c.SetMessage(syntaxErrorMessage("ADD"), true) - c.DrawMessage() - case "B", "BOOKMARKS": - c.SetMessage(syntaxErrorMessage("BOOKMARKS"), true) - c.DrawMessage() case "C", "CHECK": c.displayConfigValue(values[0]) c.DrawMessage() - case "D", "DELETE": - c.SetMessage(syntaxErrorMessage("DELETE"), true) - c.DrawMessage() - case "?", "HELP": - path, err := helpAddress(values[0]) - if err != nil { - c.SetMessage(err.Error(), true) - c.DrawMessage() - } else { - c.Visit(path) - } - case "H", "HOME": - c.SetMessage(syntaxErrorMessage("HOME"), true) - c.DrawMessage() - case "Q", "QUIT": - c.SetMessage(syntaxErrorMessage("QUIT"), true) - c.DrawMessage() - case "R", "RELOAD": - c.SetMessage(syntaxErrorMessage("QUIT"), true) - c.DrawMessage() - case "S", "SET": - c.SetMessage(syntaxErrorMessage("SET"), true) - c.DrawMessage() case "PURGE", "P": err := c.Certs.Purge(values[0]) if err != nil { @@ -447,43 +400,19 @@ func (c *client) doCommand(action string, values []string) { c.saveFile(u, fn) default: - c.SetMessage(fmt.Sprintf("Unknown action %q", action), true) + c.SetMessage(syntaxErrorMessage(action), true) c.DrawMessage() } } func (c *client) doCommandAs(action string, values []string) { switch action { - case "B", "BOOKMARKS": - c.SetMessage(syntaxErrorMessage("BOOKMARKS"), true) - c.DrawMessage() case "C", "CHECK": c.displayConfigValue(values[0]) c.DrawMessage() - case "D", "DELETE": - c.SetMessage(syntaxErrorMessage("DELETE"), true) - c.DrawMessage() - case "?", "HELP": - c.SetMessage(syntaxErrorMessage("HELP"), true) - c.DrawMessage() - case "H", "HOME": - c.SetMessage(syntaxErrorMessage("HOME"), true) - c.DrawMessage() - case "P", "PURGE": - c.SetMessage(syntaxErrorMessage("PURGE"), true) - c.DrawMessage() - case "Q", "QUIT": - c.SetMessage(syntaxErrorMessage("QUIT"), true) - c.DrawMessage() - case "R", "RELOAD": - c.SetMessage(syntaxErrorMessage("QUIT"), true) - c.DrawMessage() - case "W", "WRITE": - c.SetMessage(syntaxErrorMessage("WRITE"), true) - c.DrawMessage() case "ADD", "A": if len(values) < 2 { - c.SetMessage(syntaxErrorMessage("ADD"), true) + c.SetMessage(syntaxErrorMessage(action), true) c.DrawMessage() return } @@ -509,14 +438,14 @@ func (c *client) doCommandAs(action string, values []string) { } case "SEARCH": if len(values) < 2 { - c.SetMessage(syntaxErrorMessage("SEARCH"), true) + c.SetMessage(syntaxErrorMessage(action), true) c.DrawMessage() return } c.search(strings.Join(values, " "), "", "") case "SET", "S": if len(values) < 2 { - c.SetMessage(syntaxErrorMessage("SET"), true) + c.SetMessage(syntaxErrorMessage(action), true) c.DrawMessage() return } @@ -550,7 +479,7 @@ func (c *client) doCommandAs(action string, values []string) { c.SetMessage(fmt.Sprintf("Unable to set %s, it does not exist", values[0]), true) c.DrawMessage() default: - c.SetMessage(fmt.Sprintf("Unknown command structure"), true) + c.SetMessage(syntaxErrorMessage(action), true) c.DrawMessage() } } @@ -573,36 +502,9 @@ func (c *client) doLinkCommandAs(action, target string, values []string) { } switch action { - case "B", "BOOKMARKS": - c.SetMessage(syntaxErrorMessage("BOOKMARKS"), true) - c.DrawMessage() case "C", "CHECK": c.displayConfigValue(values[0]) c.DrawMessage() - case "D", "DELETE": - c.SetMessage(syntaxErrorMessage("DELETE"), true) - c.DrawMessage() - case "?", "HELP": - c.SetMessage(syntaxErrorMessage("HELP"), true) - c.DrawMessage() - case "H", "HOME": - c.SetMessage(syntaxErrorMessage("HOME"), true) - c.DrawMessage() - case "P", "PURGE": - c.SetMessage(syntaxErrorMessage("PURGE"), true) - c.DrawMessage() - case "Q", "QUIT": - c.SetMessage(syntaxErrorMessage("QUIT"), true) - c.DrawMessage() - case "R", "RELOAD": - c.SetMessage(syntaxErrorMessage("QUIT"), true) - c.DrawMessage() - case "SEARCH": - c.SetMessage(syntaxErrorMessage("SEARCH"), true) - c.DrawMessage() - case "S", "SET": - c.SetMessage(syntaxErrorMessage("SET"), true) - c.DrawMessage() case "ADD", "A": bm := make([]string, 0, 5) bm = append(bm, links[num]) @@ -630,7 +532,7 @@ func (c *client) doLinkCommandAs(action, target string, values []string) { out = append(out, values...) c.doCommandAs(action, out) default: - c.SetMessage(fmt.Sprintf("Unknown command structure"), true) + c.SetMessage(syntaxErrorMessage(action), true) c.DrawMessage() } } @@ -700,30 +602,6 @@ func (c *client) doLinkCommand(action, target string) { } switch action { - case "A", "ADD": - c.SetMessage(syntaxErrorMessage("ADD"), true) - c.DrawMessage() - case "?", "HELP": - c.SetMessage(syntaxErrorMessage("HELP"), true) - c.DrawMessage() - case "H", "HOME": - c.SetMessage(syntaxErrorMessage("HOME"), true) - c.DrawMessage() - case "P", "PURGE": - c.SetMessage(syntaxErrorMessage("PURGE"), true) - c.DrawMessage() - case "Q", "QUIT": - c.SetMessage(syntaxErrorMessage("QUIT"), true) - c.DrawMessage() - case "R", "RELOAD": - c.SetMessage(syntaxErrorMessage("QUIT"), true) - c.DrawMessage() - case "SEARCH": - c.SetMessage(syntaxErrorMessage("SEARCH"), true) - c.DrawMessage() - case "S", "SET": - c.SetMessage(syntaxErrorMessage("SET"), true) - c.DrawMessage() case "DELETE", "D": msg, err := c.BookMarks.Delete(num) if err != nil { @@ -786,7 +664,7 @@ func (c *client) doLinkCommand(action, target string) { } c.saveFile(u, fn) default: - c.SetMessage("Unknown command structure", true) + c.SetMessage(syntaxErrorMessage(action), true) c.DrawMessage() } diff --git a/help.go b/help.go index 59aaa2c..fb87de9 100644 --- a/help.go +++ b/help.go @@ -1,73 +1,28 @@ package main -import ( - "fmt" - "os" - "path/filepath" - "strings" -) - +// ERRS maps commands to their help text var ERRS = map[string]string{ - "ADD": "`add [target] [name...]`", - "DELETE": "`delete [bookmark-id]`", + "A": "`a [target] [name...]`", + "ADD": "`add [target] [name...]`", + "D": "`d [bookmark-id]`", + "DELETE": "`delete [bookmark-id]`", + "B": "`b [[bookmark-id]]`", "BOOKMARKS": "`bookmarks [[bookmark-id]]`", - "CHECK": "`check [link_id]` or `check [setting]`", - "HOME": "`home`", - "PURGE": "`purge [host]`", - "QUIT": "`quit`", - "RELOAD": "`reload`", - "SEARCH": "`search [[keyword(s)...]]`", - "SET": "`set [setting] [value]`", - "WRITE": "`write [target]`", - "HELP": "`help [[topic]]`", -} - -var helpRoot string = "/usr/local/share/bombadillo/help" - -func helpAddress(section string) (string, error) { - var addr string - switch strings.ToLower(section) { - case "add", "a", "delete", "d", "bookmarks", "bookmark", "b": - addr = "bookmarks.help" - case "quit", "quitting", "q", "flags", "runtime", "options", "exiting", "exit", "general", "startup", "version", "title": - addr = "general.help" - case "help", "info", "?", "information": - addr = "help.help" - case "write", "save", "saving", "w", "file", "writing", "download", "downloading", "downloads": - addr = "saving.help" - case "license": - addr = "license.help" - case "local", "file": - addr = "local.help" - case "finger": - addr = "finger.help" - case "gemini", "text/gemini", "tls", "tofu": - addr = "gemini.help" - case "gopher": - addr = "gopher.help" - case "keys", "key", "hotkeys", "hotkey", "keymap", "controls": - addr = "keys.help" - case "telnet": - addr = "telnet.help" - case "navigating", "navigation", "scroll", "scrolling", "history","links", "link": - addr = "navigation.help" - case "command", "commands", "functions": - addr = "commands.help" - case "protocol", "protocols": - addr = "protocols.help" - case "resources", "links": - addr = "resources.go" - default: - return "", fmt.Errorf("No help section for %q exists", section) - } - - fp := filepath.Join(helpRoot, addr) - - _, err := os.Stat(fp) - - if err != nil { - return "", fmt.Errorf("No help section for %q exists", section) - } - - return fp, nil + "C": "`c [link_id]` or `check [setting]`", + "CHECK": "`check [link_id]` or `check [setting]`", + "H": "`h`", + "HOME": "`home`", + "P": "`p [host]`", + "PURGE": "`purge [host]`", + "Q": "`q`", + "QUIT": "`quit`", + "R": "`r`", + "RELOAD": "`reload`", + "SEARCH": "`search [[keyword(s)...]]`", + "S": "`s [setting] [value]`", + "SET": "`set [setting] [value]`", + "W": "`w [target]`", + "WRITE": "`write [target]`", + "?": "`?`", + "HELP": "`help`", } diff --git a/help/bookmarks.help b/help/bookmarks.help deleted file mode 100644 index 334a01e..0000000 --- a/help/bookmarks.help +++ /dev/null @@ -1,111 +0,0 @@ - -Bookmark Management ---------------------------- - -It is easy to add, view, navigate to, and delete bookmarks in Bombadillo. Let's tackle them in that order: - - - --- Adding Bookmarks -- - - -Adding a bookmark is done with the add command and has the following syntax: - -`add [target] [name...]` - -Like many commands in Bombadillo, you can use an abbreviated form and just type `a [target] [name...]` - -The available target valies are a url, a link ID that appears on the current page, or the character `.`, which represents the current page itself. - -Examples: - -- `add gopher://bombadillo.colorfield.space Bombadillo` -- `a 5 My Favorite Phlog` -- `add . Dave's Gopherhole` - -If you are missing an element, or the link ID does not exist, Bombadillo will let you know the issue and/or show you the correct syntax. - - - --- Viewing Bookmarks -- - - -Viewing your bookmarks is quite easy. You can use a command or a "hot" key. To toggle the bookmarks bar into and out of view you can press the key "B" (the key combination "shift" + "b"). The command version, including the abbreviated form, is as follows: - -- `bookmarks` -- `b` - -In general, the hot key is likely more comfortable for most users. - -Once the bookmarks bar is visible you can scroll up and down in it with the regular "j" and "k" keys to view your bookmarks if you have more than the height of your temrinal allows on screen at one time. You may notice that you can no longer scroll the page with these keys. This is because the bookmark bar has focus when it is first opened. You can switch focus between the main content and the bookmarks bar by pressing the "tab" key, which will allow you to scroll in whichever area is needed at a given time. - -Closing the bookmarks bar is done the same way as opening it. - - - --- Navigating To Bookmarks -- - - -Navigating to a bookmark is done in much the same way as navigating to a regular link, except there is an additional command paramater. The syntax, including the abbreviated version, is as follows: - -- `bookmarks [bookmark-id]` -- `b [bookmark-id]` - -The bookmark-id is shown in the bookmarks bar next to the bookmark name. - -Examples: - -- `bookmarks 3` -- `b 21` - -If the bookmark-id you provide does not exist, Bombadillo will let you know. Otherwise, the URL that the selected bookmark represents will be loaded. - - - --- Deleting Bookmarks -- - - -To delete a bookmark you will need to know its ID. This can be found in the bookmarks bar (see above: 'Viewing Bookmarks') next to the bookmark's name. - -The syntax for deleting a bookmark, including the abbreviated form, is as follows: - -- `delete [bookmark-id]` -- `d [bookmark-id]` - -Examples: - -- `delete 3` -- `d 21` - -If the bookmark-id you provide does not exist, Bombadillo will let you know. Otherwise, the bookmark will be deleted. - - -________________________________ - -This concludes the help section brought up by the following keywords: - -bookmark, bookmarks, a, b, d, add, delete - - - -Other sections of the help document: - -`help help` -`help general` -`help navigation` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` -`help license` - - diff --git a/help/commands.help b/help/commands.help deleted file mode 100644 index 0c22c5b..0000000 --- a/help/commands.help +++ /dev/null @@ -1,243 +0,0 @@ - -Bombadillo Commands ---------------------------- - -This help page functions as an appendix to let you know the various commands available to you. Each command will have the syntax, description, and at least one example provided. - -To use any of the commands below you will first need to enter command mode. This is done by pressing the `:` (while not already in command mode). You may then type your command. Once you have typed your command, press enter to execute it. To cancel command execution and return to normal mode press enter with no text provided for the command. Instead of `:` you may, at your option, type ` ` (the space key) instead. In either case a ':' will appear in the bottom left to let you know you are in command mode and can type a command. - -The information in this help guide is largely copied from the Bombadillo man page. you can view this document by entering the following at your terminal's shell prompt (assuming your system administrator, potentially you, installed the man apge): - -- `man bombadillo` - - - --- add -- - - -Syntax: - -add [url] [name...] -add [link id] [name...] -add . [name...] - -Adds the url (either directly with a url, represented by a link id, or the current url as represented by '.') as a bookmarks labeled by name. `a` can be used instead of the full `add`. - -Examples: - -`add gopher://bombadillo.colorfield.space Bombadillo Homepage` -`a 5 Bombadillo Homepage` -`a . Bombadillo` - - - --- bookmarks -- - - -Syntax: - -bookmarks -bookmarks [bookmark id] - -When the command is given without an id, the bookmark bar will be toggled open/closed, this can also be accomplished with the "hot" key `B`. When the command is given with a bookmark id Bombadillo will navigate to the URL that is represented by the given bookmark id. In either case, the shorthand `b` can be used rather than the full `bookmarks`. - -Examples: - -`bookmarks 12` -`bookmarks` -`b 7` - - - --- check -- - - -Syntax: - -check [link id] -check [setting name] - -The check command allows you to see the value of something. You can give it a link id on the current page and it will show you the url that it links to, or you can give it a setting name and it will show you the current value of that setting. The shorthand `c` may be used rather than the full `check`. - -Examples: - -`check 4` -`c webmode` - - - --- delete -- - - -Syntax: - -delete [bookmark id] - -The delete command is used to remove the bookmark matching the bookmark id that is given to the command. The shorthand `d` may be used rather than the full `delete`. - -Examples: - -`delete 6` -`d 18` - - - --- help -- - - -Syntax: - -help -help [keyword] - -If the help command is run without a further argument the user will be navigated to the Bombadillo gopher hole's 'Quick Start' page. To view local help files on a particular topic you may pass a relevant keyword to the command. The shorthand `?` may be used rather than the full `help`. - -Examples: - -`help` -`?` -`help commands` -`h general` - - - --- home -- - - -Syntax: - -home - -Navigates to the url/document set by the 'homeurl' setting. The shorthand 'h' may be used rather than the full 'home'. - -Examples: - -`home` -`h` - - - --- purge -- - -Syntax: - -purge * -purge [host name] - -Purge is a command used specifically in relation to the gemini protocol. If you want to clear the TLS certificates on file for all gemini hosts you can pass a '*', otherwise pass the host whose certificate you want to clear. In general using purge is considered insecure and not recommended, but is provided as an option for users that want more control of their security choices. Once a certificate has been purged Bombadillo will automatically request a new certificate the next time that particular host is visited. The shorthand `p` may be used rather than the full `purge`. - -Examples: - -`purge *` -`p gemini.circumlunar.space` - - - --- quit -- - -Syntax: - -quit - -Quit does what it sounds like: it quits Bombadillo. This is the same as preseing the `q` key. The shorthand `q` may be used instead of the full `quit`. - -Examples: - -`quit` -`q` - - - --- reload -- - -Syntax: - -reload - -The reload command will reload the current page. This entails making a new request and replacing the current history location with the result of that request. The "hot" key `R` can be used to achieve the same result. The shorthand `r` may be used rather than the full `reload`. - -Examples: - -`reload` - - - --- search -- - -Syntax: - -search -search [keywords...] - -The search command queries you for search terms and submits a search to the search engine set by the 'searchengine' setting. If keywords are supplied then you will not be queried for keywords and the supplied keywords will instead be used for your search. - -Examples: - -`search` -`search bombadillo gopher client` - - - --- set -- - -Syntax: - -set [setting name] [value] - -The set command sets the value for a given configuration setting. The shorthand `s` can be used instead of the full `set`. To see the value of a setting, use the 'check' command. - -Examples: - -`set webmode lynx` -`s timeout 5` - - - --- write -- - -Syntax: - -write [url] -write [link id] -write . - -The write command will write a document to a local file at the location set by the configuration setting 'savelocation'. The write command accepts a url, a link id, or the character '.' (representing the current document). The shorthand `w` may be used rather than the full `write`. - -Examples: - -`write 2` -`w gopher://bombadillo.colorfield.space` -`w .` - - - -________________________________ - -This concludes the help section brought up by the following keywords: - -command, commands, functions - - - -Other sections of the help document: - -`help help` -`help general` -`help bookmarks` -`help navigation` -`help saving` -`help keys` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` -`help license` - - - diff --git a/help/finger.help b/help/finger.help deleted file mode 100644 index 1f51412..0000000 --- a/help/finger.help +++ /dev/null @@ -1,59 +0,0 @@ - -Finger Protocol ---------------------------- - -The finger protocol originated in the 1970s. It had a long period of usage and then had some serious security flaws found that lead to trouble. Since then the security issues have largely been patched up. Finger can be used to retrieve user and/or system information from a host. - -Gnerally speaking, if a host supports the finger protocol you can often get a list of logged in users, uptime stats, or other information by just querying the host. Querying a user at the host will, if the user provides it, yield the contents of their ".plan" and/or ".project" files. - -Some users and sysadmins get quite creative with what shows up on finger. Some are known to blog, have games, offer weird system stats (cpu temperature), etc. - - - --- URL Format -- - - -The URL format in Bombadillo is as follows: - -`finger://[user@][host][:port]` - -The user section is optional, but if present must end in `@` (after the user's name). The host is required. The port is also optional, as a default finger port will be used if it is not included (this is fine for most use cases). - - - --- More Information About Finger -- - - -- https://en.wikipedia.org/wiki/Finger_protocol - - -________________________________ - -This concludes the help section brought up by the following keywords: - -finger - - - -Other sections of the help document: - -`help help` -`help general` -`help bookmarks` -`help navigation` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gopher` - `help gemini` - `help http` - `help telnet` - `help local` -`help resources` -`help license` - - - diff --git a/help/gemini.help b/help/gemini.help deleted file mode 100644 index 903930a..0000000 --- a/help/gemini.help +++ /dev/null @@ -1,92 +0,0 @@ - -Gemini Protocol ---------------------------- - -Gemini is a recent internet protocol. As Bombadillo 2.0 was being developed its design was really just getting started and Bombadillo was an early adopter and Bombadillo developers were involved in the discussions around the creation of the protocol. - -Bombadillo's implementation of the gemini protocol is centered around document retrieval, rather than applications. As such, client certificates were tested out but are deprecated in the client. Due to the terminal nature of Bombadillo and a desire to be simple and reliable headings, lists, and blockquotes are rendered literally in text/gemini documents. - - - --- Bombadillo Gemini Support -- - - -Bombadillo supports: - -- TLS for every connection to a gemini server -- A TOFU security model when interacting with servers -- Query fields (used for searching/interaction) -- Redirects -- Error messaging support (server errors, client errors, etc) -- Links for text/gemini documents -- Pre-formatted blocks for text/gemini documents (including alt text support) -- Support for relative links in text/gemini documents - - -Bombadillo does not support: - -- Client certificates -- Special rendering for lists, headings, and blockquotes in text/gemini documents - - Special rendering here refers to font changes or similar - - - --- TLS / TOFU -- - - -Bombadillo connects to all gemini servers via TLS. During the TLS connection handshake the server provides a certificate. If this is the first time you have visited this particular host then Bombadillo will save the certificate hash and its expiration automatically and connect you to the site. The next time you visit a document at that same host the certificate offered by the server will be compared to the one on file. If the one on file has expired then the new one will be accepted automatically. If the certificates differ and the one on file has not expired then you will receive an error message from Bombadillo letting you know that "no matching cert was found". Bombadillo will not connect to the site. This is for your protection and is intentional. It makes you make a choice: trust this new certificate or not. Most users will likely decide to trust the new certificate. To have Bombadillo trust the new certificate you must purge the old one. - -To purge a certificate for the host example.com run the following Bombadillo command: - -`purge example.com` - -Now when you visit the site again it will accept the new certificate and file it away as the one to compare against. - -For more info on the purge command, see `help commands` - -Other reasons you may receive an error related to certificates: - -- The server offers a certificate that is expired -- The server offers a certificate that is not yet valid -- The server offers a certificate with a hostname different than the one you are requesting - -If any of the above occur you will be notified. A purge will not solve this problem. Bombadillo, for your safety, will not connect to a site that does not offer a valid TLS certificate. This is by design and will most certainly annoy you when it happens. For that we appologize. - - - --- More information about gemini -- - - -- https://gemini.circumlunar.space/ -- gemini://gemini.circumlunar.space/ - - -________________________________ - -This concludes the help section brought up by the following keywords: - -gemini, text/gemini, tls, tofu - - - -Other sections of the help document: - -`help help` -`help general` -`help bookmarks` -`help navigation` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` -`help license` - - diff --git a/help/general.help b/help/general.help deleted file mode 100644 index 10c1e8e..0000000 --- a/help/general.help +++ /dev/null @@ -1,87 +0,0 @@ - -General Opperation ---------------------------- - -This help guide will walk you through starting Bombadillo, including the various flags/options avialable at startup. It will also cover quitting Bombadillo and a few other simple commands that are not covered elsewhere. - - - --- Starting Bombadillo -- - - -If Bombadillo has been installed somewhere on your system path the starting Bombadillo can be done by opening a terminal and typing `bombadillo` at the prompt. Bombadillo should open up in the existing terminal window. - -If Bombadillo is not on your system path you can either add it to the path and follow the above instructions, or you can navigate to the directory containing the Bombadillo executable and run it. For example, if I was the user "dave" and had the executable in my home folder I might run the following in my terminal's shell: - -- `~/bombadillo` -- `cd && ./bombadillo`. - -Users on Linux that support desktop files can also launch Bombadillo by clicking on the desktop icon (it may be found in a menu or launcher, depending on the system). - -Bombadillo supports a few command line flags to modify its behavior at run time. - -To see the command usage, you can run the following in your terminal's shell: - -`bombadillo -h` - -This will print out the available command line options, as well as the command syntax, and exit. - -To see the version of Bombadillo you are using, you can run the following in your terminal's shell: - -`bombadillo -v` - -This will print out the version and build information, and exit. - -The last command line flag will, for terminal's that support this, change the name of the tab or window that Bombadillo is running in to "Bombadillo". Not all terminals support this behavior, and some that do support it do not support removing it automatically. Most users will not need or want to use this flag, but some users that have a lot of terminal windows open might like to have the name as a reference, so this flag is made available. It can be run as follows: - -`bombadillo -t` - -The last item in this section is not a flag/option, but an argument. Bombadillo accepts a URL when it is invoked. This will cause Bombadillo to navigate directly to the given URL, rather than load your home page. This behavior can be combined with the `-t` flag, but not with the others. - -Examples (run from your terminal's shell): - -- `bombadillo bombadillo.colorfield.space` -- `bombadillo -t gopher://bombadillo.colorfield.space` - - - --- Exiting Bombadillo -- - - -Exiting Bombadillo can be done four different ways. The simplest is to just press the "q" key. This will exit immediately. Alternatively you may use a command (and an abbreviated form of that command) to exit: - -`quit` -`q` - -Lastly, you can break out of the program by pressing "control" + "c" (while holding the "control" key, press the "c" key). This option should only be used if the program has frozen or you need to exit but the other three ways are not working. - - -________________________________ - -This concludes the help section brought up by the following keywords: - -quit, quitting, q, flags, runtime, options, exit, exiting, general, startup, version, title - - - -Other sections of the help document: - -`help help` -`help navigation` -`help bookmarks` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` -`help license` - - diff --git a/help/gopher.help b/help/gopher.help deleted file mode 100644 index d761fbf..0000000 --- a/help/gopher.help +++ /dev/null @@ -1,59 +0,0 @@ - -Gopher Protocol ---------------------------- - -From wikipedia: - -"The Gopher protocol is a communications protocol designed for distributing, searching, and retrieving documents in Internet Protocol networks. The design of the Gopher protocol and user interface is menu-driven." - -Gopher is, for most builds of Bombadillo, the default protocol that is used if no url scheme is provided and was the original protocol Bombadillo was built to support. - - - --- Bombadillo Gopher Support -- - - -- Support for all item types, including telnet -- Search/query support - - - --- Gopher URL Structure -- - -A gopher URL has a slightly unique structure: - -gopher://[host][:port]/[gopher-item-type][resource-path] - -Note that the gophertype is not required for a server to return content, but is required for a client (like Bombadillo) to interpret it properly. The port is optional; Bombadillo will use port 70 if no other port is supplies. - - -________________________________ - -This concludes the help section brought up by the following keywords: - -gopher - - - -Other sections of the help document: - -`help help` -`help general` -`help bookmarks` -`help navigation` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gemini` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` -`help license` - - - diff --git a/help/help.help b/help/help.help deleted file mode 100644 index bd6f9a0..0000000 --- a/help/help.help +++ /dev/null @@ -1,84 +0,0 @@ - -Using This Guide ---------------------------- - -The Bombadilo help system is a collection of small "how to" documents about varying aspects of Bombadillo. Some include instructions on what keys to press to achieve certain actions or the syntax for various commands. Others are guides to the kinds of content you will find on the various protocols Bombadillo supports, as well as how Bombadillo interacts with them. Others still are small collections of guides on how certain features work (for example: quitting Bombadillo or writing content to a file). - - - --- Documentation Syntax -- - - -While reading articles in this help guide you will come across words enclosed in back-ticks, like so: `add 13`. Anytime you see text between back-ticks it represents an actual command that you can run in Bombadillo or your terminal shell. A command will always be noted as a shell command if it is one. Otherwise, you can assume it is a command to be run inside of Bombadillo (see: `help commands`). - -Key presses will be notated with double quotes. For example: "a", "B", "w". Keys that do not correspond to characters will be given by name, such as "tab", "space", or "control". Do note that "b" and "B" are different keys, with the later implying the combination of "shift" + "b" (or, if your "caps lock" is on, just "b"). - -Each page will end with a listing of the keywords that will bring up that page, when combined with the help command. A listing of other pages that can be viewed with the help command will also be included on each page. - - - --- The Help Command -- - - -The help command can be run in two ways, with an argument and without: - -`help [keyword]` -`help` - -Running only the help command will load this page. When the help command is run with a keyword Bombadillo will attempt to find a page that can be identified by that keyword. All commands will have a page associated with them, as well as some other groupings of like items (commands, keys), and some pages talk about concepts (bookmarks, help, general). Most of the time just think of a single word that describes what you are looking, Bombadillo strives to make getting help intuitive. - - - --- Contents -- - - -This is a listing of the available help sections (the keyword given below is the main keyword they are identified with, but many others also exist and are given at the bottom of each article). - - 1. help - This page - 2. general - A guide to running and quitting Bombadillo - 3. navigation - How to navigating within a single page, and between pages - 4. saving - How to save documents - 5. commands - A listing of the available commands and their syntax - 6. keys - A listing of the available "hot" keys - 7. search - How to use the default search engine - 8. settings - How to configure Bombadillo to your liking - 9. protocols - A top level guide to each protocol Bombadillo supports -10. gopher - Information about the gopher protocol -11. gemini - Information about the gemini protocol -12. http - Information about the HTTP & HTTPS protocols -13. finger - Information about the finger protocol -13. telnet - Information about the telnet protocol -14. local - Information about how Bombadillo handles local file browsing -15. resources - Places to get additional help or information -16. license - View the software license that Bombadillo is released under - - -________________________________ - -This concludes the help section brought up by the following keywords: - -help, ?, info, information - - - -Other sections of the help document: - -`help general` -`help bookmarks` -`help navigation` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` -`help license` - - diff --git a/help/keys.help b/help/keys.help deleted file mode 100644 index c6bbbfb..0000000 --- a/help/keys.help +++ /dev/null @@ -1,98 +0,0 @@ - -Bombadillo Key Bindings ---------------------------- - -This help page functions as an appendix to let you know the various key bindings avialable to you and their functions. This information is also avialable in your terminal's shell by running `man bombadillo`. - - - --- Navigating Within A Document -- - - -`j` -> SCROLL DOWN one line in the current document - -`k` -> SCROLL UP one line in the current document - -`d` -> PAGE DOWN in the current document (3/4 page scroll) - -`u` -> PAGE UP in the current document (3/4 page scroll) - -`g` -> SCROLL TO TOP of the current document - -`G` -> SCROLL TO TOP of the current document - - - --- Navigating Between Documents -- - - -`h` or `b` -> BACK to previously viewed document - -`l` or `f` -> FORWARD to next document - -`R` -> RELOAD the current document - -`0`, `1`, `2`, `3`, `4`, `5`, `6`, `7`, `8`, or `9` - -> VISIT a LINK in the current document corresponding to the pressed number (`0`, in this case, represents the link labeled "10") - - - --- Bookmarks -- - - -`B` -> TOGGLE the BOOKMARKS bar in and out of VIEW - -`TAB` -> TOGGLE the FOCUS between the document and the bookmarks bar - - - --- Search -- - - -`/` -> INITIATE SEARCH in the current document (press `/` then type your query and press `enter` to search) - -`n` -> Scroll to NEXT SEARCH result - -`N` -> Scroll to PREVIOUS SEARCH - - - --- Other -- - - -`:` or `space` -> INITIATE COMMAND MODE. See: `help commands` for more information on commands - -`q` -> QUIT Bombadillo - - - -________________________________ - -This concludes the help section brought up by the following keywords: - -keys, key, hotkeys, hotkey, keymap, controls - - - -Other sections of the help document: - -`help help` -`help general` -`help bookmarks` -`help navigation` -`help saving` -`help commands` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` -`help license` - - - diff --git a/help/license.help b/help/license.help deleted file mode 100644 index f65cda2..0000000 --- a/help/license.help +++ /dev/null @@ -1,670 +0,0 @@ - -License ---------------------------- - -Bombadillo is released under the GNU GPL License and is open source software. At the time of this writing the source code is made available at: - -https://tildegit.org/sloum/bombadillo - -Bombadillo is primarily developed by sloum < sloum AT rawtext.club >, with much appreciated code and guidance by asdf, jboverf, cmccabe, makeworld, and dancek. As well as lots of folks who have made requests and turned in bug reports via the tildegit page. - - - --- GNU GPL 3 -- - - - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - - - -________________________________ - -This concludes the help section brought up by the following keywords: - -license - - - -Other sections of the help document: - -`help help` -`help general` -`help navigation` -`help bookmarks` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` - - diff --git a/help/local.help b/help/local.help deleted file mode 100644 index 9640818..0000000 --- a/help/local.help +++ /dev/null @@ -1,51 +0,0 @@ - -Local protocol ---------------------------- - -The local protocol works very similarly to the 'file` protocol implemented in many modern web browsers. It allows you to view and navigate your files and filesystem. - - - --- Syntax / Usage -- - - -When using the local protocol you should prefix the path you want with 'local://', so to view '/usr/local/bin' you would enter the following address into Bombadillo: - -`local:///user/local/bin` - -You may notice there is a third slash after 'local:', this represents the root directory and must be included in full paths. - -Bombadillo's local protocol will also expand tildes for your home directory ('local://~'). - -Other than those things, navigation works like any other protocol, enter the link ID to navigate around folders or view files. When navigating to a folder the output will appear similar to running 'ls -la' in your shell. It will show hidden files and will output file permissions along with the file names. It does not, however, show file sizes. - - -________________________________ - -This concludes the help section brought up by the following keywords: - -local, file - - - -Other sections of the help document: - -`help help` -`help general` -`help navigation` -`help bookmarks` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` -`help resources` -`help license` - - diff --git a/help/navigation.help b/help/navigation.help deleted file mode 100644 index 535b185..0000000 --- a/help/navigation.help +++ /dev/null @@ -1,66 +0,0 @@ - -Navigation ---------------------------- - -Navigation in Bombadillo has two components: navigating within a single document and navigating between multiple documents. This guide will cover both. - - - --- Navigating Within a Document -- - - -Scrolling up and down is accomplished with `k` and `j` respectively. These are so-called "hot" keys. You do not need to enter command mode to use them. `u` and `d` will page up and down. `g` will take you to the top of a document and `G` will take you to the bottom. - -Those are the basics to moving around a single document. For more information on the available key bindings, use: - -`help keys` - - - --- Navigating Between Multiple Documents -- - - -You can navigate to an address for which you have a URL by entering command mode (type `:`) and then typing or pasting in the address and pressing the enter key to submit your command. - -For protocols that have a concept of links (most of them), pages that have links will show link numbers on the left hand side of Bombadillo next to the text that describes that link. To follow a link enter command mode by typing `:`, followed by the link number and press the enter key to submit your command. - -Bombadillo keeps a temporary 'history' of your navigation while you are browsing. This history is always cleared every time you exit Bombadillo and will hold at most 20 places in your browsing history for a session. To move backward and forward through your history press `b` and `f` respectively. The same can also be done with `h` and `l`. Moving backward and forward does not trigger a reload/refresh of the page data. If you are visiting a page that updates often you may want to press `R` to refresh the page when moving backward and forward through your history. - -To navigate to a bookmarked page you will need the bookmark number. Once you have it you will want to enter command mode by typing `:` and entering `b ` and then the number, followed by the enter key. For example: - -`:b 5` - -For more information on using bookmarks please see: - -`help bookmarks` - - -________________________________ - -This concludes the help section brought up by the following keywords: - -navigation, scroll, scrolling, history, navigating, links, link - - - -Other sections of the help document: - -`help help` -`help general` -`help bookmarks` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` -`help license` - - diff --git a/help/protocols.help b/help/protocols.help deleted file mode 100644 index 0c87499..0000000 --- a/help/protocols.help +++ /dev/null @@ -1,67 +0,0 @@ - -Protocols ---------------------------- - -Bombadillo supports the following protocols: - -- gopher -- gemini -- finger -- local - -With the help of outside software the following additional protocols are supported: - -- telnet -- http -- https - -Any terminal based telnet application can be used and can be set in your settings. - -http(s) is supported by leveraging the rendering abilities of the following terminal based web browsers: - -- lynx -- w3m -- elinks - -Having any of the three available on your path and setting 'webmode' to the appropriate browser will allow you to view http(s) content inside of Bombadillo. To set your webmode, follow this example: - -`set webmode lynx` - -None (will not follow http(s) links at all) and gui are also viable settings. gui will attempt to open http(s) links in your default graphical web browser. - -For more information on any given protocol please see their individual protocol help page(s) (see below). - - -________________________________ - -This concludes the help section brought up by the following keywords: - -protocol, protocols - - -Other sections of the help document: - -`help help` -`help general` -`help navigation` -`help bookmarks` -`help saving` -`help commands` -`help keys` -`help savin` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` -`help license` - - - - - diff --git a/help/resources.help b/help/resources.help deleted file mode 100644 index c69c172..0000000 --- a/help/resources.help +++ /dev/null @@ -1,54 +0,0 @@ - -Resources ---------------------------- - -Additional help resources are available and can be found at the following locations: - -gopher://bombadillo.colorfield.space -https://bombadillo.colorfield.space - -Or in your shell: - -`man bombadillo` - - -You can view the source code for Bombadillo as well: - -https://tildegit.org/sloum/bombadillo - -The README document in the source code repository linked above has detailed build and install instructions as well. - - -________________________________ - -This concludes the help section brought up by the following keywords: - -resources, links - - -Other sections of the help document: - -`help help` -`help general` -`help navigation` -`help bookmarks` -`help saving` -`help commands` -`help keys` -`help saving` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help license` - - - - - - diff --git a/help/saving.help b/help/saving.help deleted file mode 100644 index 27d6ae4..0000000 --- a/help/saving.help +++ /dev/null @@ -1,61 +0,0 @@ - -Saving To File ---------------------------- - -Bombadillo is able to save your documents for you. In some cases it will try to do so automatically. Bombadillo will attempt to save any document it does not think it can display. For example, an executable file, a zip file, an image (if you have the setting "showimages" set to "false"), etc. In these cases Bombadillo will download the requested file to the path held in the setting "savelocation". This usually defaults to your home directory. For more information on the two settings mentioned above see: - -`help settings` - -There is not a 'save as' option, so all files will be saved as whatever their name is from the server. In the event that a file is loaded from a directory (an index.gmi file, or a gophermap, perhaps), the file will be saved as 'index'. In the event that there is already a file with the same name at your "savelocation" Bombadillo will add a number to the end of the filename (starting at 1 and going up as needed until it finds a name that does not yet exist). This way no files on your system get deleted accidentally. - - - --- The Write Command -- - - -To write content to a file you will use the `write` command. The syntax is as follows: - -- `write [url]` -- `write [link_id]` -- `write .` - -In the first instance you pass the exact url to the file you would like to download. Bombadillo will download it directly without displaying its contents to you. The same goes for the second example, except instead of a URL you pass it the ID of a link found on the page you are currently viewing. - -The third option works a little bit differently. You pass the character '.', which symbolizes your current location. Bombadillo will not redownload the content and will instead write the contents of its buffer to file. There should be no difference between the two ways of going about it, but it is good to know the difference anyway. - -Examples: - -- `write gopher://bombadillo.colorfield.space/I/images/screenshot1.png` -- `write 3` -- `write .` - - -________________________________ - -This concludes the help section brought up by the following keywords: - -write, w, save, saving, file, writing, download, downloading, downloads - - -Other sections of the help document: - -`help help` -`help general` -`help navigation` -`help bookmarks` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help telnet` - `help local` -`help resources` -`help license` - - diff --git a/help/settings.help b/help/settings.help deleted file mode 100644 index e69de29..0000000 diff --git a/help/telnet.help b/help/telnet.help deleted file mode 100644 index 16c69b6..0000000 --- a/help/telnet.help +++ /dev/null @@ -1,49 +0,0 @@ - -Telnet Protocol ---------------------------- - -Telnet is a protocol for connecting to a remote server. Unlike ssh, this is not a secure connection. Bombadillo does not have a built-in telnet system but will reach out to the "telnet" application and use it to open telnet connections from inside of Bombadillo. For this feature to work a suitable program must be avialable on the system. For most users this will be "telnet", though Bombadillo does support using other applications via a user configurable setting (see `help settings`). - -This proxying of responsibility to a remote program works pretty well, but in some cases has been known to provide buggy output. - - - --- Telnet URL Structure -- - - -Generally speaking, the following structure will be the most common (though Bombadillo will support any structure that the underlying telnet application supports, so long as the scheme "telnet://" is included at the beginning): - -telnet://[host][:port] - - -________________________________ - -This concludes the help section brought up by the following keywords: - -telnet - - - -Other sections of the help document: - -`help help` -`help general` -`help bookmarks` -`help navigation` -`help saving` -`help commands` -`help keys` -`help search` -`help settings` -`help protocols` - `help gemini` - `help gopher` - `help http` - `help finger` - `help local` -`help resources` -`help license` - - - - From 7dc68a18bf7388007cd8193752fe683a2c11eef5 Mon Sep 17 00:00:00 2001 From: asdf Date: Mon, 14 Sep 2020 06:17:54 +1000 Subject: [PATCH 15/21] Corrected several issues identified during review --- client.go | 6 ------ cmdparse/parser.go | 4 ++-- help.go | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/client.go b/client.go index a7fa7c1..c97e4b0 100644 --- a/client.go +++ b/client.go @@ -407,9 +407,6 @@ func (c *client) doCommand(action string, values []string) { func (c *client) doCommandAs(action string, values []string) { switch action { - case "C", "CHECK": - c.displayConfigValue(values[0]) - c.DrawMessage() case "ADD", "A": if len(values) < 2 { c.SetMessage(syntaxErrorMessage(action), true) @@ -502,9 +499,6 @@ func (c *client) doLinkCommandAs(action, target string, values []string) { } switch action { - case "C", "CHECK": - c.displayConfigValue(values[0]) - c.DrawMessage() case "ADD", "A": bm := make([]string, 0, 5) bm = append(bm, links[num]) diff --git a/cmdparse/parser.go b/cmdparse/parser.go index 39e08ee..dc5870a 100644 --- a/cmdparse/parser.go +++ b/cmdparse/parser.go @@ -94,10 +94,10 @@ func (p *Parser) parseAction() (*Command, error) { case Value: cm.Target = t.val cm.Type = DOLINK - case Word, Action: + case Word: cm.Value = append(cm.Value, t.val) cm.Type = DO - case Whitespace: + case Action, Whitespace: return nil, fmt.Errorf("Found %q (%d), expected value", t.val, t.kind) } t = p.scan() diff --git a/help.go b/help.go index fb87de9..a9516f3 100644 --- a/help.go +++ b/help.go @@ -1,6 +1,6 @@ package main -// ERRS maps commands to their help text +// ERRS maps commands to their syntax error message var ERRS = map[string]string{ "A": "`a [target] [name...]`", "ADD": "`add [target] [name...]`", From bafa5a0739fe936a5be79ef91b2096e655542678 Mon Sep 17 00:00:00 2001 From: sloum Date: Thu, 17 Sep 2020 21:24:16 -0700 Subject: [PATCH 16/21] Solves the lynx lack of 404 issue --- http/http_render.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http/http_render.go b/http/http_render.go index f68ee2d..58a8813 100644 --- a/http/http_render.go +++ b/http/http_render.go @@ -33,7 +33,7 @@ func Visit(webmode, url string, width int) (Page, error) { return Page{}, fmt.Errorf("Invalid webmode setting") } c, err := exec.Command(webmode, "-dump", w, fmt.Sprintf("%d", width), url).Output() - if err != nil { + if err != nil && c == nil { return Page{}, err } return parseLinks(string(c)), nil From 2270dee51339125c5cb53937492b14da2de9ac78 Mon Sep 17 00:00:00 2001 From: sloum Date: Sat, 24 Oct 2020 10:10:06 -0700 Subject: [PATCH 17/21] Uses asdf's suggestion to reduce HasPrefix overhead by setting the spacer at the beginning of the document wrap code --- page.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/page.go b/page.go index 48d9d26..d4ed745 100644 --- a/page.go +++ b/page.go @@ -72,12 +72,17 @@ func (p *Page) WrapContent(width int, color bool) { } width = min(width, 100) counter := 0 - gopherspacer := " " - geminispacer := " " + spacer := "" var content strings.Builder var esc strings.Builder escape := false content.Grow(len(p.RawContent)) + + if p.Location.Mime == "1" { // gopher document + spacer = " " + } else if strings.HasSuffix(p.Location.Mime, "gemini") { //gemini document + spacer = " " + } for _, ch := range []rune(p.RawContent) { if escape { if color { @@ -126,13 +131,8 @@ func (p *Page) WrapContent(width int, color bool) { } else { content.WriteRune('\n') counter = 0 - if p.Location.Mime == "1" { - content.WriteString(gopherspacer) - counter += len(gopherspacer) - } else if strings.HasSuffix(p.Location.Mime, "gemini") { - content.WriteString(geminispacer) - counter += len(geminispacer) - } + content.WriteString(spacer) + counter += len(spacer) content.WriteRune(ch) counter++ } From a3cb016449a1375832659ba9521fb886ff1299c6 Mon Sep 17 00:00:00 2001 From: sloum Date: Sat, 31 Oct 2020 21:44:45 -0700 Subject: [PATCH 18/21] Brings gopher link numbering style inline with the other protocols --- gopher/gopher.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gopher/gopher.go b/gopher/gopher.go index fbe579f..adf36e9 100644 --- a/gopher/gopher.go +++ b/gopher/gopher.go @@ -144,7 +144,8 @@ func parseMap(text string) (string, []string) { } else { link := buildLink(line[2], line[3], string(line[0][0]), line[1]) links = append(links, link) - linktext := fmt.Sprintf("(%s) %2d %s", getType(string(line[0][0])), len(links), title) + linkNum := fmt.Sprintf("[%d]",len(links)) + linktext := fmt.Sprintf("%s %5s %s", getType(string(line[0][0])), linkNum, title) splitContent[i] = linktext } } From 89095351a856ec9b999fb054b01dd7dffda61f60 Mon Sep 17 00:00:00 2001 From: sloum Date: Sat, 31 Oct 2020 22:05:27 -0700 Subject: [PATCH 19/21] Fixes help to take an optional action as a value to get syntax for a given command --- client.go | 10 +++++++++- cmdparse/parser.go | 4 ++-- help.go | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/client.go b/client.go index c97e4b0..4bea3c6 100644 --- a/client.go +++ b/client.go @@ -344,7 +344,7 @@ func (c *client) simpleCommand(action string) { case "SEARCH": c.search("", "", "?") case "HELP", "?": - go c.Visit(helplocation) + c.Visit(helplocation) default: c.SetMessage(syntaxErrorMessage(action), true) c.DrawMessage() @@ -356,6 +356,14 @@ func (c *client) doCommand(action string, values []string) { case "C", "CHECK": c.displayConfigValue(values[0]) c.DrawMessage() + case "HELP", "?": + if val, ok := ERRS[values[0]]; ok { + c.SetMessage(val, false) + } else { + msg := fmt.Sprintf("%q is not a valid command; help syntax: %s", values[0], ERRS[action]) + c.SetMessage(msg, false) + } + c.DrawMessage() case "PURGE", "P": err := c.Certs.Purge(values[0]) if err != nil { diff --git a/cmdparse/parser.go b/cmdparse/parser.go index dc5870a..39e08ee 100644 --- a/cmdparse/parser.go +++ b/cmdparse/parser.go @@ -94,10 +94,10 @@ func (p *Parser) parseAction() (*Command, error) { case Value: cm.Target = t.val cm.Type = DOLINK - case Word: + case Word, Action: cm.Value = append(cm.Value, t.val) cm.Type = DO - case Action, Whitespace: + case Whitespace: return nil, fmt.Errorf("Found %q (%d), expected value", t.val, t.kind) } t = p.scan() diff --git a/help.go b/help.go index a9516f3..426d15f 100644 --- a/help.go +++ b/help.go @@ -23,6 +23,6 @@ var ERRS = map[string]string{ "SET": "`set [setting] [value]`", "W": "`w [target]`", "WRITE": "`write [target]`", - "?": "`?`", - "HELP": "`help`", + "?": "`? [[command]]`", + "HELP": "`help [[command]]`", } From 53de1b5662cc10e366ef048135cfb83bc47432a7 Mon Sep 17 00:00:00 2001 From: asdf Date: Sun, 1 Nov 2020 21:09:41 +1100 Subject: [PATCH 20/21] Minor correction to help text --- help.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help.go b/help.go index 426d15f..ece82db 100644 --- a/help.go +++ b/help.go @@ -8,7 +8,7 @@ var ERRS = map[string]string{ "DELETE": "`delete [bookmark-id]`", "B": "`b [[bookmark-id]]`", "BOOKMARKS": "`bookmarks [[bookmark-id]]`", - "C": "`c [link_id]` or `check [setting]`", + "C": "`c [link_id]` or `c [setting]`", "CHECK": "`check [link_id]` or `check [setting]`", "H": "`h`", "HOME": "`home`", From 4f166ca61a7e7fc970349346987ccfe825d70e57 Mon Sep 17 00:00:00 2001 From: sloum Date: Sun, 1 Nov 2020 06:01:17 -0800 Subject: [PATCH 21/21] Adds a prefix string to help output --- client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client.go b/client.go index 4bea3c6..d6844ff 100644 --- a/client.go +++ b/client.go @@ -358,7 +358,7 @@ func (c *client) doCommand(action string, values []string) { c.DrawMessage() case "HELP", "?": if val, ok := ERRS[values[0]]; ok { - c.SetMessage(val, false) + c.SetMessage("Usage: " + val, false) } else { msg := fmt.Sprintf("%q is not a valid command; help syntax: %s", values[0], ERRS[action]) c.SetMessage(msg, false)