diff options
| -rw-r--r-- | fetch/fetch.go | 4 | ||||
| -rw-r--r-- | fetch/gopher.go | 33 |
2 files changed, 23 insertions, 14 deletions
diff --git a/fetch/fetch.go b/fetch/fetch.go index 4dfb6c2..4bed64c 100644 --- a/fetch/fetch.go +++ b/fetch/fetch.go @@ -70,9 +70,7 @@ func UpdatePage(p *core.Page) error { case "http", "https": return updateHTTPPage(p) case "gopher", "gophers": - // return updateGopherPage(p) - // TODO - fallthrough + return updateGopherPage(p) default: return fmt.Errorf("Unsupported protocol '%s'", p.Link.Scheme) } diff --git a/fetch/gopher.go b/fetch/gopher.go index 5750fad..29afef1 100644 --- a/fetch/gopher.go +++ b/fetch/gopher.go @@ -35,33 +35,44 @@ func newGopherFeed(remoteURL *url.URL, title string) (*core.Feed, error) { // newGopherPage will create a new core.Page given a gopher url func newGopherPage(remoteURL *url.URL, title string) (*core.Page, error) { - resp, err := fetchGopher(remoteURL) + var page core.Page + page.Title = title + page.Link = remoteURL + + err := updateGopherPage(&page) if err != nil { return nil, err } + return &page, nil +} + +// updateGopherPage wll check an existing core.Page for changes +func updateGopherPage(p *core.Page) error { + resp, err := fetchGopher(p.Link) + if err != nil { + return err + } defer resp.Body.Close() var reader io.Reader if len(resp.Dir.Items) > 0 { text, err := resp.Dir.ToText() if err != nil { - return nil, err + return err } reader = io.LimitReader(bytes.NewReader(text), 1073741824) // 1 GiB } else { 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() if _, err := io.Copy(h, reader); err != nil { - return nil, err + return err } - page.Hash = fmt.Sprintf("%x", h.Sum(nil)) - - return &page, nil + newHash := fmt.Sprintf("%x", h.Sum(nil)) + if newHash != p.Hash { + p.Hash = newHash + p.Updated = time.Now() + } + return nil } |