FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make further progress on FaviconDownloader.

This commit is contained in:
Brent Simmons 2017-11-20 13:29:20 -08:00
parent 91895d4066
commit 00f7b817a7
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Evergreen/Favicons/FaviconDownloader.swift
View File

@ -22,6 +22,7 @@ final class FaviconDownloader {
private var faviconURLCache = ThreadSafeCache<String>() // homePageURL: faviconURL private var faviconURLCache = ThreadSafeCache<String>() // homePageURL: faviconURL
private let folder: String private let folder: String
private var urlsBeingDownloaded = Set<String>() private var urlsBeingDownloaded = Set<String>()
private var badURLs = Set<String>() // URLs that didn’t work for some reason; don’t try again
private let binaryCache: RSBinaryCache private let binaryCache: RSBinaryCache
private var badImages = Set<String>() // keys for images on disk that NSImage can’t handle private var badImages = Set<String>() // keys for images on disk that NSImage can’t handle
private let queue: DispatchQueue private let queue: DispatchQueue
@ -45,15 +46,36 @@ final class FaviconDownloader {
assert(Thread.isMainThread) assert(Thread.isMainThread)
guard let homePageURL = feed.homePageURL else {
return nil
}
if let faviconURL = faviconURL(for: feed) { if let faviconURL = faviconURL(for: feed) {
if let cachedFavicon = cache[faviconURL] { if let cachedFavicon = cache[faviconURL] {
return cachedFavicon return cachedFavicon
} }
// TODO: read from disk and return if present.
if shouldDownloadFaviconURL(faviconURL) { if shouldDownloadFaviconURL(faviconURL) {
downloadFavicon(faviconURL) downloadFavicon(faviconURL, homePageURL)
return nil return nil
} }
return nil
}
// Try to find the faviconURL. It might be in the web page.
FaviconURLFinder.findFaviconURL(homePageURL) { (faviconURL) in
if let faviconURL = faviconURL {
print(faviconURL) // cache it; then download favicon
}
else {
// Try appending /favicon.ico
// It often works.
}
} }
return nil return nil
@ -64,10 +86,10 @@ private extension FaviconDownloader {
func shouldDownloadFaviconURL(_ faviconURL: String) -> Bool { func shouldDownloadFaviconURL(_ faviconURL: String) -> Bool {
return !urlsBeingDownloaded.contains(faviconURL) return !urlsBeingDownloaded.contains(faviconURL) && !badURLs.contains(faviconURL)
} }
func downloadFavicon(_ faviconURL: String) { func downloadFavicon(_ faviconURL: String, _ homePageURL: String) {
guard let url = URL(string: faviconURL) else { guard let url = URL(string: faviconURL) else {
return return
@ -78,6 +100,10 @@ private extension FaviconDownloader {
download(url) { (data, response, error) in download(url) { (data, response, error) in
self.urlsBeingDownloaded.remove(faviconURL) self.urlsBeingDownloaded.remove(faviconURL)
if response == nil || !response!.statusIsOK {
self.badURLs.insert(faviconURL)
}
if let data = data { if let data = data {
self.queue.async { self.queue.async {
let _ = NSImage(data: data) let _ = NSImage(data: data)