From 1bc8535dbb2974be04d7e9b1dd9045a8322d3595 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Sun, 2 Dec 2018 21:09:53 -0800
Subject: Move image proxy filter to template functions

---
 reader/processor/filter.go    | 53 -------------------------------------------
 reader/processor/processor.go | 53 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 reader/processor/filter.go
 create mode 100644 reader/processor/processor.go

(limited to 'reader')

diff --git a/reader/processor/filter.go b/reader/processor/filter.go
deleted file mode 100644
index faceccc..0000000
--- a/reader/processor/filter.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2018 Frédéric Guillot. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package processor
-
-import (
-	"miniflux.app/logger"
-	"miniflux.app/model"
-	"miniflux.app/reader/rewrite"
-	"miniflux.app/reader/sanitizer"
-	"miniflux.app/reader/scraper"
-	"miniflux.app/storage"
-)
-
-// ProcessFeedEntries downloads original web page for entries and apply filters.
-func ProcessFeedEntries(store *storage.Storage, feed *model.Feed) {
-	for _, entry := range feed.Entries {
-		if feed.Crawler {
-			if !store.EntryURLExists(feed.UserID, entry.URL) {
-				content, err := scraper.Fetch(entry.URL, feed.ScraperRules, feed.UserAgent)
-				if err != nil {
-					logger.Error(`[Filter] Unable to crawl this entry: %q => %v`, entry.URL, err)
-				} else if content != "" {
-					// We replace the entry content only if the scraper doesn't return any error.
-					entry.Content = content
-				}
-			}
-		}
-
-		entry.Content = rewrite.Rewriter(entry.URL, entry.Content, feed.RewriteRules)
-
-		// The sanitizer should always run at the end of the process to make sure unsafe HTML is filtered.
-		entry.Content = sanitizer.Sanitize(entry.URL, entry.Content)
-	}
-}
-
-// ProcessEntryWebPage downloads the entry web page and apply rewrite rules.
-func ProcessEntryWebPage(entry *model.Entry) error {
-	content, err := scraper.Fetch(entry.URL, entry.Feed.ScraperRules, entry.Feed.UserAgent)
-	if err != nil {
-		return err
-	}
-
-	content = rewrite.Rewriter(entry.URL, content, entry.Feed.RewriteRules)
-	content = sanitizer.Sanitize(entry.URL, content)
-
-	if content != "" {
-		entry.Content = content
-	}
-
-	return nil
-}
diff --git a/reader/processor/processor.go b/reader/processor/processor.go
new file mode 100644
index 0000000..faceccc
--- /dev/null
+++ b/reader/processor/processor.go
@@ -0,0 +1,53 @@
+// Copyright 2018 Frédéric Guillot. All rights reserved.
+// Use of this source code is governed by the Apache 2.0
+// license that can be found in the LICENSE file.
+
+package processor
+
+import (
+	"miniflux.app/logger"
+	"miniflux.app/model"
+	"miniflux.app/reader/rewrite"
+	"miniflux.app/reader/sanitizer"
+	"miniflux.app/reader/scraper"
+	"miniflux.app/storage"
+)
+
+// ProcessFeedEntries downloads original web page for entries and apply filters.
+func ProcessFeedEntries(store *storage.Storage, feed *model.Feed) {
+	for _, entry := range feed.Entries {
+		if feed.Crawler {
+			if !store.EntryURLExists(feed.UserID, entry.URL) {
+				content, err := scraper.Fetch(entry.URL, feed.ScraperRules, feed.UserAgent)
+				if err != nil {
+					logger.Error(`[Filter] Unable to crawl this entry: %q => %v`, entry.URL, err)
+				} else if content != "" {
+					// We replace the entry content only if the scraper doesn't return any error.
+					entry.Content = content
+				}
+			}
+		}
+
+		entry.Content = rewrite.Rewriter(entry.URL, entry.Content, feed.RewriteRules)
+
+		// The sanitizer should always run at the end of the process to make sure unsafe HTML is filtered.
+		entry.Content = sanitizer.Sanitize(entry.URL, entry.Content)
+	}
+}
+
+// ProcessEntryWebPage downloads the entry web page and apply rewrite rules.
+func ProcessEntryWebPage(entry *model.Entry) error {
+	content, err := scraper.Fetch(entry.URL, entry.Feed.ScraperRules, entry.Feed.UserAgent)
+	if err != nil {
+		return err
+	}
+
+	content = rewrite.Rewriter(entry.URL, content, entry.Feed.RewriteRules)
+	content = sanitizer.Sanitize(entry.URL, content)
+
+	if content != "" {
+		entry.Content = content
+	}
+
+	return nil
+}
-- 
cgit v1.2.3