From bddca15b69692bd055c507f2469e68dca1e56098 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Tue, 19 Jun 2018 22:58:29 -0700 Subject: Add new fields for feed username/password --- model/feed.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'model/feed.go') diff --git a/model/feed.go b/model/feed.go index c2ee6e8..9c7ecca 100644 --- a/model/feed.go +++ b/model/feed.go @@ -24,6 +24,8 @@ type Feed struct { ScraperRules string `json:"scraper_rules"` RewriteRules string `json:"rewrite_rules"` Crawler bool `json:"crawler"` + Username string `json:"username"` + Password string `json:"password"` Category *Category `json:"category,omitempty"` Entries Entries `json:"entries,omitempty"` Icon *FeedIcon `json:"icon"` @@ -69,6 +71,14 @@ func (f *Feed) Merge(override *Feed) { if override.Category != nil && override.Category.ID != 0 && override.Category.ID != f.Category.ID { f.Category.ID = override.Category.ID } + + if override.Username != f.Username { + f.Username = override.Username + } + + if override.Password != f.Password { + f.Password = override.Password + } } // Feeds is a list of feed -- cgit v1.2.3