oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-06 17:41:00 +00:00
Code Wiki Activity

Add the possibility to define rewrite rules for each feed

Browse source
This commit is contained in:
Frédéric Guillot 2017-12-11 22:16:32 -08:00
parent 87ccad5c7f
commit 33445e5b68
29 changed files with 214 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/static/bin.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2017-12-10 18:56:24.36887959 -0800 PST m=+0.010858677
// 2017-12-11 22:04:47.832384663 -0800 PST m=+0.014706233
package static

2
server/static/css.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2017-12-10 18:56:24.370410193 -0800 PST m=+0.012389280
// 2017-12-11 22:04:47.835872498 -0800 PST m=+0.018194068
package static

2
server/static/js.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2017-12-10 18:56:24.37299237 -0800 PST m=+0.014971457
// 2017-12-11 22:04:47.840119593 -0800 PST m=+0.022441163
package static

2
server/template/common.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2017-12-10 18:56:24.386027486 -0800 PST m=+0.028006573
// 2017-12-11 22:04:47.859021405 -0800 PST m=+0.041342975
package template

3
server/template/html/edit_feed.html
View file

@ -48,6 +48,9 @@
<label for="form-scraper-rules">{{ t "Scraper Rules" }}</label>
<input type="text" name="scraper_rules" id="form-scraper-rules" value="{{ .form.ScraperRules }}">
<label for="form-rewrite-rules">{{ t "Rewrite Rules" }}</label>
<input type="text" name="rewrite_rules" id="form-rewrite-rules" value="{{ .form.RewriteRules }}">
<label for="form-category">{{ t "Category" }}</label>
<select id="form-category" name="category_id">
{{ range .categories }}

7
server/template/views.go
View file

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2017-12-10 20:08:14.428877093 -0800 PST m=+0.021859548
// 2017-12-11 22:04:47.843652435 -0800 PST m=+0.025974005
package template
@ -398,6 +398,9 @@ var templateViewsMap = map[string]string{
<label for="form-scraper-rules">{{ t "Scraper Rules" }}</label>
<input type="text" name="scraper_rules" id="form-scraper-rules" value="{{ .form.ScraperRules }}">
<label for="form-rewrite-rules">{{ t "Rewrite Rules" }}</label>
<input type="text" name="rewrite_rules" id="form-rewrite-rules" value="{{ .form.RewriteRules }}">
<label for="form-category">{{ t "Category" }}</label>
<select id="form-category" name="category_id">
{{ range .categories }}
@ -1184,7 +1187,7 @@ var templateViewsMapChecksums = map[string]string{
"create_category": "2b82af5d2dcd67898dc5daa57a6461e6ff8121a6089b2a2a1be909f35e4a2275",
"create_user": "45e226df757126d5fe7c464e295e9a34f07952cfdb71e31e49839850d35af139",
"edit_category": "cee720faadcec58289b707ad30af623d2ee66c1ce23a732965463250d7ff41c5",
"edit_feed": "b3c7dd5e93d58e051abcd59da31217d8e9b50587014b895d1b7c9172247b35f8",
"edit_feed": "e33e64de5e2b9c12580e693d048c2fab907968d4e7cddb2055d0251efc5b75e4",
"edit_user": "82d9749d76ddbd2352816d813c4b1f6d92f2222de678b4afe5821090246735c7",
"entry": "ebcf9bb35812dd02759718f7f7411267e6a6c8efd59a9aa0a0e735bcb88efeff",
"feed_entries": "547c19eb36b20e350ce70ed045173b064cdcd6b114afb241c9f2dda9d88fcc27",

1
server/ui/controller/feed.go
View file

@ -221,6 +221,7 @@ func (c *Controller) getFeedFormTemplateArgs(ctx *core.Context, user *model.User
FeedURL: feed.FeedURL,
Title: feed.Title,
ScraperRules: feed.ScraperRules,
RewriteRules: feed.RewriteRules,
CategoryID: feed.Category.ID,
}
} else {

3
server/ui/form/feed.go
View file

@ -18,6 +18,7 @@ type FeedForm struct {
SiteURL string
Title string
ScraperRules string
RewriteRules string
CategoryID int64
}
@ -36,6 +37,7 @@ func (f FeedForm) Merge(feed *model.Feed) *model.Feed {
feed.SiteURL = f.SiteURL
feed.FeedURL = f.FeedURL
feed.ScraperRules = f.ScraperRules
feed.RewriteRules = f.RewriteRules
feed.ParsingErrorCount = 0
feed.ParsingErrorMsg = ""
return feed
@ -53,6 +55,7 @@ func NewFeedForm(r *http.Request) *FeedForm {
SiteURL: r.FormValue("site_url"),
Title: r.FormValue("title"),
ScraperRules: r.FormValue("scraper_rules"),
RewriteRules: r.FormValue("rewrite_rules"),
CategoryID: int64(categoryID),
}
}