forked from sloum/bombadillo
Ran format on each file
This commit is contained in:
parent
2038c9c4ac
commit
e4f7147e4f
|
@ -115,11 +115,11 @@ func (b Bookmarks) Render(termwidth, termheight int) []string {
|
|||
top := fmt.Sprintf("%s%s%s", tl, strings.Repeat(ceil, contentWidth), tr)
|
||||
out = append(out, top)
|
||||
marks := b.List()
|
||||
for i := 0; i < termheight - 2; i++ {
|
||||
if i + b.Position >= len(b.Titles) {
|
||||
for i := 0; i < termheight-2; i++ {
|
||||
if i+b.Position >= len(b.Titles) {
|
||||
out = append(out, fmt.Sprintf("%s%-*.*s%s", walll, contentWidth, contentWidth, "", wallr))
|
||||
} else {
|
||||
out = append(out, fmt.Sprintf("%s%-*.*s%s", walll, contentWidth, contentWidth, marks[i + b.Position], wallr))
|
||||
out = append(out, fmt.Sprintf("%s%-*.*s%s", walll, contentWidth, contentWidth, marks[i+b.Position], wallr))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -132,7 +132,6 @@ func (b Bookmarks) Render(termwidth, termheight int) []string {
|
|||
// either here with a scroll up/down or in the client
|
||||
// code for scroll
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + F U N C T I O N S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
@ -140,4 +139,3 @@ func (b Bookmarks) Render(termwidth, termheight int) []string {
|
|||
func MakeBookmarks() Bookmarks {
|
||||
return Bookmarks{false, false, 0, 0, make([]string, 0), make([]string, 0)}
|
||||
}
|
||||
|
||||
|
|
|
@ -877,7 +877,6 @@ func (c *client) Visit(url string) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// +++ Begin Protocol Handlers +++
|
||||
|
||||
func (c *client) handleGopher(u Url) {
|
||||
|
@ -1022,8 +1021,8 @@ func (c *client) handleWeb(u Url) {
|
|||
c.SetMessage("The file is non-text: writing to disk...", false)
|
||||
c.DrawMessage()
|
||||
var fn string
|
||||
if i := strings.LastIndex(u.Full, "/"); i > 0 && i + 1 < len(u.Full) {
|
||||
fn = u.Full[i + 1:]
|
||||
if i := strings.LastIndex(u.Full, "/"); i > 0 && i+1 < len(u.Full) {
|
||||
fn = u.Full[i+1:]
|
||||
} else {
|
||||
fn = "bombadillo.download"
|
||||
}
|
||||
|
@ -1049,7 +1048,6 @@ func (c *client) handleWeb(u Url) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + F U N C T I O N S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
@ -1075,4 +1073,3 @@ func findAvailableFileName(fpath, fname string) (string, error) {
|
|||
|
||||
return savePath, nil
|
||||
}
|
||||
|
||||
|
|
|
@ -68,7 +68,7 @@ func (s *scanner) scanText() Token {
|
|||
|
||||
capInput := strings.ToUpper(buf.String())
|
||||
switch capInput {
|
||||
case "D", "DELETE", "A", "ADD","W", "WRITE",
|
||||
case "D", "DELETE", "A", "ADD", "W", "WRITE",
|
||||
"S", "SET", "R", "RELOAD", "SEARCH",
|
||||
"Q", "QUIT", "B", "BOOKMARKS", "H",
|
||||
"HOME", "?", "HELP", "C", "CHECK",
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
package cui
|
||||
|
||||
import (
|
||||
)
|
||||
|
||||
|
|
|
@ -29,4 +29,3 @@ var defaultOptions = map[string]string{
|
|||
"tlskey": "",
|
||||
"lynxmode": "false",
|
||||
}
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@ package finger
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
"time"
|
||||
)
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@ import (
|
|||
"strconv"
|
||||
)
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + T Y P E S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
@ -15,7 +14,6 @@ type Footbar struct {
|
|||
PageType string
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + R E C E I V E R S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
@ -34,15 +32,14 @@ func (f *Footbar) SetPageType(t string) {
|
|||
}
|
||||
|
||||
func (f *Footbar) Render(termWidth, position int, theme string) string {
|
||||
pre := fmt.Sprintf("HST: (%2.2d) - - - %4s Read ", position + 1, f.PercentRead)
|
||||
pre := fmt.Sprintf("HST: (%2.2d) - - - %4s Read ", position+1, f.PercentRead)
|
||||
out := "\033[0m%*.*s "
|
||||
if theme == "inverse" {
|
||||
out = "\033[7m%*.*s \033[0m"
|
||||
}
|
||||
return fmt.Sprintf(out, termWidth - 1, termWidth - 1, pre)
|
||||
return fmt.Sprintf(out, termWidth-1, termWidth-1, pre)
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + F U N C T I O N S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
@ -50,4 +47,3 @@ func (f *Footbar) Render(termWidth, position int, theme string) string {
|
|||
func MakeFootbar() Footbar {
|
||||
return Footbar{"---", "N/A"}
|
||||
}
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ import (
|
|||
"time"
|
||||
)
|
||||
|
||||
|
||||
type Capsule struct {
|
||||
MimeMaj string
|
||||
MimeMin string
|
||||
|
@ -20,13 +19,11 @@ type Capsule struct {
|
|||
Links []string
|
||||
}
|
||||
|
||||
|
||||
type TofuDigest struct {
|
||||
certs map[string]string
|
||||
ClientCert tls.Certificate
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + R E C E I V E R S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
@ -107,17 +104,17 @@ func (t *TofuDigest) newCert(host string, cState *tls.ConnectionState) error {
|
|||
reasons.WriteString("; ")
|
||||
}
|
||||
if now.Before(cert.NotBefore) {
|
||||
reasons.WriteString(fmt.Sprintf("Cert [%d] is not valid yet", index + 1))
|
||||
reasons.WriteString(fmt.Sprintf("Cert [%d] is not valid yet", index+1))
|
||||
continue
|
||||
}
|
||||
|
||||
if now.After(cert.NotAfter) {
|
||||
reasons.WriteString(fmt.Sprintf("Cert [%d] is expired", index + 1))
|
||||
reasons.WriteString(fmt.Sprintf("Cert [%d] is expired", index+1))
|
||||
continue
|
||||
}
|
||||
|
||||
if err := cert.VerifyHostname(host); err != nil {
|
||||
reasons.WriteString(fmt.Sprintf("Cert [%d] hostname does not match", index + 1))
|
||||
reasons.WriteString(fmt.Sprintf("Cert [%d] hostname does not match", index+1))
|
||||
continue
|
||||
}
|
||||
|
||||
|
@ -143,8 +140,6 @@ func (t *TofuDigest) IniDump() string {
|
|||
return out.String()
|
||||
}
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + F U N C T I O N S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
@ -235,7 +230,7 @@ func Fetch(host, port, resource string, td *TofuDigest) ([]byte, error) {
|
|||
if len([]rune(header[0])) != 2 {
|
||||
header = strings.SplitN(resp[0], "\t", 2)
|
||||
if len([]rune(header[0])) != 2 {
|
||||
return make([]byte,0), fmt.Errorf("Invalid response format from server")
|
||||
return make([]byte, 0), fmt.Errorf("Invalid response format from server")
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -351,7 +346,7 @@ func parseGemini(b, rootUrl, currentUrl string) (string, []string) {
|
|||
subLn := strings.Trim(ln[2:], "\r\n\t \a")
|
||||
splitPoint := strings.IndexAny(subLn, " \t")
|
||||
|
||||
if splitPoint < 0 || len([]rune(subLn)) - 1 <= splitPoint {
|
||||
if splitPoint < 0 || len([]rune(subLn))-1 <= splitPoint {
|
||||
link = subLn
|
||||
decorator = subLn
|
||||
} else {
|
||||
|
@ -385,7 +380,7 @@ func handleRelativeUrl(u, root, current string) string {
|
|||
return fmt.Sprintf("%s/%s", root, u)
|
||||
}
|
||||
|
||||
current = current[:ind + 1]
|
||||
current = current[:ind+1]
|
||||
return fmt.Sprintf("%s%s", current, u)
|
||||
}
|
||||
|
||||
|
@ -398,7 +393,6 @@ func hashCert(cert []byte) string {
|
|||
return fmt.Sprintf("%s", string(bytes.Join(hex, []byte(":"))))
|
||||
}
|
||||
|
||||
|
||||
func MakeCapsule() Capsule {
|
||||
return Capsule{"", "", 0, "", make([]string, 0, 5)}
|
||||
}
|
||||
|
|
|
@ -92,7 +92,6 @@ func Visit(gophertype, host, port, resource string) (string, []string, error) {
|
|||
return text, []string{}, nil
|
||||
}
|
||||
|
||||
|
||||
if gophertype == "1" {
|
||||
text, links = parseMap(text)
|
||||
}
|
||||
|
|
|
@ -13,7 +13,6 @@ type Headbar struct {
|
|||
url string
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + R E C E I V E R S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
@ -27,7 +26,6 @@ func (h *Headbar) Render(width int, theme string) string {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + F U N C T I O N S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
@ -35,4 +33,3 @@ func (h *Headbar) Render(width int, theme string) string {
|
|||
func MakeHeadbar(title string) Headbar {
|
||||
return Headbar{title, ""}
|
||||
}
|
||||
|
||||
|
|
|
@ -89,4 +89,3 @@ func Fetch(url string) ([]byte, error) {
|
|||
|
||||
return bodyBytes, nil
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@ func Open(address string) (string, error) {
|
|||
}
|
||||
defer file.Close()
|
||||
|
||||
|
||||
if pathIsDir(address) {
|
||||
fileList, err := file.Readdirnames(0)
|
||||
if err != nil {
|
||||
|
@ -40,7 +39,6 @@ func Open(address string) (string, error) {
|
|||
return string(bytes), nil
|
||||
}
|
||||
|
||||
|
||||
func pathExists(p string) bool {
|
||||
exists := true
|
||||
|
||||
|
|
5
page.go
5
page.go
|
@ -22,7 +22,7 @@ type Page struct {
|
|||
|
||||
func (p *Page) ScrollPositionRange(termHeight int) (int, int) {
|
||||
termHeight -= 3
|
||||
if len(p.WrappedContent) - p.ScrollPosition < termHeight {
|
||||
if len(p.WrappedContent)-p.ScrollPosition < termHeight {
|
||||
p.ScrollPosition = len(p.WrappedContent) - termHeight
|
||||
}
|
||||
if p.ScrollPosition < 0 {
|
||||
|
@ -51,7 +51,7 @@ func (p *Page) WrapContent(width int) {
|
|||
content.WriteRune(ch)
|
||||
counter = 0
|
||||
} else if ch == '\t' {
|
||||
if counter + 4 < width {
|
||||
if counter+4 < width {
|
||||
content.WriteString(" ")
|
||||
counter += 4
|
||||
} else {
|
||||
|
@ -89,4 +89,3 @@ func MakePage(url Url, content string, links []string) Page {
|
|||
p := Page{make([]string, 0), content, links, url, 0}
|
||||
return p
|
||||
}
|
||||
|
||||
|
|
13
pages.go
13
pages.go
|
@ -14,7 +14,6 @@ type Pages struct {
|
|||
History [20]Page
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + R E C E I V E R S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
@ -23,7 +22,7 @@ func (p *Pages) NavigateHistory(qty int) error {
|
|||
newPosition := p.Position + qty
|
||||
if newPosition < 0 {
|
||||
return fmt.Errorf("You are already at the beginning of history")
|
||||
} else if newPosition > p.Length - 1 {
|
||||
} else if newPosition > p.Length-1 {
|
||||
return fmt.Errorf("Your way is blocked by void, there is nothing forward")
|
||||
}
|
||||
|
||||
|
@ -32,11 +31,11 @@ func (p *Pages) NavigateHistory(qty int) error {
|
|||
}
|
||||
|
||||
func (p *Pages) Add(pg Page) {
|
||||
if p.Position == p.Length - 1 && p.Length < len(p.History) {
|
||||
if p.Position == p.Length-1 && p.Length < len(p.History) {
|
||||
p.History[p.Length] = pg
|
||||
p.Length++
|
||||
p.Position++
|
||||
} else if p.Position == p.Length - 1 && p.Length == 20 {
|
||||
} else if p.Position == p.Length-1 && p.Length == 20 {
|
||||
for x := 1; x < len(p.History); x++ {
|
||||
p.History[x-1] = p.History[x]
|
||||
}
|
||||
|
@ -62,12 +61,12 @@ func (p *Pages) Render(termHeight, termWidth int) []string {
|
|||
} else if prev < now {
|
||||
diff := now - prev
|
||||
pos = pos + diff
|
||||
if pos > now - termHeight {
|
||||
if pos > now-termHeight {
|
||||
pos = now - termHeight
|
||||
}
|
||||
}
|
||||
|
||||
if pos < 0 || now < termHeight - 3 {
|
||||
if pos < 0 || now < termHeight-3 {
|
||||
pos = 0
|
||||
}
|
||||
|
||||
|
@ -83,5 +82,3 @@ func (p *Pages) Render(termHeight, termWidth int) []string {
|
|||
func MakePages() Pages {
|
||||
return Pages{-1, 0, [20]Page{}}
|
||||
}
|
||||
|
||||
|
||||
|
|
4
url.go
4
url.go
|
@ -28,12 +28,10 @@ type Url struct {
|
|||
|
||||
// There are currently no receivers for the Url struct
|
||||
|
||||
|
||||
//------------------------------------------------\\
|
||||
// + + + F U N C T I O N S + + + \\
|
||||
//--------------------------------------------------\\
|
||||
|
||||
|
||||
// MakeUrl is a Url constructor that takes in a string
|
||||
// representation of a url and returns a Url struct and
|
||||
// an error (or nil).
|
||||
|
@ -167,5 +165,3 @@ func parseFinger(u string) (Url, error) {
|
|||
out.Full = fmt.Sprintf("%s://%s%s:%s", out.Scheme, resource, out.Host, out.Port)
|
||||
return out, nil
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue