From 62d7fe34f15c7bf78700b0ff6162399032f1aca9 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 8 Nov 2019 12:20:21 -0600 Subject: [PATCH] Unify the cache deletion code between iOS and Mac now that the Mac uses the caches directory. --- Mac/AppDelegate.swift | 12 ++----- NetNewsWire.xcodeproj/project.pbxproj | 6 ++++ Shared/Data/CacheCleaner.swift | 46 +++++++++++++++++++++++++++ iOS/AppDelegate.swift | 22 +------------ 4 files changed, 55 insertions(+), 31 deletions(-) create mode 100644 Shared/Data/CacheCleaner.swift diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index e5a678c01..999d91653 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -163,6 +163,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, } } + CacheCleaner.purgeIfNecessary() + // Try to establish a cache in the Caches folder, but if it fails for some reason fall back to a temporary dir let cacheFolder: String if let userCacheFolder = try? FileManager.default.url(for: .cachesDirectory, in: .userDomainMask, appropriateFor: nil, create: false).path { @@ -173,16 +175,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, cacheFolder = (NSTemporaryDirectory() as NSString).appendingPathComponent(bundleIdentifier) } - // 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 let reachability = try? Reachability(hostname: "apple.com") { - if reachability.connection != .unavailable { - try? FileManager.default.removeItem(atPath: cacheFolder) - AppDefaults.lastImageCacheFlushDate = Date() - } - } - } - let faviconsFolder = (cacheFolder as NSString).appendingPathComponent("Favicons") let faviconsFolderURL = URL(fileURLWithPath: faviconsFolder) try! FileManager.default.createDirectory(at: faviconsFolderURL, withIntermediateDirectories: true, attributes: nil) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 16b095c97..4f4f5439d 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXBuildFile section */ 49F40DF82335B71000552BF4 /* newsfoot.js in Resources */ = {isa = PBXBuildFile; fileRef = 49F40DEF2335B71000552BF4 /* newsfoot.js */; }; 49F40DF92335B71000552BF4 /* newsfoot.js in Resources */ = {isa = PBXBuildFile; fileRef = 49F40DEF2335B71000552BF4 /* newsfoot.js */; }; + 5108F6B62375E612001ABC45 /* CacheCleaner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5108F6B52375E612001ABC45 /* CacheCleaner.swift */; }; + 5108F6B72375E612001ABC45 /* CacheCleaner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5108F6B52375E612001ABC45 /* CacheCleaner.swift */; }; 51102165233A7D6C0007A5F7 /* ArticleExtractorButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51102164233A7D6C0007A5F7 /* ArticleExtractorButton.swift */; }; 5110C37D2373A8D100A9C04F /* InspectorIconHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5110C37C2373A8D100A9C04F /* InspectorIconHeaderView.swift */; }; 51126DA4225FDE2F00722696 /* RSImage-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51126DA3225FDE2F00722696 /* RSImage-Extensions.swift */; }; @@ -1201,6 +1203,7 @@ /* Begin PBXFileReference section */ 49F40DEF2335B71000552BF4 /* newsfoot.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = newsfoot.js; sourceTree = ""; }; + 5108F6B52375E612001ABC45 /* CacheCleaner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CacheCleaner.swift; sourceTree = ""; }; 51102164233A7D6C0007A5F7 /* ArticleExtractorButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleExtractorButton.swift; sourceTree = ""; }; 5110C37C2373A8D100A9C04F /* InspectorIconHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorIconHeaderView.swift; sourceTree = ""; }; 51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = NetNewsWire_iOSapp_target.xcconfig; sourceTree = ""; }; @@ -2200,6 +2203,7 @@ 849A97731ED9EC04007D329B /* ArticleStringFormatter.swift */, 849A97581ED9EB0D007D329B /* ArticleUtilities.swift */, 84411E701FE5FBFA004B527F /* SmallIconProvider.swift */, + 5108F6B52375E612001ABC45 /* CacheCleaner.swift */, ); path = Data; sourceTree = ""; @@ -3974,6 +3978,7 @@ 51C452882265093600C03939 /* AddFeedViewController.swift in Sources */, 51A169A0235E10D700EB091F /* FeedbinAccountViewController.swift in Sources */, 51934CCE2310792F006127BE /* ActivityManager.swift in Sources */, + 5108F6B72375E612001ABC45 /* CacheCleaner.swift in Sources */, 518651DA235621840078E021 /* ImageTransition.swift in Sources */, 514219372352510100E07E2C /* ImageScrollView.swift in Sources */, 51A16997235E10D700EB091F /* RefreshIntervalViewController.swift in Sources */, @@ -4088,6 +4093,7 @@ 848F6AE51FC29CFB002D422E /* FaviconDownloader.swift in Sources */, 84C9FC7722629E1200D921D6 /* AdvancedPreferencesViewController.swift in Sources */, 849EE72120391F560082A1EA /* SharingServicePickerDelegate.swift in Sources */, + 5108F6B62375E612001ABC45 /* CacheCleaner.swift in Sources */, 849A97981ED9EFAA007D329B /* Node-Extensions.swift in Sources */, 849EE70F203919360082A1EA /* AppAssets.swift in Sources */, 849A97531ED9EAC0007D329B /* AddFeedController.swift in Sources */, diff --git a/Shared/Data/CacheCleaner.swift b/Shared/Data/CacheCleaner.swift new file mode 100644 index 000000000..748f13aa9 --- /dev/null +++ b/Shared/Data/CacheCleaner.swift @@ -0,0 +1,46 @@ +// +// CacheCleaner.swift +// NetNewsWire +// +// Created by Maurice Parker on 11/8/19. +// Copyright © 2019 Ranchero Software. All rights reserved. +// + +import Foundation +import os.log + +struct CacheCleaner { + + static let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CacheCleaner") + + static func purgeIfNecessary() { + + // 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 let reachability = try? Reachability(hostname: "apple.com") { + if reachability.connection != .unavailable { + + let tempDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first! + let faviconsFolderURL = tempDir.appendingPathComponent("Favicons") + let imagesFolderURL = tempDir.appendingPathComponent("Images") + let homePageToIconURL = tempDir.appendingPathComponent("HomePageToIconURLCache.plist") + let homePagesWithNoIconURL = tempDir.appendingPathComponent("HomePagesWithNoIconURLCache.plist") + + for tempItem in [faviconsFolderURL, imagesFolderURL, homePageToIconURL, homePagesWithNoIconURL] { + do { + os_log(.info, log: self.log, "Removing cache file: %@", tempItem.absoluteString) + try FileManager.default.removeItem(at: tempItem) + } catch { + os_log(.error, log: self.log, "Could not delete cache file: %@", error.localizedDescription) + } + } + + AppDefaults.lastImageCacheFlushDate = Date() + + } + } + } + + } + +} diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift index f75dc0880..58c741ea4 100644 --- a/iOS/AppDelegate.swift +++ b/iOS/AppDelegate.swift @@ -77,6 +77,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } registerBackgroundTasks() + CacheCleaner.purgeIfNecessary() initializeDownloaders() initializeHomeScreenQuickActions() @@ -176,27 +177,6 @@ private extension AppDelegate { let tempDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first! let faviconsFolderURL = tempDir.appendingPathComponent("Favicons") let imagesFolderURL = tempDir.appendingPathComponent("Images") - let homePageToIconURL = tempDir.appendingPathComponent("HomePageToIconURLCache.plist") - let homePagesWithNoIconURL = tempDir.appendingPathComponent("HomePagesWithNoIconURLCache.plist") - let homePageToFaviconURL = tempDir.appendingPathComponent("HomePageToFaviconURLCache.plist") - let homePageURLsWithNoFaviconURL = tempDir.appendingPathComponent("HomePageURLsWithNoFaviconURLCache.plist") - - // 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 let reachability = try? Reachability(hostname: "apple.com") { - if reachability.connection != .unavailable { - for tempItem in [faviconsFolderURL, imagesFolderURL, homePageToIconURL, homePagesWithNoIconURL, homePageToFaviconURL, homePageURLsWithNoFaviconURL] { - do { - os_log(.info, log: self.log, "Removing cache file: %@", tempItem.absoluteString) - try FileManager.default.removeItem(at: tempItem) - } catch { - os_log(.error, log: self.log, "Could not delete cache file: %@", error.localizedDescription) - } - } - AppDefaults.lastImageCacheFlushDate = Date() - } - } - } try! FileManager.default.createDirectory(at: faviconsFolderURL, withIntermediateDirectories: true, attributes: nil) let faviconsFolder = faviconsFolderURL.absoluteString