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

perf(rewrite): anchor the rewrite regex

Browse source 
There is no need to try to match the regexp over the whole input, having it
anchored is enough. If we feel extra-lenient, we might strip spaces in
front/tail, but I don't think it's necessary.

This commit also invert a condition to reduce the level of nested indentation,
and make a condition stricter.
This commit is contained in:
jvoisin 2025-07-11 00:59:35 +02:00 • committed by Frédéric Guillot
parent 9dea26c923
commit f455c18c66
1 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

54
internal/reader/rewrite/url_rewrite.go
View file

@ -10,38 +10,40 @@ import (
"miniflux.app/v2/internal/model" "miniflux.app/v2/internal/model"
) )
var customReplaceRuleRegex = regexp.MustCompile(`rewrite\("([^"]+)"\|"([^"]+)"\)`) var customReplaceRuleRegex = regexp.MustCompile(`^rewrite\("([^"]+)"\|"([^"]+)"\)$`)
func RewriteEntryURL(feed *model.Feed, entry *model.Entry) string { func RewriteEntryURL(feed *model.Feed, entry *model.Entry) string {
var rewrittenURL = entry.URL if feed.UrlRewriteRules == "" {
if feed.UrlRewriteRules != "" { return entry.URL
parts := customReplaceRuleRegex.FindStringSubmatch(feed.UrlRewriteRules) }
if len(parts) >= 3 { var rewrittenURL = entry.URL
re, err := regexp.Compile(parts[1]) parts := customReplaceRuleRegex.FindStringSubmatch(feed.UrlRewriteRules)
if err != nil {
slog.Error("Failed on regexp compilation", if len(parts) == 3 {
slog.String("url_rewrite_rules", feed.UrlRewriteRules), re, err := regexp.Compile(parts[1])
slog.Any("error", err), if err != nil {
) slog.Error("Failed on regexp compilation",
return rewrittenURL
}
rewrittenURL = re.ReplaceAllString(entry.URL, parts[2])
slog.Debug("Rewriting entry URL",
slog.String("original_entry_url", entry.URL),
slog.String("rewritten_entry_url", rewrittenURL),
slog.Int64("feed_id", feed.ID),
slog.String("feed_url", feed.FeedURL),
)
} else {
slog.Debug("Cannot find search and replace terms for replace rule",
slog.String("original_entry_url", entry.URL),
slog.String("rewritten_entry_url", rewrittenURL),
slog.Int64("feed_id", feed.ID),
slog.String("feed_url", feed.FeedURL),
slog.String("url_rewrite_rules", feed.UrlRewriteRules), slog.String("url_rewrite_rules", feed.UrlRewriteRules),
slog.Any("error", err),
) )
return rewrittenURL
} }
rewrittenURL = re.ReplaceAllString(entry.URL, parts[2])
slog.Debug("Rewriting entry URL",
slog.String("original_entry_url", entry.URL),
slog.String("rewritten_entry_url", rewrittenURL),
slog.Int64("feed_id", feed.ID),
slog.String("feed_url", feed.FeedURL),
)
} else {
slog.Debug("Cannot find search and replace terms for replace rule",
slog.String("original_entry_url", entry.URL),
slog.String("rewritten_entry_url", rewrittenURL),
slog.Int64("feed_id", feed.ID),
slog.String("feed_url", feed.FeedURL),
slog.String("url_rewrite_rules", feed.UrlRewriteRules),
)
} }
return rewrittenURL return rewrittenURL