From 248eb7d28ff1ec72252a566e9f00f6d27c69c910 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 13 Mar 2024 20:13:59 -0700 Subject: [PATCH] Rename databaseFilePath to just databasePath. Add a missing try?. --- Account/Sources/Account/Account.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Account/Sources/Account/Account.swift b/Account/Sources/Account/Account.swift index 83cf57bc0..da220aa56 100644 --- a/Account/Sources/Account/Account.swift +++ b/Account/Sources/Account/Account.swift @@ -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()