From ef097f02fe76572d2b1887c28da3f2bd83a993a0 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Tue, 12 Dec 2017 19:19:36 -0800
Subject: Add the possibility to enable crawler for feeds

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

(limited to 'storage')

diff --git a/storage/entry_query_builder.go b/storage/entry_query_builder.go
index 8b16d73..0d632bc 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.rewrite_rules,
+		f.category_id, c.title as category_title, f.scraper_rules, f.rewrite_rules, f.crawler,
 		fi.icon_id
 		FROM entries e
 		LEFT JOIN feeds f ON f.id=e.feed_id
@@ -199,6 +199,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
 			&entry.Feed.Category.Title,
 			&entry.Feed.ScraperRules,
 			&entry.Feed.RewriteRules,
+			&entry.Feed.Crawler,
 			&iconID,
 		)
 
diff --git a/storage/feed.go b/storage/feed.go
index a8ed1b4..2ea20bc 100644
--- a/storage/feed.go
+++ b/storage/feed.go
@@ -53,7 +53,7 @@ func (s *Storage) Feeds(userID int64) (model.Feeds, 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.rewrite_rules,
+		f.scraper_rules, f.rewrite_rules, f.crawler,
 		f.category_id, c.title as category_title,
 		fi.icon_id
 		FROM feeds f
@@ -87,6 +87,7 @@ func (s *Storage) Feeds(userID int64) (model.Feeds, error) {
 			&errorMsg,
 			&feed.ScraperRules,
 			&feed.RewriteRules,
+			&feed.Crawler,
 			&feed.Category.ID,
 			&feed.Category.Title,
 			&iconID,
@@ -126,7 +127,7 @@ func (s *Storage) FeedByID(userID, feedID int64) (*model.Feed, error) {
 		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.rewrite_rules,
+		f.scraper_rules, f.rewrite_rules, f.crawler,
 		f.category_id, c.title as category_title
 		FROM feeds f
 		LEFT JOIN categories c ON c.id=f.category_id
@@ -145,6 +146,7 @@ func (s *Storage) FeedByID(userID, feedID int64) (*model.Feed, error) {
 		&feed.ParsingErrorMsg,
 		&feed.ScraperRules,
 		&feed.RewriteRules,
+		&feed.Crawler,
 		&feed.Category.ID,
 		&feed.Category.Title,
 	)
@@ -164,8 +166,8 @@ func (s *Storage) CreateFeed(feed *model.Feed) error {
 	defer helper.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:CreateFeed] feedURL=%s", feed.FeedURL))
 	sql := `
 		INSERT INTO feeds
-		(feed_url, site_url, title, category_id, user_id, etag_header, last_modified_header)
-		VALUES ($1, $2, $3, $4, $5, $6, $7)
+		(feed_url, site_url, title, category_id, user_id, etag_header, last_modified_header, crawler)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
 		RETURNING id
 	`
 
@@ -178,6 +180,7 @@ func (s *Storage) CreateFeed(feed *model.Feed) error {
 		feed.UserID,
 		feed.EtagHeader,
 		feed.LastModifiedHeader,
+		feed.Crawler,
 	).Scan(&feed.ID)
 	if err != nil {
 		return fmt.Errorf("unable to create feed: %v", err)
@@ -201,8 +204,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, rewrite_rules=$11
-		WHERE id=$12 AND user_id=$13`
+		parsing_error_msg=$8, parsing_error_count=$9, scraper_rules=$10, rewrite_rules=$11, crawler=$12
+		WHERE id=$13 AND user_id=$14`
 
 	_, err = s.db.Exec(query,
 		feed.FeedURL,
@@ -216,6 +219,7 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) {
 		feed.ParsingErrorCount,
 		feed.ScraperRules,
 		feed.RewriteRules,
+		feed.Crawler,
 		feed.ID,
 		feed.UserID,
 	)
diff --git a/storage/migration.go b/storage/migration.go
index 78fbf07..f60e8ac 100644
--- a/storage/migration.go
+++ b/storage/migration.go
@@ -12,7 +12,7 @@ import (
 	"github.com/miniflux/miniflux2/sql"
 )
 
-const schemaVersion = 7
+const schemaVersion = 8
 
 // Migrate run database migrations.
 func (s *Storage) Migrate() {
-- 
cgit v1.2.3