FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-19 13:00:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cache parsed metadata when finding a home page’s favicon URL. Also: do the parsing in the background, for performance reasons.

Browse Source
This commit is contained in:
Brent Simmons 2017-12-13 19:46:03 -08:00
parent b3ecf9cdba
commit db1db7b701
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Evergreen/Favicons/FaviconURLFinder.swift
View File

@ -9,11 +9,15 @@
import Foundation import Foundation
import RSParser import RSParser
import RSWeb import RSWeb
import RSCore
// The favicon URL may be specified in the head section of the home page. // The favicon URL may be specified in the head section of the home page.
struct FaviconURLFinder { struct FaviconURLFinder {
static var metadataCache = [String: RSHTMLMetadata]()
static let serialDispatchQueue = DispatchQueue(label: "FaviconURLFinder")
static func findFaviconURL(_ homePageURL: String, _ callback: @escaping (String?) -> Void) { static func findFaviconURL(_ homePageURL: String, _ callback: @escaping (String?) -> Void) {
guard let url = URL(string: homePageURL) else { guard let url = URL(string: homePageURL) else {
@ -36,16 +40,33 @@ struct FaviconURLFinder {
// will be made absolute correctly. // will be made absolute correctly.
let urlToUse = response.url?.absoluteString ?? homePageURL let urlToUse = response.url?.absoluteString ?? homePageURL
let link = faviconURL(urlToUse, data) faviconURL(urlToUse, data, callback)
callback(link)
} }
} }
static private func faviconURL(_ url: String, _ webPageData: Data) -> String? { static private func faviconURL(_ url: String, _ webPageData: Data, _ callback: @escaping (String?) -> Void) {
let parserData = ParserData(url: url, data: webPageData) serialDispatchQueue.async {
let htmlMetadata = RSHTMLMetadataParser.htmlMetadata(with: parserData)
return htmlMetadata.faviconLink let md5String = (webPageData as NSData).rs_md5HashString()
if let md5String = md5String, let cachedMetadata = metadataCache[md5String] {
let cachedURL = cachedMetadata.faviconLink
DispatchQueue.main.async {
callback(cachedURL)
}
return
}
let parserData = ParserData(url: url, data: webPageData)
let htmlMetadata = RSHTMLMetadataParser.htmlMetadata(with: parserData)
if let md5String = md5String {
metadataCache[md5String] = htmlMetadata
}
let url = htmlMetadata.faviconLink
DispatchQueue.main.async {
callback(url)
}
}
} }
} }