diff --git a/.gitignore b/.gitignore index cb9380e..6f40a17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bombadillo *.asciinema +*.swp 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. diff --git a/Makefile b/Makefile index ddbc4bc..cca7657 100644 --- a/Makefile +++ b/Makefile @@ -13,17 +13,9 @@ test : GOCMD := go1.11.13 # %:z - so settle for %z. BUILD_TIME := ${shell date "+%Y-%m-%dT%H:%M%z"} -# If VERSION is empty or not defined use the contents of the VERSION file -VERSION := ${shell git describe --exact-match 2> /dev/null} -ifndef VERSION - VERSION := ${shell cat ./VERSION} -endif - -LDFLAGS := -ldflags "-s -X main.version=${VERSION} -X main.build=${BUILD_TIME}" - .PHONY: build build: - ${GOCMD} build ${LDFLAGS} -o ${BINARY} + ${GOCMD} build -o ${BINARY} .PHONY: install install: install-bin install-man install-desktop clean diff --git a/VERSION b/VERSION index 2bf1c1c..0bee604 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.1 +2.3.3 diff --git a/bombadillo.1 b/bombadillo.1 index c8b19a0..f1e9839 100644 --- a/bombadillo.1 +++ b/bombadillo.1 @@ -33,7 +33,7 @@ Gopher is the default protocol for \fBbombadillo\fP. Any textual item types will .TP .B gemini -Gemini is supported, but as a new protocol with an incomplete specification, features may change over time. At present Bombadillo supports TLS with a trust on first use certificate pinning system (similar to SSH). Client certificates are also supported as a configurable option. Gemini maps and other text types are rendered in the browser and non-text types will be downloaded. +Gemini is supported, but as a new protocol with an incomplete specification, features may change over time. At present Bombadillo supports TLS with a trust on first use certificate pinning system (similar to SSH). Gemini maps and other text types are rendered in the browser and non-text types will be downloaded. .TP .B finger @@ -181,6 +181,14 @@ home Navigates to the document set by the \fIhomeurl\fP setting. \fIh\fP can be entered, rather than the full \fIhome\fP. .TP .B +jump +Navigates to the previous page in history from the current page. Useful for keeping the current page in your history while still browsing. \fIj\fP can be used instead of the full \fIjump\fP. +.TP +.B +jump [history location] +Navigates to the given history location. The history location should be an integer between 0 and 20. \fIj\fP can be used instead of the full \fIjump\fP. +.TP +.B purge * Deletes all pinned gemini server certificates. \fIp\fP can be used instead of the full \fIpurge\fP. .TP @@ -209,6 +217,10 @@ set [setting name] [value] Sets the value for a given configuration setting. \fIs\fP can be used instead of the full \fIset\fP. .TP .B +version +Shows the current Bombadillo version number. +.TP +.B write . Writes the current document to a file. The file is named by the last component of the url path. If the last component is blank or \fI/\fP a default name will be used. The file saves to the directory set by the \fIsavelocation\fP setting. \fIw\fP can be entered rather than the full \fIwrite\fP. .TP @@ -246,7 +258,7 @@ The path to the directory that \fBbombadillo\fP should write files to. This must .TP .B searchengine -The url to use for the LINE COMMANDs \fI?\fP and \fIsearch\fP. Should be a valid search path that terms may be appended to. +The url to use for the LINE COMMAND \fIsearch\fP. Should be a valid search path that terms may be appended to. .TP .B telnetcommand @@ -257,12 +269,8 @@ theme Can toggle between visual modes. Valid values are \fInormal\fP, \fIcolor\fP, and \fIinverse\fP. When set to inverse, the normal mode colors are inverted. Both normal and inverse modes filter out terminal escape sequences. When set to color, Bombadillo will render terminal escape sequences representing colors when it finds them in documents. .TP .B -tlscertificate -A path to a tls certificate file on a user's local filesystem. Defaults to NULL. Both \fItlscertificate\fP and \fItlskey\fP must be set for client certificates to work in gemini. -.TP -.B -tlskey -A path to a tls key that pairs with the tlscertificate setting, on a user's local filesystem. Defaults to NULL. Both \fItlskey\fP and \fItlscertificate\fP must be set for client certificates to work in gemini. +timeout +The number of seconds after which connections to gopher or gemini servers should time out if the server has not responded. .TP .B webmode diff --git a/client.go b/client.go index 25d7723..b1795cb 100644 --- a/client.go +++ b/client.go @@ -122,8 +122,8 @@ func (c *client) Draw() { } else { for i := 0; i < c.Height-3; i++ { if i < len(pageContent) { - screen.WriteString(pageContent[i]) screen.WriteString("\033[0K") + screen.WriteString(pageContent[i]) screen.WriteString("\n") } else { screen.WriteString("\033[0K") @@ -258,6 +258,7 @@ func (c *client) TakeControlInput() { } err = c.NextSearchItem(0) if err != nil { + c.PageState.History[c.PageState.Position].WrapContent(c.Width-1,(c.Options["theme"] == "color")) c.Draw() } case ':', ' ': @@ -344,23 +345,41 @@ func (c *client) simpleCommand(action string) { case "SEARCH": c.search("", "", "?") case "HELP", "?": - go c.Visit(helplocation) + c.Visit(helplocation) + case "JUMP", "J": + err := c.PageState.CopyHistory(-1) + if err != nil { + c.SetMessage(err.Error(), false) + c.DrawMessage() + } else { + c.Draw() + } + case "VERSION": + ver := version + if ver == "" { + ver = "Improperly compiled, no version information" + } + c.SetMessage("Bombadillo version: " + ver, false) + c.DrawMessage() 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) { - if length := len(values); length != 1 { - c.SetMessage(fmt.Sprintf("Expected 1 argument, received %d", len(values)), true) - c.DrawMessage() - return - } - switch action { - case "CHECK", "C": + case "C", "CHECK": c.displayConfigValue(values[0]) + c.DrawMessage() + case "HELP", "?": + if val, ok := ERRS[values[0]]; ok { + 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) + } + c.DrawMessage() case "PURGE", "P": err := c.Certs.Purge(values[0]) if err != nil { @@ -403,26 +422,23 @@ func (c *client) doCommand(action string, values []string) { fn = "index" } 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) { - 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 "ADD", "A": + if len(values) < 2 { + c.SetMessage(syntaxErrorMessage(action), 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 +457,18 @@ func (c *client) doCommandAs(action string, values []string) { c.Draw() } case "SEARCH": + if len(values) < 2 { + c.SetMessage(syntaxErrorMessage(action), true) + c.DrawMessage() + return + } c.search(strings.Join(values, " "), "", "") case "SET", "S": + if len(values) < 2 { + c.SetMessage(syntaxErrorMessage(action), true) + c.DrawMessage() + return + } if _, ok := c.Options[values[0]]; ok { val := strings.Join(values[1:], " ") if !validateOpt(values[0], val) { @@ -451,10 +477,10 @@ func (c *client) doCommandAs(action string, values []string) { return } c.Options[values[0]] = lowerCaseOpt(values[0], val) - if values[0] == "tlskey" || values[0] == "tlscertificate" { - c.Certs.LoadCertificate(c.Options["tlscertificate"], c.Options["tlskey"]) - } else if values[0] == "geminiblocks" { + if values[0] == "geminiblocks" { gemini.BlockBehavior = c.Options[values[0]] + } else if values[0] == "timeout" { + updateTimeouts(c.Options[values[0]]) } else if values[0] == "configlocation" { c.SetMessage("Cannot set READ ONLY setting 'configlocation'", true) c.DrawMessage() @@ -473,7 +499,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() } } @@ -523,7 +549,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() } } @@ -630,6 +656,15 @@ func (c *client) doLinkCommand(action, target string) { link := links[num] c.SetMessage(fmt.Sprintf("[%d] %s", num+1, link), false) c.DrawMessage() + case "JUMP", "J": + num-- + err = c.PageState.CopyHistory(num) + if err != nil { + c.SetMessage(err.Error(), false) + c.DrawMessage() + } else { + c.Draw() + } case "WRITE", "W": links := c.PageState.History[c.PageState.Position].Links if len(links) < num || num < 1 { @@ -655,7 +690,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() } @@ -977,6 +1012,7 @@ func (c *client) handleGemini(u Url) { case 2: // Success if capsule.MimeMaj == "text" || (c.Options["showimages"] == "true" && capsule.MimeMaj == "image") { + u.Mime = capsule.MimeMin pg := MakePage(u, capsule.Content, capsule.Links) pg.FileType = capsule.MimeMaj pg.WrapContent(c.Width-1, (c.Options["theme"] == "color")) @@ -999,6 +1035,13 @@ func (c *client) handleGemini(u Url) { if strings.Replace(lowerRedirect, lowerOriginal, "", 1) == "/" { c.Visit(capsule.Content) } else { + if !strings.Contains(capsule.Content, "://") { + lnk, lnkErr := gemini.HandleRelativeUrl(capsule.Content, u.Full) + if lnkErr == nil { + capsule.Content = lnk + } + } + c.SetMessage(fmt.Sprintf("Follow redirect (y/n): %s?", capsule.Content), false) c.DrawMessage() ch := cui.Getch() @@ -1195,3 +1238,23 @@ 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) +} + +func updateTimeouts(timeoutString string) error { + sec, err := strconv.Atoi(timeoutString) + if err != nil { + return err + } + timeout := time.Duration(sec) * time.Second + + gopher.Timeout = timeout + gemini.TlsTimeout = timeout + + return nil +} diff --git a/cmdparse/lexer.go b/cmdparse/lexer.go index 8b882c3..448bbbf 100644 --- a/cmdparse/lexer.go +++ b/cmdparse/lexer.go @@ -72,7 +72,7 @@ func (s *scanner) scanText() Token { "S", "SET", "R", "RELOAD", "SEARCH", "Q", "QUIT", "B", "BOOKMARKS", "H", "HOME", "?", "HELP", "C", "CHECK", - "P", "PURGE": + "P", "PURGE", "JUMP", "J", "VERSION": return Token{Action, capInput} } 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/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 } diff --git a/defaults.go b/defaults.go index fc47a64..24429d7 100644 --- a/defaults.go +++ b/defaults.go @@ -54,9 +54,8 @@ var defaultOptions = map[string]string{ "showimages": "true", "telnetcommand": "telnet", "theme": "normal", // "normal", "inverted", "color" - "tlscertificate": "", - "tlskey": "", - "webmode": "none", // "none", "gui", "lynx", "w3m", "elinks" + "timeout": "15", // connection timeout for gopher/gemini in seconds + "webmode": "none", // "none", "gui", "lynx", "w3m", "elinks" } // homePath will return the path to your home directory as a string diff --git a/gemini/gemini.go b/gemini/gemini.go index 44c8545..482cfae 100644 --- a/gemini/gemini.go +++ b/gemini/gemini.go @@ -6,6 +6,7 @@ import ( "crypto/tls" "fmt" "io/ioutil" + "net" "net/url" "strconv" "strings" @@ -22,24 +23,15 @@ type Capsule struct { type TofuDigest struct { certs map[string]string - ClientCert tls.Certificate } -var BlockBehavior = "block" +var BlockBehavior string = "block" +var TlsTimeout time.Duration = time.Duration(15) * time.Second //------------------------------------------------\\ // + + + R E C E I V E R S + + + \\ //--------------------------------------------------\\ -func (t *TofuDigest) LoadCertificate(cert, key string) { - certificate, err := tls.LoadX509KeyPair(cert, key) - if err != nil { - t.ClientCert = tls.Certificate{} - return - } - t.ClientCert = certificate -} - func (t *TofuDigest) Purge(host string) error { host = strings.ToLower(host) if host == "*" { @@ -86,7 +78,7 @@ func (t *TofuDigest) Match(host, localCert string, cState *tls.ConnectionState) return fmt.Errorf("EXP") } - if err := cert.VerifyHostname(host); err != nil { + if err := cert.VerifyHostname(host); err != nil && cert.Subject.CommonName != host { return fmt.Errorf("Certificate error: %s", err) } @@ -115,7 +107,7 @@ func (t *TofuDigest) newCert(host string, cState *tls.ConnectionState) error { continue } - if err := cert.VerifyHostname(host); err != nil { + if err := cert.VerifyHostname(host); err != nil && cert.Subject.CommonName != host { reasons.WriteString(fmt.Sprintf("Cert [%d] hostname does not match", index+1)) continue } @@ -185,11 +177,7 @@ func Retrieve(host, port, resource string, td *TofuDigest) (string, error) { InsecureSkipVerify: true, } - conf.GetClientCertificate = func(*tls.CertificateRequestInfo) (*tls.Certificate, error) { - return &td.ClientCert, nil - } - - conn, err := tls.Dial("tcp", addr, conf) + conn, err := tls.DialWithDialer(&net.Dialer{Timeout: TlsTimeout}, "tcp", addr, conf) if err != nil { return "", fmt.Errorf("TLS Dial Error: %s", err.Error()) } @@ -282,7 +270,7 @@ func Fetch(host, port, resource string, td *TofuDigest) ([]byte, error) { case 5: return make([]byte, 0), fmt.Errorf("[5] Permanent Failure.") case 6: - return make([]byte, 0), fmt.Errorf("[6] Client Certificate Required") + return make([]byte, 0), fmt.Errorf("[6] Client Certificate Required (Unsupported)") default: return make([]byte, 0), fmt.Errorf("Invalid response status from server") } @@ -331,6 +319,9 @@ func Visit(host, port, resource string, td *TofuDigest) (Capsule, error) { case 2: mimeAndCharset := strings.Split(header[1], ";") meta = mimeAndCharset[0] + if meta == "" { + meta = "text/gemini" + } minMajMime := strings.Split(meta, "/") if len(minMajMime) < 2 { return capsule, fmt.Errorf("Improperly formatted mimetype received from server") @@ -359,7 +350,7 @@ func Visit(host, port, resource string, td *TofuDigest) (Capsule, error) { case 5: return capsule, fmt.Errorf("[5] Permanent Failure. %s", header[1]) case 6: - return capsule, fmt.Errorf("[6] Client Certificate Required") + return capsule, fmt.Errorf("[6] Client Certificate Required (Unsupported)") default: return capsule, fmt.Errorf("Invalid response status from server") } @@ -370,6 +361,7 @@ func parseGemini(b, currentUrl string) (string, []string) { links := make([]string, 0, 10) inPreBlock := false + spacer := " " outputIndex := 0 for i, ln := range splitContent { @@ -380,7 +372,7 @@ func parseGemini(b, currentUrl string) (string, []string) { alt := strings.TrimSpace(ln) if len(alt) > 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 { @@ -399,7 +391,7 @@ func parseGemini(b, currentUrl string) (string, []string) { } if strings.Index(link, "://") < 0 { - link, _ = handleRelativeUrl(link, currentUrl) + link, _ = HandleRelativeUrl(link, currentUrl) } links = append(links, link) @@ -410,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++ } } @@ -418,7 +415,7 @@ func parseGemini(b, currentUrl string) (string, []string) { } // handleRelativeUrl provides link completion -func handleRelativeUrl(relLink, current string) (string, error) { +func HandleRelativeUrl(relLink, current string) (string, error) { base, err := url.Parse(current) if err != nil { return relLink, err @@ -444,5 +441,5 @@ func MakeCapsule() Capsule { } func MakeTofuDigest() TofuDigest { - return TofuDigest{make(map[string]string), tls.Certificate{}} + return TofuDigest{make(map[string]string)} } diff --git a/gopher/gopher.go b/gopher/gopher.go index 20e76e9..adf36e9 100644 --- a/gopher/gopher.go +++ b/gopher/gopher.go @@ -38,6 +38,8 @@ var types = map[string]string{ "T": "TEL", } +var Timeout time.Duration = time.Duration(15) * time.Second + //------------------------------------------------\\ // + + + F U N C T I O N S + + + \\ //--------------------------------------------------\\ @@ -49,7 +51,6 @@ var types = map[string]string{ // be better. func Retrieve(host, port, resource string) ([]byte, error) { nullRes := make([]byte, 0) - timeOut := time.Duration(5) * time.Second if host == "" || port == "" { return nullRes, errors.New("Incomplete request url") @@ -57,7 +58,7 @@ func Retrieve(host, port, resource string) ([]byte, error) { addr := host + ":" + port - conn, err := net.DialTimeout("tcp", addr, timeOut) + conn, err := net.DialTimeout("tcp", addr, Timeout) if err != nil { return nullRes, err } @@ -143,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 } } diff --git a/help.go b/help.go new file mode 100644 index 0000000..d42e75c --- /dev/null +++ b/help.go @@ -0,0 +1,31 @@ +package main + +// ERRS maps commands to their syntax error message +var ERRS = map[string]string{ + "A": "`a [target] [name...]`", + "ADD": "`add [target] [name...]`", + "D": "`d [bookmark-id]`", + "DELETE": "`delete [bookmark-id]`", + "B": "`b [[bookmark-id]]`", + "BOOKMARKS": "`bookmarks [[bookmark-id]]`", + "C": "`c [link_id]` or `c [setting]`", + "CHECK": "`check [link_id]` or `check [setting]`", + "H": "`h`", + "HOME": "`home`", + "J": "`j [[history_position]]`", + "JUMP": "`jump [[history_position]]`", + "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]`", + "VERSION": "`version`", + "?": "`? [[command]]`", + "HELP": "`help [[command]]`", +} 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 diff --git a/http/open_browser_darwin.go b/http/open_browser_darwin.go index dd7da7a..d57a290 100644 --- a/http/open_browser_darwin.go +++ b/http/open_browser_darwin.go @@ -1,4 +1,4 @@ -// +build darwin +// This will build for osx without a build tag based on the filename package http diff --git a/http/open_browser_linux.go b/http/open_browser_linux.go deleted file mode 100644 index 3b7dfee..0000000 --- a/http/open_browser_linux.go +++ /dev/null @@ -1,30 +0,0 @@ -// +build linux - -package http - -import ( - "fmt" - "os" - "os/exec" -) - -// OpenInBrowser checks for the presence of a display server -// and environment variables indicating a gui is present. If found -// then xdg-open is called on a url to open said url in the default -// gui web browser for the system -func OpenInBrowser(url string) (string, error) { - disp := os.Getenv("DISPLAY") - wayland := os.Getenv("WAYLAND_DISPLAY") - _, err := exec.LookPath("Xorg") - if disp == "" && wayland == "" && err != nil { - return "", fmt.Errorf("No gui is available, check 'webmode' setting") - } - - // Use start rather than run or output in order - // to release the process and not block - err = exec.Command("xdg-open", url).Start() - if err != nil { - return "", err - } - return "Opened in system default web browser", nil -} diff --git a/http/open_browser_other.go b/http/open_browser_other.go index 1388c6b..2f74d22 100644 --- a/http/open_browser_other.go +++ b/http/open_browser_other.go @@ -1,11 +1,30 @@ -// +build !linux -// +build !darwin -// +build !windows +// +build !darwin,!windows package http -import "fmt" +import ( + "fmt" + "os" + "os/exec" +) +// OpenInBrowser checks for the presence of a display server +// and environment variables indicating a gui is present. If found +// then xdg-open is called on a url to open said url in the default +// gui web browser for the system func OpenInBrowser(url string) (string, error) { - return "", fmt.Errorf("Unsupported os for 'webmode' 'gui' setting") + disp := os.Getenv("DISPLAY") + wayland := os.Getenv("WAYLAND_DISPLAY") + _, err := exec.LookPath("Xorg") + if disp == "" && wayland == "" && err != nil { + return "", fmt.Errorf("No gui is available, check 'webmode' setting") + } + + // Use start rather than run or output in order + // to release the process and not block + err = exec.Command("xdg-open", url).Start() + if err != nil { + return "", err + } + return "Opened in system default web browser", nil } diff --git a/http/open_browser_windows.go b/http/open_browser_windows.go index 0ddf6c7..496d00b 100644 --- a/http/open_browser_windows.go +++ b/http/open_browser_windows.go @@ -1,5 +1,5 @@ -// +build windows - +// This will only build for windows based on the filename +// no build tag required package http import "os/exec" diff --git a/main.go b/main.go index 28fcf36..bee9c41 100644 --- a/main.go +++ b/main.go @@ -35,8 +35,7 @@ import ( "tildegit.org/sloum/bombadillo/gemini" ) -var version string -var build string +var version string = "2.3.3" var bombadillo *client var helplocation string = "gopher://bombadillo.colorfield.space:70/1/user-guide.map" @@ -82,6 +81,14 @@ func validateOpt(opt, val string) bool { } return false } + + if opt == "timeout" { + _, err := strconv.Atoi(val) + if err != nil { + return false + } + } + return true } @@ -126,6 +133,8 @@ func loadConfig() { bombadillo.Options[lowerkey] = v.Value if lowerkey == "geminiblocks" { gemini.BlockBehavior = v.Value + } else if lowerkey == "timeout" { + updateTimeouts(v.Value) } } else { bombadillo.Options[lowerkey] = defaultOptions[lowerkey] @@ -143,8 +152,8 @@ func loadConfig() { if len(vals) < 2 { continue } - ts, err := strconv.ParseInt(vals[1], 10, 64) now := time.Now() + ts, err := strconv.ParseInt(vals[1], 10, 64) if err != nil || now.Unix() > ts { continue } @@ -158,9 +167,6 @@ func loadConfig() { func initClient() { bombadillo = MakeClient(" ((( Bombadillo ))) ") loadConfig() - if bombadillo.Options["tlscertificate"] != "" && bombadillo.Options["tlskey"] != "" { - bombadillo.Certs.LoadCertificate(bombadillo.Options["tlscertificate"], bombadillo.Options["tlskey"]) - } } // In the event of specific signals, ensure the display is shown correctly. @@ -204,7 +210,7 @@ func main() { flag.Usage = printHelp flag.Parse() if *getVersion { - fmt.Printf("Bombadillo %s - build %s\n", version, build) + fmt.Printf("Bombadillo %s\n", version) os.Exit(0) } args := flag.Args() diff --git a/page.go b/page.go index 6973a7c..ac31168 100644 --- a/page.go +++ b/page.go @@ -72,11 +72,17 @@ func (p *Page) WrapContent(width int, color bool) { } width = min(width, 100) counter := 0 - spacer := " " + 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 { @@ -91,8 +97,8 @@ func (p *Page) WrapContent(width int, color bool) { } continue } - if ch == '\n' { - content.WriteRune(ch) + if ch == '\n' || ch == '\u0085' || ch == '\u2028' || ch == '\u2029' { + content.WriteRune('\n') counter = 0 } else if ch == '\t' { if counter+4 < width { @@ -125,11 +131,10 @@ func (p *Page) WrapContent(width int, color bool) { } else { content.WriteRune('\n') counter = 0 - if p.Location.Mime == "1" { - content.WriteString(spacer) - counter += len(spacer) - } + content.WriteString(spacer) + counter += len(spacer) content.WriteRune(ch) + counter++ } } } diff --git a/page_test.go b/page_test.go new file mode 100644 index 0000000..b5e8f94 --- /dev/null +++ b/page_test.go @@ -0,0 +1,94 @@ +package main + +import ( + "reflect" + "testing" +) + +func Test_WrapContent_Wrapped_Line_Length(t *testing.T) { + type fields struct { + WrappedContent []string + RawContent string + Links []string + Location Url + ScrollPosition int + FoundLinkLines []int + SearchTerm string + SearchIndex int + FileType string + WrapWidth int + Color bool + } + type args struct { + width int + color bool + } + + // create a Url for use by the MakePage function + url, _ := MakeUrl("gemini://rawtext.club") + + tests := []struct { + name string + input string + expects []string + args args + }{ + { + "Short line that doesn't wrap", + "0123456789\n", + []string{ + "0123456789", + "", + }, + args{ + 10, + false, + }, + }, + { + "Long line wrapped to 10 columns", + "0123456789 123456789 123456789 123456789 123456789\n", + []string{ + "0123456789", + " 123456789", + " 123456789", + " 123456789", + " 123456789", + "", + }, + args{ + 10, + false, + }, + }, + { + "Unicode line endings that should not wrap", + "LF\u000A" + + "CR+LF\u000D\u000A" + + "NEL\u0085" + + "LS\u2028" + + "PS\u2029", + []string{ + "LF", + "CR+LF", + "NEL", + "LS", + "PS", + "", + }, + args{ + 10, + false, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + p := MakePage(url, tt.input, []string{""}) + p.WrapContent(tt.args.width-1, tt.args.color) + if !reflect.DeepEqual(p.WrappedContent, tt.expects) { + t.Errorf("Test failed - %s\nexpects %s\nactual %s", tt.name, tt.expects, p.WrappedContent) + } + }) + } +} diff --git a/pages.go b/pages.go index 9fa6606..e4ef964 100644 --- a/pages.go +++ b/pages.go @@ -38,7 +38,7 @@ func (p *Pages) NavigateHistory(qty int) error { } // Add gets passed a Page, which gets added to the history -// arrayr. Add also updates the current length and position +// array. Add also updates the current length and position // of the Pages struct to which it belongs. Add also shifts // off array items if necessary. func (p *Pages) Add(pg Page) { @@ -92,6 +92,18 @@ func (p *Pages) Render(termHeight, termWidth int, color bool) []string { return p.History[p.Position].WrappedContent[pos:] } +func (p *Pages) CopyHistory(pos int) error { + if p.Length < 2 || pos > p.Position { + return fmt.Errorf("There are not enough history locations available") + } + if pos < 0 { + pos = p.Position-1 + } + + p.Add(p.History[pos]) + return nil +} + //------------------------------------------------\\ // + + + F U N C T I O N S + + + \\ //--------------------------------------------------\\