oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-07-22 17:18:37 +00:00
Code Wiki Activity

Add Prometheus exporter

Browse source
This commit is contained in:
Frédéric Guillot 2020-09-27 16:01:06 -07:00 • committed by Frédéric Guillot
parent 16b7b3bc3e
commit c394a61a4e
61 changed files with 809 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reader/scraper/scraper.go
View file

@ -35,7 +35,7 @@ func Fetch(websiteURL, rules, userAgent string) (string, error) {
return "", errors.New("scraper: unable to download web page")
}
if !isWhitelistedContentType(response.ContentType) {
if !isAllowedContentType(response.ContentType) {
return "", fmt.Errorf("scraper: this resource is not a HTML document (%s)", response.ContentType)
}
@ -95,7 +95,7 @@ func getPredefinedScraperRules(websiteURL string) string {
return ""
}
func isWhitelistedContentType(contentType string) bool {
func isAllowedContentType(contentType string) bool {
contentType = strings.ToLower(contentType)
return strings.HasPrefix(contentType, "text/html") ||
strings.HasPrefix(contentType, "application/xhtml+xml")

10
reader/scraper/scraper_test.go
View file

@ -39,7 +39,7 @@ func TestWhitelistedContentTypes(t *testing.T) {
}
for inputValue, expectedResult := range scenarios {
actualResult := isWhitelistedContentType(inputValue)
actualResult := isAllowedContentType(inputValue)
if actualResult != expectedResult {
t.Errorf(`Unexpected result for content type whitelist, got "%v" instead of "%v"`, actualResult, expectedResult)
}
@ -47,10 +47,10 @@ func TestWhitelistedContentTypes(t *testing.T) {
}
func TestSelectorRules(t *testing.T) {
var ruleTestCases = map[string]string {
"img.html": "article > img",
"iframe.html": "article > iframe",
"p.html": "article > p",
var ruleTestCases = map[string]string{
"img.html": "article > img",
"iframe.html": "article > iframe",
"p.html": "article > p",
}
for filename, rule := range ruleTestCases {