Delete SyncDatabase.resetSelectedForProcessing.
This commit is contained in:
parent
27d27cbf1a
commit
4385b2d6b7
|
@ -148,31 +148,29 @@ private extension CloudKitSendStatusOperation {
|
||||||
|
|
||||||
Task { @MainActor in
|
Task { @MainActor in
|
||||||
articlesZone.modifyArticles(statusUpdates) { result in
|
articlesZone.modifyArticles(statusUpdates) { result in
|
||||||
switch result {
|
Task { @MainActor in
|
||||||
case .success:
|
switch result {
|
||||||
Task { @MainActor in
|
case .success:
|
||||||
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):
|
try? await self.database.resetSelectedForProcessing(syncStatuses.map({ $0.articleID }))
|
||||||
self.database.resetSelectedForProcessing(syncStatuses.map({ $0.articleID })) { _ in
|
self.processAccountError(account, error)
|
||||||
MainActor.assumeIsolated {
|
os_log(.error, log: self.log, "Send article status modify articles error: %@.", error.localizedDescription)
|
||||||
self.processAccountError(account, error)
|
completion(true)
|
||||||
os_log(.error, log: self.log, "Send article status modify articles error: %@.", error.localizedDescription)
|
|
||||||
completion(true)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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)
|
||||||
}
|
}
|
||||||
|
|
|
@ -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:
|
try? await database.resetSelectedForProcessing(Array(ids))
|
||||||
database.resetSelectedForProcessing(Array(ids)) { _ in
|
|
||||||
group.leave()
|
group.leave()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
Loading…
Reference in New Issue