add updateGeminiPage and refactor newGeminiPage to use updateGeminiPage.

This commit is contained in:
nytpu
2021-03-17 08:43:19 -06:00
parent 09c1c4caab
commit f9428c3e0e
2 changed files with 23 additions and 13 deletions
+1 -3
View File
@@ -66,9 +66,7 @@ func UpdateFeed(f *core.Feed) error {
func UpdatePage(p *core.Page) error { func UpdatePage(p *core.Page) error {
switch p.Link.Scheme { switch p.Link.Scheme {
case "gemini": case "gemini":
// return updateGeminiPage(p) return updateGeminiPage(p)
// TODO
fallthrough
case "http", "https": case "http", "https":
// return updateHTTPPage(p) // return updateHTTPPage(p)
// TODO // TODO
+22 -10
View File
@@ -60,6 +60,7 @@ func newGeminiFeed(remoteURL *url.URL, title string) (*core.Feed, error) {
var feed core.Feed var feed core.Feed
feed.Title = title // will be set later if given title is "" feed.Title = title // will be set later if given title is ""
feed.Link = remoteURL feed.Link = remoteURL
feed.FeedLink = remoteURL
text, err := gemini.ParseText(resp.Body) text, err := gemini.ParseText(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -110,24 +111,35 @@ func newGeminiFeed(remoteURL *url.URL, title string) (*core.Feed, error) {
// newGeminiPage will create a new core.Page given a gemini url // newGeminiPage will create a new core.Page given a gemini url
func newGeminiPage(remoteURL *url.URL, title string) (*core.Page, error) { func newGeminiPage(remoteURL *url.URL, title string) (*core.Page, error) {
resp, err := fetchGemini(remoteURL) var page core.Page
page.Title = title
page.Link = remoteURL
err := updateGeminiPage(&page)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &page, nil
}
// updateGeminiPage will check an existing core.Page for changes
func updateGeminiPage(p *core.Page) error {
resp, err := fetchGemini(p.Link)
if err != nil {
return err
}
defer resp.Body.Close() defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 1073741824) // 1 GiB reader := io.LimitReader(resp.Body, 1073741824) // 1 GiB
var page core.Page
page.Title = title
page.Link = remoteURL
page.Updated = time.Now()
h := sha256.New() h := sha256.New()
if _, err := io.Copy(h, reader); err != nil { if _, err := io.Copy(h, reader); err != nil {
return nil, err return err
} }
page.Hash = fmt.Sprintf("%x", h.Sum(nil)) newHash := fmt.Sprintf("%x", h.Sum(nil))
if newHash != p.Hash {
return &page, nil p.Hash = newHash
p.Updated = time.Now()
}
return nil
} }