Add HTTP proxy option for subscriptions

ui/form/feed.go

@@ -25,6 +25,7 @@ type FeedForm struct {
 	Username        string
 	Password        string
 	IgnoreHTTPCache bool
+	FetchViaProxy   bool
 	Disabled        bool
 }
 
@@ -51,6 +52,7 @@ func (f FeedForm) Merge(feed *model.Feed) *model.Feed {
 	feed.Username = f.Username
 	feed.Password = f.Password
 	feed.IgnoreHTTPCache = f.IgnoreHTTPCache
+	feed.FetchViaProxy = f.FetchViaProxy
 	feed.Disabled = f.Disabled
 	return feed
 }
@@ -74,6 +76,7 @@ func NewFeedForm(r *http.Request) *FeedForm {
 		Username:        r.FormValue("feed_username"),
 		Password:        r.FormValue("feed_password"),
 		IgnoreHTTPCache: r.FormValue("ignore_http_cache") == "1",
+		FetchViaProxy:   r.FormValue("fetch_via_proxy") == "1",
 		Disabled:        r.FormValue("disabled") == "1",
 	}
 }

ui/form/subscription.go

@@ -13,14 +13,15 @@ import (
 
 // SubscriptionForm represents the subscription form.
 type SubscriptionForm struct {
-	URL          string
-	CategoryID   int64
-	Crawler      bool
-	UserAgent    string
-	Username     string
-	Password     string
-	ScraperRules string
-	RewriteRules string
+	URL           string
+	CategoryID    int64
+	Crawler       bool
+	FetchViaProxy bool
+	UserAgent     string
+	Username      string
+	Password      string
+	ScraperRules  string
+	RewriteRules  string
 }
 
 // Validate makes sure the form values are valid.
@@ -40,13 +41,14 @@ func NewSubscriptionForm(r *http.Request) *SubscriptionForm {
 	}
 
 	return &SubscriptionForm{
-		URL:          r.FormValue("url"),
-		Crawler:      r.FormValue("crawler") == "1",
-		CategoryID:   int64(categoryID),
-		UserAgent:    r.FormValue("user_agent"),
-		Username:     r.FormValue("feed_username"),
-		Password:     r.FormValue("feed_password"),
-		ScraperRules: r.FormValue("scraper_rules"),
-		RewriteRules: r.FormValue("rewrite_rules"),
+		URL:           r.FormValue("url"),
+		Crawler:       r.FormValue("crawler") == "1",
+		FetchViaProxy: r.FormValue("fetch_via_proxy") == "1",
+		CategoryID:    int64(categoryID),
+		UserAgent:     r.FormValue("user_agent"),
+		Username:      r.FormValue("feed_username"),
+		Password:      r.FormValue("feed_password"),
+		ScraperRules:  r.FormValue("scraper_rules"),
+		RewriteRules:  r.FormValue("rewrite_rules"),
 	}
 }