From 33445e5b681bbdffaf0925ed020ecdcc49687f15 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Mon, 11 Dec 2017 22:16:32 -0800
Subject: Add the possibility to define rewrite rules for each feed

---
 storage/entry_query_builder.go |  3 ++-
 storage/feed.go                | 13 +++++++++----
 storage/migration.go           |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'storage')

diff --git a/storage/entry_query_builder.go b/storage/entry_query_builder.go
index 957adaa..8b16d73 100644
--- a/storage/entry_query_builder.go
+++ b/storage/entry_query_builder.go
@@ -152,7 +152,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
 		SELECT
 		e.id, e.user_id, e.feed_id, e.hash, e.published_at at time zone '%s', e.title, e.url, e.author, e.content, e.status,
 		f.title as feed_title, f.feed_url, f.site_url, f.checked_at,
-		f.category_id, c.title as category_title, f.scraper_rules,
+		f.category_id, c.title as category_title, f.scraper_rules, f.rewrite_rules,
 		fi.icon_id
 		FROM entries e
 		LEFT JOIN feeds f ON f.id=e.feed_id
@@ -198,6 +198,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
 			&entry.Feed.Category.ID,
 			&entry.Feed.Category.Title,
 			&entry.Feed.ScraperRules,
+			&entry.Feed.RewriteRules,
 			&iconID,
 		)
 
diff --git a/storage/feed.go b/storage/feed.go
index e722b0b..a8ed1b4 100644
--- a/storage/feed.go
+++ b/storage/feed.go
@@ -52,7 +52,8 @@ func (s *Storage) Feeds(userID int64) (model.Feeds, error) {
 	feeds := make(model.Feeds, 0)
 	query := `SELECT
 		f.id, f.feed_url, f.site_url, f.title, f.etag_header, f.last_modified_header,
-		f.user_id, f.checked_at, f.parsing_error_count, f.parsing_error_msg, f.scraper_rules,
+		f.user_id, f.checked_at, f.parsing_error_count, f.parsing_error_msg,
+		f.scraper_rules, f.rewrite_rules,
 		f.category_id, c.title as category_title,
 		fi.icon_id
 		FROM feeds f
@@ -85,6 +86,7 @@ func (s *Storage) Feeds(userID int64) (model.Feeds, error) {
 			&feed.ParsingErrorCount,
 			&errorMsg,
 			&feed.ScraperRules,
+			&feed.RewriteRules,
 			&feed.Category.ID,
 			&feed.Category.Title,
 			&iconID,
@@ -123,7 +125,8 @@ func (s *Storage) FeedByID(userID, feedID int64) (*model.Feed, error) {
 	query := `
 		SELECT
 		f.id, f.feed_url, f.site_url, f.title, f.etag_header, f.last_modified_header,
-		f.user_id, f.checked_at, f.parsing_error_count, f.parsing_error_msg, f.scraper_rules,
+		f.user_id, f.checked_at, f.parsing_error_count, f.parsing_error_msg,
+		f.scraper_rules, f.rewrite_rules,
 		f.category_id, c.title as category_title
 		FROM feeds f
 		LEFT JOIN categories c ON c.id=f.category_id
@@ -141,6 +144,7 @@ func (s *Storage) FeedByID(userID, feedID int64) (*model.Feed, error) {
 		&feed.ParsingErrorCount,
 		&feed.ParsingErrorMsg,
 		&feed.ScraperRules,
+		&feed.RewriteRules,
 		&feed.Category.ID,
 		&feed.Category.Title,
 	)
@@ -197,8 +201,8 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) {
 
 	query := `UPDATE feeds SET
 		feed_url=$1, site_url=$2, title=$3, category_id=$4, etag_header=$5, last_modified_header=$6, checked_at=$7,
-		parsing_error_msg=$8, parsing_error_count=$9, scraper_rules=$10
-		WHERE id=$11 AND user_id=$12`
+		parsing_error_msg=$8, parsing_error_count=$9, scraper_rules=$10, rewrite_rules=$11
+		WHERE id=$12 AND user_id=$13`
 
 	_, err = s.db.Exec(query,
 		feed.FeedURL,
@@ -211,6 +215,7 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) {
 		feed.ParsingErrorMsg,
 		feed.ParsingErrorCount,
 		feed.ScraperRules,
+		feed.RewriteRules,
 		feed.ID,
 		feed.UserID,
 	)
diff --git a/storage/migration.go b/storage/migration.go
index 8f3c8cb..78fbf07 100644
--- a/storage/migration.go
+++ b/storage/migration.go
@@ -12,7 +12,7 @@ import (
 	"github.com/miniflux/miniflux2/sql"
 )
 
-const schemaVersion = 6
+const schemaVersion = 7
 
 // Migrate run database migrations.
 func (s *Storage) Migrate() {
-- 
cgit v1.2.3