Rename databaseFilePath to just databasePath. Add a missing try?.
This commit is contained in:
parent
9b1aa8fc7f
commit
248eb7d28f
|
@ -286,9 +286,9 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
|
||||||
self.type = type
|
self.type = type
|
||||||
self.dataFolder = dataFolder
|
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
|
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 {
|
switch type {
|
||||||
case .onMyMac:
|
case .onMyMac:
|
||||||
|
@ -322,7 +322,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
|
||||||
opmlFile.load()
|
opmlFile.load()
|
||||||
|
|
||||||
Task {
|
Task {
|
||||||
await self.database.cleanupDatabaseAtStartup(subscribedToFeedIDs: self.flattenedFeeds().feedIDs())
|
try? await self.database.cleanupDatabaseAtStartup(subscribedToFeedIDs: self.flattenedFeeds().feedIDs())
|
||||||
|
|
||||||
Task { @MainActor in
|
Task { @MainActor in
|
||||||
self.fetchAllUnreadCounts()
|
self.fetchAllUnreadCounts()
|
||||||
|
|
Loading…
Reference in New Issue