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

Delete SyncDatabase.resetSelectedForProcessing.

This commit is contained in:
Brent Simmons 2024-03-25 21:18:27 -07:00
parent 27d27cbf1a
commit 4385b2d6b7
3 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift
View File

@ -148,15 +148,13 @@ private extension CloudKitSendStatusOperation {
Task { @MainActor in Task { @MainActor in
articlesZone.modifyArticles(statusUpdates) { result in articlesZone.modifyArticles(statusUpdates) { result in
Task { @MainActor in
switch result { switch result {
case .success: case .success:
Task { @MainActor in
try? await self.database.deleteSelectedForProcessing(statusUpdates.map({ $0.articleID })) try? await self.database.deleteSelectedForProcessing(statusUpdates.map({ $0.articleID }))
done(false) done(false)
}
case .failure(let error): case .failure(let error):
self.database.resetSelectedForProcessing(syncStatuses.map({ $0.articleID })) { _ in try? await self.database.resetSelectedForProcessing(syncStatuses.map({ $0.articleID }))
MainActor.assumeIsolated {
self.processAccountError(account, error) self.processAccountError(account, error)
os_log(.error, log: self.log, "Send article status modify articles error: %@.", error.localizedDescription) os_log(.error, log: self.log, "Send article status modify articles error: %@.", error.localizedDescription)
completion(true) completion(true)
@ -166,13 +164,13 @@ private extension CloudKitSendStatusOperation {
} }
} }
} }
}
switch result { switch result {
case .success(let articles): case .success(let articles):
processWithArticles(articles) processWithArticles(articles)
case .failure(let databaseError): case .failure(let databaseError):
self.database.resetSelectedForProcessing(syncStatuses.map({ $0.articleID })) { _ in Task { @MainActor in
try? await self.database.resetSelectedForProcessing(syncStatuses.map({ $0.articleID }))
os_log(.error, log: self.log, "Send article status fetch articles error: %@.", databaseError.localizedDescription) os_log(.error, log: self.log, "Send article status fetch articles error: %@.", databaseError.localizedDescription)
completion(true) completion(true)
} }

6
Account/Sources/Account/Feedly/Operations/FeedlySendArticleStatusesOperation.swift
View File

@ -68,15 +68,13 @@ private extension FeedlySendArticleStatusesOperation {
let database = self.database let database = self.database
group.enter() group.enter()
service.mark(ids, as: pairing.action) { result in service.mark(ids, as: pairing.action) { result in
assert(Thread.isMainThread) Task { @MainActor in
switch result { switch result {
case .success: case .success:
Task { @MainActor in
try? await database.deleteSelectedForProcessing(Array(ids)) try? await database.deleteSelectedForProcessing(Array(ids))
group.leave() group.leave()
}
case .failure: case .failure:
database.resetSelectedForProcessing(Array(ids)) { _ in try? await database.resetSelectedForProcessing(Array(ids))
group.leave() group.leave()
} }
} }

12
SyncDatabase/Sources/SyncDatabase/SyncDatabase.swift
View File

@ -206,18 +206,6 @@ public extension SyncDatabase {
} }
} }
} }
nonisolated func resetSelectedForProcessing(_ articleIDs: [String], completion: DatabaseCompletionBlock? = nil) {
Task { @MainActor in
do {
try await self.resetSelectedForProcessing(articleIDs)
completion?(nil)
} catch {
completion?(DatabaseError.suspended)
}
}
}
} }
private extension SyncDatabase { private extension SyncDatabase {