From 0a08faf02abcb1bc104b265855b48f608d425152 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 9 Sep 2018 12:42:39 -0700 Subject: [PATCH] =?UTF-8?q?Remove=20normalizedHomePageURL=20now=20that=20i?= =?UTF-8?q?t=E2=80=99s=20part=20of=20standard=20URL=20normalizing.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NetNewsWire/Favicons/FaviconDownloader.swift | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/NetNewsWire/Favicons/FaviconDownloader.swift b/NetNewsWire/Favicons/FaviconDownloader.swift index 3a820003a..454f2b374 100644 --- a/NetNewsWire/Favicons/FaviconDownloader.swift +++ b/NetNewsWire/Favicons/FaviconDownloader.swift @@ -70,7 +70,7 @@ final class FaviconDownloader { func favicon(withHomePageURL homePageURL: String) -> NSImage? { - let url = normalizedHomePageURL(homePageURL) + let url = homePageURL.rs_normalizedURL() if homePageURLsWithNoFaviconURL.contains(url) { return nil } @@ -135,24 +135,6 @@ private extension FaviconDownloader { } } - 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 + "/" - } - func faviconDownloader(withURL faviconURL: String) -> SingleFaviconDownloader { if let downloader = singleFaviconDownloaderCache[faviconURL] {