From 69aa650203087ad6365fcd6769a49bdf327e9efb Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Fri, 29 Nov 2019 11:17:14 -0800 Subject: Add the possibility to add rules during feed creation --- model/feed.go | 4 +++- model/feed_test.go | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'model') diff --git a/model/feed.go b/model/feed.go index 9d0ab27..5782c4f 100644 --- a/model/feed.go +++ b/model/feed.go @@ -61,11 +61,13 @@ func (f *Feed) WithCategoryID(categoryID int64) { } // WithBrowsingParameters defines browsing parameters. -func (f *Feed) WithBrowsingParameters(crawler bool, userAgent, username, password string) { +func (f *Feed) WithBrowsingParameters(crawler bool, userAgent, username, password, scraperRules, rewriteRules string) { f.Crawler = crawler f.UserAgent = userAgent f.Username = username f.Password = password + f.ScraperRules = scraperRules + f.RewriteRules = rewriteRules } // WithError adds a new error message and increment the error counter. diff --git a/model/feed_test.go b/model/feed_test.go index 8cbb00b..27ef897 100644 --- a/model/feed_test.go +++ b/model/feed_test.go @@ -44,7 +44,7 @@ func TestFeedCategorySetter(t *testing.T) { func TestFeedBrowsingParams(t *testing.T) { feed := &Feed{} - feed.WithBrowsingParameters(true, "Custom User Agent", "Username", "Secret") + feed.WithBrowsingParameters(true, "Custom User Agent", "Username", "Secret", "Some Rule", "Another Rule") if !feed.Crawler { t.Error(`The crawler must be activated`) @@ -61,6 +61,14 @@ func TestFeedBrowsingParams(t *testing.T) { if feed.Password != "Secret" { t.Error(`The password must be set`) } + + if feed.ScraperRules != "Some Rule" { + t.Errorf(`The scraper rules must be set`) + } + + if feed.RewriteRules != "Another Rule" { + t.Errorf(`The rewrite rules must be set`) + } } func TestFeedErrorCounter(t *testing.T) { -- cgit v1.2.3