diff options
author | Frédéric Guillot <fred@miniflux.net> | 2017-12-10 20:51:04 -0800 |
---|---|---|
committer | Frédéric Guillot <fred@miniflux.net> | 2017-12-10 20:51:04 -0800 |
commit | 87ccad5c7f1edf8bce37af547ca1659326398fa8 (patch) | |
tree | 4998a78ac68b1c2c03e6152d26567928cdf042ec /storage | |
parent | 7a35c58f53d76356292e3e0ca9c91add3595a9e0 (diff) |
Add scraper rules
Diffstat (limited to 'storage')
-rw-r--r-- | storage/entry_query_builder.go | 3 | ||||
-rw-r--r-- | storage/feed.go | 11 | ||||
-rw-r--r-- | storage/migration.go | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/storage/entry_query_builder.go b/storage/entry_query_builder.go index 143fd3b..957adaa 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.category_id, c.title as category_title, f.scraper_rules, fi.icon_id FROM entries e LEFT JOIN feeds f ON f.id=e.feed_id @@ -197,6 +197,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) { &entry.Feed.CheckedAt, &entry.Feed.Category.ID, &entry.Feed.Category.Title, + &entry.Feed.ScraperRules, &iconID, ) diff --git a/storage/feed.go b/storage/feed.go index 9d42664..e722b0b 100644 --- a/storage/feed.go +++ b/storage/feed.go @@ -52,7 +52,7 @@ 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.user_id, f.checked_at, f.parsing_error_count, f.parsing_error_msg, f.scraper_rules, f.category_id, c.title as category_title, fi.icon_id FROM feeds f @@ -84,6 +84,7 @@ func (s *Storage) Feeds(userID int64) (model.Feeds, error) { &feed.CheckedAt, &feed.ParsingErrorCount, &errorMsg, + &feed.ScraperRules, &feed.Category.ID, &feed.Category.Title, &iconID, @@ -122,7 +123,7 @@ 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.user_id, f.checked_at, f.parsing_error_count, f.parsing_error_msg, f.scraper_rules, f.category_id, c.title as category_title FROM feeds f LEFT JOIN categories c ON c.id=f.category_id @@ -139,6 +140,7 @@ func (s *Storage) FeedByID(userID, feedID int64) (*model.Feed, error) { &feed.CheckedAt, &feed.ParsingErrorCount, &feed.ParsingErrorMsg, + &feed.ScraperRules, &feed.Category.ID, &feed.Category.Title, ) @@ -195,8 +197,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 - WHERE id=$10 AND user_id=$11` + parsing_error_msg=$8, parsing_error_count=$9, scraper_rules=$10 + WHERE id=$11 AND user_id=$12` _, err = s.db.Exec(query, feed.FeedURL, @@ -208,6 +210,7 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) { feed.CheckedAt, feed.ParsingErrorMsg, feed.ParsingErrorCount, + feed.ScraperRules, feed.ID, feed.UserID, ) diff --git a/storage/migration.go b/storage/migration.go index 76ad801..8f3c8cb 100644 --- a/storage/migration.go +++ b/storage/migration.go @@ -12,7 +12,7 @@ import ( "github.com/miniflux/miniflux2/sql" ) -const schemaVersion = 5 +const schemaVersion = 6 // Migrate run database migrations. func (s *Storage) Migrate() { |