FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalize homePageURL in FaviconDownloader — this avoids doing duplicate work for http://foo.com/ and http://foo.com — they’re both treated as http://foo.com/

Browse Source
This commit is contained in:
Brent Simmons 2017-11-25 16:11:24 -08:00
parent 61c429d45c
commit ba638ecda1
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Evergreen/Favicons/FaviconDownloader.swift
View File

@ -61,7 +61,7 @@ final class FaviconDownloader {
func favicon(withHomePageURL homePageURL: String) -> NSImage? {
guard let seekingFavicon = seekingFavicon(with: homePageURL) else {
guard let seekingFavicon = seekingFavicon(with: normalizedHomePageURL(homePageURL)) else {
return nil
}
return favicon(withSeekingFavicon: seekingFavicon)
@ -92,6 +92,26 @@ final class FaviconDownloader {
private extension FaviconDownloader {
private static let localeForLowercasing = Locale(identifier: "en_US")
func normalizedHomePageURL(_ url: String) -> String {
// Many times the homePageURL is missing a trailing /.
// We add one when needed.
guard !url.hasSuffix("/") else {
return url
}
let lowercasedURL = url.lowercased(with: FaviconDownloader.localeForLowercasing)
guard lowercasedURL.hasPrefix("http://") || lowercasedURL.hasPrefix("https://") else {
return url
}
guard url.components(separatedBy: "/").count < 4 else {
return url
}
return url + "/"
}
@discardableResult
func favicon(withSeekingFavicon seekingFavicon: SeekingFavicon) -> NSImage? {