diff --git a/main.go b/main.go index 3044944..00777fe 100644 --- a/main.go +++ b/main.go @@ -1,18 +1,18 @@ package main import ( - "os" - "fmt" - "log" - "sort" - "time" - "errors" "context" - "strings" - "net/url" "crypto/x509" "encoding/xml" + "errors" + "fmt" + "log" + "net/url" + "os" "path/filepath" + "sort" + "strings" + "time" "git.sr.ht/~adnano/go-gemini" "git.sr.ht/~adnano/go-gemini/tofu" @@ -98,7 +98,7 @@ func do(client gemini.Client, ctx context.Context, req *gemini.Request, via []*g } if resp.Status.Class() == gemini.StatusPermanentFailure { perrors[req.URL.String()] = PError{ - Code: resp.Status, + Code: resp.Status, Message: resp.Meta, } err = savePErrors() @@ -170,7 +170,7 @@ func main() { Link: FeedLink{ Href: req.URL.String(), }, - Id: req.URL.String(), + Id: req.URL.String(), Entries: nil, } if aw.Title == "" { @@ -181,10 +181,10 @@ func main() { if len(aw.Items) == 0 { feed.Updated = time.Now().Format(time.RFC3339) } else { - feed.Updated = aw.Items[len(aw.Items) - 1].Date.Format(time.RFC3339) + feed.Updated = aw.Items[len(aw.Items)-1].Date.Format(time.RFC3339) } for i := len(aw.Items); i != 0; i-- { - item := aw.Items[i - 1] + item := aw.Items[i-1] link, err := req.URL.Parse(item.Link) if err != nil { log.Fatal(err) @@ -193,9 +193,9 @@ func main() { Title: item.Title, Link: EntryLink{ Href: link.String(), - Rel: "alternate", + Rel: "alternate", }, - Id: link.String(), + Id: link.String(), Updated: item.Date.Format(time.RFC3339), }) } diff --git a/parser.go b/parser.go index aa8e800..c8758b3 100644 --- a/parser.go +++ b/parser.go @@ -1,9 +1,9 @@ package main import ( - "time" - "strings" "encoding/xml" + "strings" + "time" "git.sr.ht/~adnano/go-gemini" ) @@ -41,6 +41,7 @@ type FeedItem struct { } type ByTime []FeedItem + func (a ByTime) Len() int { return len(a) } @@ -63,9 +64,9 @@ func (a *AtomWriter) Handle(line gemini.Line) { t, err := time.Parse("2006-01-02", string(runes[:10])) if err == nil { a.Items = append(a.Items, FeedItem{ - Date: t, + Date: t, Title: strings.TrimSpace(strings.TrimLeft(strings.TrimSpace(string(runes[10:])), ":-")), - Link: string(line.URL), + Link: string(line.URL), }) } case gemini.LineHeading1: diff --git a/perrors.go b/perrors.go index e78493e..fa9927e 100644 --- a/perrors.go +++ b/perrors.go @@ -1,12 +1,12 @@ package main import ( - "os" "bufio" + "net/url" + "os" + "path/filepath" "strconv" "strings" - "net/url" - "path/filepath" "git.sr.ht/~adnano/go-gemini" ) @@ -44,7 +44,7 @@ func populatePErrors() error { continue } perrors[url.String()] = PError{ - Code: gemini.Status(code), + Code: gemini.Status(code), Message: unescaper.Replace(values[2]), } } diff --git a/predirs.go b/predirs.go index 7fedfd8..bf06d80 100644 --- a/predirs.go +++ b/predirs.go @@ -1,11 +1,11 @@ package main import ( - "os" "bufio" - "strings" "net/url" + "os" "path/filepath" + "strings" ) var predirs map[string]*url.URL