renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make AccountManager init itself, and use AccountManager.shared in AppDelegate.

Browse Source
This commit is contained in:
Brent Simmons
2024-07-07 16:23:47 -07:00
parent aa807249b9
commit c784569040
4 changed files with 68 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/Account/Sources/Account/AccountManager.swift
View File

@@ -11,6 +11,7 @@ import Web
import Articles
import ArticlesDatabase
import Database
import Core
@MainActor public final class AccountManager: UnreadCountProvider {
@@ -20,7 +21,11 @@ import Database
public let defaultAccount: Account
private let accountsFolder: String
private let accountsFolderURL: URL
private var accountsFolder: String {
accountsFolderURL.path
}
private var accountsDictionary = [String: Account]()
private let defaultAccountFolderName = "OnMyMac"
@@ -91,19 +96,12 @@ import Database
return CombinedRefreshProgress(downloadProgressArray: downloadProgressArray)
}
public init(accountsFolder: String) {
public init() {
self.accountsFolder = accountsFolder
self.accountsFolderURL = AppConfig.dataSubfolder(named: "Accounts")
// The local "On My Mac" account must always exist, even if it's empty.
let localAccountFolder = (accountsFolder as NSString).appendingPathComponent("OnMyMac")
do {
try FileManager.default.createDirectory(atPath: localAccountFolder, withIntermediateDirectories: true, attributes: nil)
}
catch {
assertionFailure("Could not create folder for OnMyMac account.")
abort()
}
let localAccountFolder = AppConfig.ensureSubfolder(named: "OnMyMac", folderURL: self.accountsFolderURL).path
defaultAccount = Account(dataFolder: localAccountFolder, type: .onMyMac, accountID: defaultAccountIdentifier)
accountsDictionary[defaultAccount.accountID] = defaultAccount

30
Modules/Core/Sources/Core/AppConfig.swift
View File

@@ -22,7 +22,7 @@ public final class AppConfig {
let bundleIdentifier = (Bundle.main.infoDictionary!["CFBundleIdentifier"]! as! String)
let tempFolder = (NSTemporaryDirectory() as NSString).appendingPathComponent(bundleIdentifier)
folderURL = URL(fileURLWithPath: tempFolder, isDirectory: true)
try! FileManager.default.createDirectory(at: folderURL, withIntermediateDirectories: true, attributes: nil)
createFolderIfNecessary(folderURL)
}
return folderURL
@@ -30,36 +30,38 @@ public final class AppConfig {
/// Returns URL to subfolder in cache folder (creating the folder if it doesn’t exist)
public static func cacheSubfolder(named name: String) -> URL {
subfolder(name, in: cacheFolder)
ensureSubfolder(named: name, folderURL: cacheFolder)
}
public static let dataFolder: URL = {
#if os(macOS)
var dataFolder = try! FileManager.default.url(for: .applicationSupportDirectory, in: .userDomainMask, appropriateFor: nil, create: false)
var dataFolder = try! FileManager.default.url(for: .applicationSupportDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
dataFolder = dataFolder.appendingPathComponent(appName)
try! FileManager.default.createDirectory(at: dataFolder, withIntermediateDirectories: true, attributes: nil)
return dataFolder
#elseif os(iOS)
FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
var dataFolder = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
#endif
createFolderIfNecessary(dataFolder)
return dataFolder
}()
/// Returns URL to subfolder in data folder (creating the folder if it doesn’t exist)
public static func dataSubfolder(named name: String) -> URL {
subfolder(name, in: dataFolder)
ensureSubfolder(named: name, folderURL: dataFolder)
}
public static func ensureSubfolder(named name: String, folderURL: URL) -> URL {
let folder = folderURL.appendingPathComponent(name, isDirectory: true)
createFolderIfNecessary(folder)
return folder
}
}
private extension AppConfig {
static func subfolder(_ name: String, in folderURL: URL) -> URL {
let folder = folderURL.appendingPathComponent(name, isDirectory: true)
try! FileManager.default.createDirectory(at: folder, withIntermediateDirectories: true, attributes: nil)
return folder
static func createFolderIfNecessary(_ folderURL: URL) {
try! FileManager.default.createDirectory(at: folderURL, withIntermediateDirectories: true, attributes: nil)
}
}