From 69aa650203087ad6365fcd6769a49bdf327e9efb Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Fri, 29 Nov 2019 11:17:14 -0800
Subject: Add the possibility to add rules during feed creation

---
 ui/form/subscription.go   | 28 ++++++++++++++++------------
 ui/subscription_choose.go |  4 +++-
 ui/subscription_submit.go |  6 ++++--
 3 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'ui')

diff --git a/ui/form/subscription.go b/ui/form/subscription.go
index 16a2bf9..f6348e2 100644
--- a/ui/form/subscription.go
+++ b/ui/form/subscription.go
@@ -13,12 +13,14 @@ import (
 
 // SubscriptionForm represents the subscription form.
 type SubscriptionForm struct {
-	URL        string
-	CategoryID int64
-	Crawler    bool
-	UserAgent  string
-	Username   string
-	Password   string
+	URL          string
+	CategoryID   int64
+	Crawler      bool
+	UserAgent    string
+	Username     string
+	Password     string
+	ScraperRules string
+	RewriteRules string
 }
 
 // Validate makes sure the form values are valid.
@@ -38,11 +40,13 @@ 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"),
+		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"),
 	}
 }
diff --git a/ui/subscription_choose.go b/ui/subscription_choose.go
index b554b03..37c7461 100644
--- a/ui/subscription_choose.go
+++ b/ui/subscription_choose.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 
 	"miniflux.app/http/client"
-	"miniflux.app/http/response/html"
 	"miniflux.app/http/request"
+	"miniflux.app/http/response/html"
 	"miniflux.app/http/route"
 	"miniflux.app/ui/form"
 	"miniflux.app/ui/session"
@@ -55,6 +55,8 @@ func (h *handler) showChooseSubscriptionPage(w http.ResponseWriter, r *http.Requ
 		subscriptionForm.UserAgent,
 		subscriptionForm.Username,
 		subscriptionForm.Password,
+		subscriptionForm.ScraperRules,
+		subscriptionForm.RewriteRules,
 	)
 	if err != nil {
 		view.Set("form", subscriptionForm)
diff --git a/ui/subscription_submit.go b/ui/subscription_submit.go
index 8d3c7ed..0a3c1af 100644
--- a/ui/subscription_submit.go
+++ b/ui/subscription_submit.go
@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package ui  // import "miniflux.app/ui"
+package ui // import "miniflux.app/ui"
 
 import (
 	"net/http"
 
 	"miniflux.app/http/client"
-	"miniflux.app/http/response/html"
 	"miniflux.app/http/request"
+	"miniflux.app/http/response/html"
 	"miniflux.app/http/route"
 	"miniflux.app/logger"
 	"miniflux.app/reader/subscription"
@@ -80,6 +80,8 @@ func (h *handler) submitSubscription(w http.ResponseWriter, r *http.Request) {
 			subscriptionForm.UserAgent,
 			subscriptionForm.Username,
 			subscriptionForm.Password,
+			subscriptionForm.ScraperRules,
+			subscriptionForm.RewriteRules,
 		)
 		if err != nil {
 			v.Set("form", subscriptionForm)
-- 
cgit v1.2.3