FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename databaseFilePath to just databasePath. Add a missing try?.

This commit is contained in:
Brent Simmons 2024-03-13 20:13:59 -07:00
parent 9b1aa8fc7f
commit 248eb7d28f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Account/Sources/Account/Account.swift
View File

@ -286,9 +286,9 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
self.type = type
self.dataFolder = dataFolder
let databaseFilePath = (dataFolder as NSString).appendingPathComponent("DB.sqlite3")
let databasePath = (dataFolder as NSString).appendingPathComponent("DB.sqlite3")
let retentionStyle: ArticlesDatabase.RetentionStyle = (type == .onMyMac || type == .cloudKit) ? .feedBased : .syncSystem
self.database = ArticlesDatabase(databaseFilePath: databaseFilePath, accountID: accountID, retentionStyle: retentionStyle)
self.database = ArticlesDatabase(databasePath: databasePath, accountID: accountID, retentionStyle: retentionStyle)
switch type {
case .onMyMac:
@ -322,7 +322,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
opmlFile.load()
Task {
await self.database.cleanupDatabaseAtStartup(subscribedToFeedIDs: self.flattenedFeeds().feedIDs())
try? await self.database.cleanupDatabaseAtStartup(subscribedToFeedIDs: self.flattenedFeeds().feedIDs())
Task { @MainActor in
self.fetchAllUnreadCounts()