From 0d128c0c3c2b709db4f0f0083eda6ee535dbe09b Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Sat, 1 Feb 2020 19:19:33 -0600 Subject: [PATCH 1/3] Fix spacing --- Shared/Favicons/FaviconURLFinder.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shared/Favicons/FaviconURLFinder.swift b/Shared/Favicons/FaviconURLFinder.swift index 0f80b44d8..5dcbfab0d 100644 --- a/Shared/Favicons/FaviconURLFinder.swift +++ b/Shared/Favicons/FaviconURLFinder.swift @@ -40,7 +40,7 @@ struct FaviconURLFinder { /// - homePageURL: The page to search. /// - completion: A closure called when the links have been found. /// - urls: An array of favicon URLs as strings. - static func findFaviconURLs(with homePageURL: String, _ completion: @escaping (_ urls:[String]?) -> Void) { + static func findFaviconURLs(with homePageURL: String, _ completion: @escaping (_ urls: [String]?) -> Void) { guard let _ = URL(string: homePageURL) else { completion(nil) From ba6315fa070e921225a9eff5d10fd8e6506a2009 Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Sun, 2 Feb 2020 17:55:51 -0600 Subject: [PATCH 2/3] Set lastImageCacheFlushDate on launch in CacheCleaner instead of registerDefaults() So it's actually persisted to disk. --- Mac/AppDefaults.swift | 3 +-- Shared/Data/CacheCleaner.swift | 7 ++++++- iOS/AppDefaults.swift | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Mac/AppDefaults.swift b/Mac/AppDefaults.swift index 44219001f..a138fea4b 100644 --- a/Mac/AppDefaults.swift +++ b/Mac/AppDefaults.swift @@ -226,8 +226,7 @@ struct AppDefaults { let showDebugMenu = false #endif - let defaults: [String : Any] = [Key.lastImageCacheFlushDate: Date(), - Key.sidebarFontSize: FontSize.medium.rawValue, + let defaults: [String : Any] = [Key.sidebarFontSize: FontSize.medium.rawValue, Key.timelineFontSize: FontSize.medium.rawValue, Key.detailFontSize: FontSize.medium.rawValue, Key.timelineSortDirection: ComparisonResult.orderedDescending.rawValue, diff --git a/Shared/Data/CacheCleaner.swift b/Shared/Data/CacheCleaner.swift index 748f13aa9..949a7eb2e 100644 --- a/Shared/Data/CacheCleaner.swift +++ b/Shared/Data/CacheCleaner.swift @@ -14,9 +14,14 @@ struct CacheCleaner { static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CacheCleaner") static func purgeIfNecessary() { + + guard let flushDate = AppDefaults.lastImageCacheFlushDate else { + AppDefaults.lastImageCacheFlushDate = Date() + return + } // If the image disk cache hasn't been flushed for 3 days and the network is available, delete it - if let flushDate = AppDefaults.lastImageCacheFlushDate, flushDate.addingTimeInterval(3600*24*3) < Date() { + if flushDate.addingTimeInterval(3600*24*3) < Date() { if let reachability = try? Reachability(hostname: "apple.com") { if reachability.connection != .unavailable { diff --git a/iOS/AppDefaults.swift b/iOS/AppDefaults.swift index 21e636d05..da607f6ec 100644 --- a/iOS/AppDefaults.swift +++ b/iOS/AppDefaults.swift @@ -150,8 +150,7 @@ struct AppDefaults { } static func registerDefaults() { - let defaults: [String : Any] = [Key.lastImageCacheFlushDate: Date(), - Key.timelineGroupByFeed: false, + let defaults: [String : Any] = [Key.timelineGroupByFeed: false, Key.refreshClearsReadArticles: false, Key.timelineNumberOfLines: 2, Key.timelineIconSize: IconSize.medium.rawValue, From ede4813a1a2900645f7af99e3ec8d41b43e81d22 Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Sun, 2 Feb 2020 18:00:58 -0600 Subject: [PATCH 3/3] Operator spacing --- Shared/Data/CacheCleaner.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shared/Data/CacheCleaner.swift b/Shared/Data/CacheCleaner.swift index 949a7eb2e..9f36787cd 100644 --- a/Shared/Data/CacheCleaner.swift +++ b/Shared/Data/CacheCleaner.swift @@ -21,7 +21,7 @@ struct CacheCleaner { } // If the image disk cache hasn't been flushed for 3 days and the network is available, delete it - if flushDate.addingTimeInterval(3600*24*3) < Date() { + if flushDate.addingTimeInterval(3600 * 24 * 3) < Date() { if let reachability = try? Reachability(hostname: "apple.com") { if reachability.connection != .unavailable {