From b4ff1785ab167b8756f9914d8a6ab7d705168bc1 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Thu, 23 Nov 2017 10:29:00 -0800 Subject: [PATCH] Switch from download to downloadUsingCache where appropriate. --- Evergreen/Favicons/FaviconDownloader.swift | 2 +- Evergreen/Favicons/FaviconURLFinder.swift | 2 +- Evergreen/MainWindow/AddFeed/FeedTitleDownloader.swift | 2 +- Frameworks/RSFeedFinder/RSFeedFinder/FeedFinder.swift | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Evergreen/Favicons/FaviconDownloader.swift b/Evergreen/Favicons/FaviconDownloader.swift index 00b699045..6009e5861 100644 --- a/Evergreen/Favicons/FaviconDownloader.swift +++ b/Evergreen/Favicons/FaviconDownloader.swift @@ -97,7 +97,7 @@ private extension FaviconDownloader { urlsBeingDownloaded.insert(faviconURL) - download(url) { (data, response, error) in + downloadUsingCache(url) { (data, response, error) in self.urlsBeingDownloaded.remove(faviconURL) if response == nil || !response!.statusIsOK { diff --git a/Evergreen/Favicons/FaviconURLFinder.swift b/Evergreen/Favicons/FaviconURLFinder.swift index 36511637e..5f9b30bcd 100644 --- a/Evergreen/Favicons/FaviconURLFinder.swift +++ b/Evergreen/Favicons/FaviconURLFinder.swift @@ -21,7 +21,7 @@ struct FaviconURLFinder { return } - download(url) { (data, response, error) in + downloadUsingCache(url) { (data, response, error) in guard let data = data, let response = response, response.statusIsOK else { callback(nil) diff --git a/Evergreen/MainWindow/AddFeed/FeedTitleDownloader.swift b/Evergreen/MainWindow/AddFeed/FeedTitleDownloader.swift index b3280b65e..720099aa4 100644 --- a/Evergreen/MainWindow/AddFeed/FeedTitleDownloader.swift +++ b/Evergreen/MainWindow/AddFeed/FeedTitleDownloader.swift @@ -12,7 +12,7 @@ import RSWeb func downloadTitleForFeed(_ url: URL, _ completionHandler: @escaping (_ title: String?) -> ()) { - download(url) { (data, response, error) in + downloadUsingCache(url) { (data, response, error) in guard let data = data else { completionHandler(nil) diff --git a/Frameworks/RSFeedFinder/RSFeedFinder/FeedFinder.swift b/Frameworks/RSFeedFinder/RSFeedFinder/FeedFinder.swift index a1c8a9681..b93d45fbf 100644 --- a/Frameworks/RSFeedFinder/RSFeedFinder/FeedFinder.swift +++ b/Frameworks/RSFeedFinder/RSFeedFinder/FeedFinder.swift @@ -124,7 +124,7 @@ private extension FeedFinder { func downloadInitialFeed(_ initialURL: URL) { - download(initialURL) { (data, response, error) in + downloadUsingCache(initialURL) { (data, response, error) in self.initialDownloadStatusCode = response?.forcedStatusCode ?? -1 @@ -170,7 +170,7 @@ private extension FeedFinder { continue } - download(url) { (data, response, error) in + downloadUsingCache(url) { (data, response, error) in pendingDownloads.remove(oneFeedSpecifier)