From 311a133ab87423958d850a91dea0b49543b97c2a Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 2 Dec 2018 20:51:06 -0800 Subject: Refactor manual entry scraper --- ui/entry_scraper.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'ui') diff --git a/ui/entry_scraper.go b/ui/entry_scraper.go index 48fb7db..0e7904a 100644 --- a/ui/entry_scraper.go +++ b/ui/entry_scraper.go @@ -6,12 +6,11 @@ package ui // import "miniflux.app/ui" import ( "net/http" + "miniflux.app/http/request" "miniflux.app/http/response/json" "miniflux.app/model" - "miniflux.app/reader/rewrite" - "miniflux.app/reader/sanitizer" - "miniflux.app/reader/scraper" + "miniflux.app/reader/processor" ) func (h *handler) fetchContent(w http.ResponseWriter, r *http.Request) { @@ -31,15 +30,11 @@ func (h *handler) fetchContent(w http.ResponseWriter, r *http.Request) { return } - content, err := scraper.Fetch(entry.URL, entry.Feed.ScraperRules, entry.Feed.UserAgent) - if err != nil { + if err := processor.ProcessEntryWebPage(entry); err != nil { json.ServerError(w, r, err) return } - - content = rewrite.Rewriter(entry.URL, content, entry.Feed.RewriteRules) - entry.Content = sanitizer.Sanitize(entry.URL, content) h.store.UpdateEntryContent(entry) json.OK(w, r, map[string]string{"content": entry.Content}) -- cgit v1.2.3