Skip to content

Change cache location to a subdirectory whose name matches the app bundle identifier #4544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zyoshoka wants to merge 1 commit into
base: detour2025
Choose a base branch
from
Open

Change cache location to a subdirectory whose name matches the app bundle identifier #4544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions Mac/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidat

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 {
cacheFolder = userCacheFolder
} else {
let bundleIdentifier = (Bundle.main.infoDictionary!["CFBundleIdentifier"]! as! String)
cacheFolder = (NSTemporaryDirectory() as NSString).appendingPathComponent(bundleIdentifier)
}

let imagesFolder = (cacheFolder as NSString).appendingPathComponent("Images")
let imagesFolderURL = URL(fileURLWithPath: imagesFolder)
let imagesFolderURL = AppConfig.cacheSubfolder(named: "Images")
try! FileManager.default.createDirectory(at: imagesFolderURL, withIntermediateDirectories: true, attributes: nil)
}

Expand Down
5 changes: 3 additions & 2 deletions Modules/RSCore/Sources/RSCore/AppConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ public final class AppConfig {
public static let cacheFolder: URL = {

let folderURL: URL
let bundleIdentifier = (Bundle.main.infoDictionary!["CFBundleIdentifier"]! as! String)

// Try to establish a cache in the Caches folder, but if it fails for some reason fall back to a temporary dir
if let userCacheFolder = try? FileManager.default.url(for: .cachesDirectory, in: .userDomainMask, appropriateFor: nil, create: true) {
folderURL = userCacheFolder
folderURL = userCacheFolder.appendingPathComponent(bundleIdentifier, isDirectory: true)
} else {
let bundleIdentifier = (Bundle.main.infoDictionary!["CFBundleIdentifier"]! as! String)
let tempFolder = (NSTemporaryDirectory() as NSString).appendingPathComponent(bundleIdentifier)
folderURL = URL(fileURLWithPath: tempFolder, isDirectory: true)
createFolderIfNecessary(folderURL)
Expand Down
14 changes: 6 additions & 8 deletions Shared/Extensions/CacheCleaner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,14 @@ struct CacheCleaner {
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 feedURLToIconURL = tempDir.appendingPathComponent("FeedURLToIconURLCache.plist")
let homePageToIconURL = tempDir.appendingPathComponent("HomePageToIconURLCache.plist")
let homePagesWithNoIconURL = tempDir.appendingPathComponent("HomePagesWithNoIconURLCache.plist")
.appendingPathComponent((Bundle.main.infoDictionary!["CFBundleIdentifier"]! as! String), isDirectory: true)

for tempItem in ["Favicons", "Images", "FeedIcons"] {
let tempPath = tempDir.appendingPathComponent(tempItem)

for tempItem in [faviconsFolderURL, imagesFolderURL, feedURLToIconURL, homePageToIconURL, homePagesWithNoIconURL] {
do {
os_log(.info, log: self.log, "Removing cache file: %@", tempItem.absoluteString)
try FileManager.default.removeItem(at: tempItem)
os_log(.info, log: self.log, "Removing cache file: %@", tempPath.absoluteString)
try FileManager.default.removeItem(at: tempPath)
} catch {
os_log(.error, log: self.log, "Could not delete cache file: %@", error.localizedDescription)
}
Expand Down