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

Rename internal url package to avoid overlap with net/url

Browse source
This commit is contained in:
Frédéric Guillot 2023-08-13 19:09:01 -07:00
parent 9f465fd70d
commit e5d9f2f5a0
23 changed files with 74 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/reader/subscription/finder.go
View file

@ -14,7 +14,7 @@ import (
"miniflux.app/v2/internal/http/client"
"miniflux.app/v2/internal/reader/browser"
"miniflux.app/v2/internal/reader/parser"
"miniflux.app/v2/internal/url"
"miniflux.app/v2/internal/urllib"
"github.com/PuerkitoBio/goquery"
)
@ -90,7 +90,7 @@ func parseWebPage(websiteURL string, data io.Reader) (Subscriptions, *errors.Loc
if feedURL, exists := s.Attr("href"); exists {
if feedURL != "" {
subscription.URL, _ = url.AbsoluteURL(websiteURL, feedURL)
subscription.URL, _ = urllib.AbsoluteURL(websiteURL, feedURL)
}
}
@ -149,20 +149,20 @@ func tryWellKnownUrls(websiteURL, userAgent, cookie, username, password string)
"rss/": "rss",
}
websiteURLRoot := url.RootURL(websiteURL)
websiteURLRoot := urllib.RootURL(websiteURL)
baseURLs := []string{
// Look for knownURLs in the root.
websiteURLRoot,
}
// Look for knownURLs in current subdirectory, such as 'example.com/blog/'.
websiteURL, _ = url.AbsoluteURL(websiteURL, "./")
websiteURL, _ = urllib.AbsoluteURL(websiteURL, "./")
if websiteURL != websiteURLRoot {
baseURLs = append(baseURLs, websiteURL)
}
for _, baseURL := range baseURLs {
for knownURL, kind := range knownURLs {
fullURL, err := url.AbsoluteURL(baseURL, knownURL)
fullURL, err := urllib.AbsoluteURL(baseURL, knownURL)
if err != nil {
continue
}