From 830db84c567cb1a4b3f1db9c130b75c41c8b5d6e Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Sat, 1 Feb 2020 01:09:36 -0600 Subject: [PATCH] Explicitly import CoreServices For UTType stuff; iOS doesn't implicitly import it. --- Shared/Favicons/FaviconDownloader.swift | 1 + Shared/Favicons/FaviconURLFinder.swift | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Shared/Favicons/FaviconDownloader.swift b/Shared/Favicons/FaviconDownloader.swift index 655e20989..aeb42f960 100644 --- a/Shared/Favicons/FaviconDownloader.swift +++ b/Shared/Favicons/FaviconDownloader.swift @@ -7,6 +7,7 @@ // import Foundation +import CoreServices import Articles import Account import RSCore diff --git a/Shared/Favicons/FaviconURLFinder.swift b/Shared/Favicons/FaviconURLFinder.swift index b1183f930..0f80b44d8 100644 --- a/Shared/Favicons/FaviconURLFinder.swift +++ b/Shared/Favicons/FaviconURLFinder.swift @@ -7,6 +7,7 @@ // import Foundation +import CoreServices import RSParser // The favicon URLs may be specified in the head section of the home page. @@ -48,19 +49,19 @@ struct FaviconURLFinder { // If the favicon has an explicit type, check that for an ignored type; otherwise, check the file extension. HTMLMetadataDownloader.downloadMetadata(for: homePageURL) { (htmlMetadata) in - let faviconURLs = htmlMetadata?.faviconLinks.filter({ (faviconLink) -> Bool in - if faviconLink.type != nil { - if ignoredMimeTypes.contains(faviconLink.type) { + let faviconURLs = htmlMetadata?.favicons.filter({ (favicon) -> Bool in + if let type = favicon.type { + if ignoredMimeTypes.contains(type) { return false } } else { - if let url = URL(string: faviconLink.urlString!), ignoredExtensions.contains(url.pathExtension) { + if let url = URL(string: favicon.urlString), ignoredExtensions.contains(url.pathExtension) { return false } } return true - }).map { $0.urlString! } + }).map { $0.urlString } completion(faviconURLs) }