Merge branch 'type-seven-bm-fix' of sloum/bombadillo into master

Thanks for all the help @asdf! Merging this into master. This PR closes issue #29
This commit is contained in:
sloum 2019-08-31 22:54:30 -04:00 committed by Gitea
commit 309d6244e1
3 changed files with 7 additions and 3 deletions

View File

@ -95,7 +95,7 @@ func Visit(addr, openhttp string) (View, error) {
return View{}, fmt.Errorf("")
}
}
}
text, err := Retrieve(u)
if err != nil {

View File

@ -3,6 +3,7 @@ package gopher
import (
"errors"
"regexp"
"strings"
)
//------------------------------------------------\\
@ -76,6 +77,10 @@ func MakeUrl(u string) (Url, error) {
out.Gophertype = "0"
}
if out.Gophertype == "7" && strings.Contains(out.Resource, "\t") {
out.Gophertype = "1"
}
switch out.Gophertype {
case "1", "0", "h", "7":
out.IsBinary = false

View File

@ -46,9 +46,8 @@ func (v *View) ParseMap() {
} else {
title = ""
}
if len(line[0]) > 0 && string(line[0][0]) == "i" {
if len(line) > 1 && len(line[0]) > 0 && string(line[0][0]) == "i" {
v.Content[i] = " " + string(title)
continue
} else if len(line) >= 4 {
fulllink := fmt.Sprintf("%s:%s/%s%s", line[2], line[3], string(line[0][0]), line[1])
v.Links = append(v.Links, fulllink)