FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop processing the send status records if we don't have anymore in a valid state yet.

Browse Source
This commit is contained in:
Maurice Parker 2020-12-16 10:26:25 -06:00
parent 25a9731996
commit d40d695d69
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,31 +73,37 @@ private extension CloudKitSendStatusOperation {
switch result {
case .success(let syncStatuses):
guard syncStatuses.count > 0 else {
func stopProcessing() {
if self.showProgress {
self.refreshProgress?.completeTask()
}
os_log(.debug, log: self.log, "Done sending article statuses.")
self.operationDelegate?.operationDidComplete(self)
}
guard syncStatuses.count > 0 else {
stopProcessing()
return
}
self.processStatuses(syncStatuses) {
self.selectForProcessing()
self.processStatuses(syncStatuses) { stop in
if stop {
stopProcessing()
} else {
self.selectForProcessing()
}
}
case .failure(let databaseError):
os_log(.error, log: self.log, "Send status error: %@.", databaseError.localizedDescription)
self.operationDelegate?.cancelOperation(self)
}
}
}
func processStatuses(_ syncStatuses: [SyncStatus], completion: @escaping () -> Void) {
func processStatuses(_ syncStatuses: [SyncStatus], completion: @escaping (Bool) -> Void) {
guard let account = account, let articlesZone = articlesZone else {
completion()
completion(true)
return
}
@ -114,32 +120,34 @@ private extension CloudKitSendStatusOperation {
return CloudKitArticleStatusUpdate(articleID: key, statuses: value, article: articlesDict[key])
}
func done(_ stop: Bool) {
// Don't clear the last one since we might have had additional ticks added
if self.showProgress && self.refreshProgress?.numberRemaining ?? 0 > 1 {
self.refreshProgress?.completeTask()
}
os_log(.debug, log: self.log, "Done sending article status block...")
completion(stop)
}
// If this happens, we have somehow gotten into a state where we have new status records
// but the articles didn't come back in the fetch. Rather than crashing, we stop processing
// and hope that it gets cleared up later.
guard !statusUpdates.isEmpty else {
done(true)
return
}
articlesZone.modifyArticles(statusUpdates) { result in
switch result {
case .success:
func complete() {
// Don't clear the last one since we might have had additional ticks added
if self.showProgress && self.refreshProgress?.numberRemaining ?? 0 > 1 {
self.refreshProgress?.completeTask()
}
os_log(.debug, log: self.log, "Done sending article status block...")
completion()
self.database.deleteSelectedForProcessing(statusUpdates.map({ $0.articleID })) { _ in
done(false)
}
if statusUpdates.isEmpty {
complete()
} else {
self.database.deleteSelectedForProcessing(statusUpdates.map({ $0.articleID })) { _ in
complete()
}
}
case .failure(let error):
self.database.resetSelectedForProcessing(syncStatuses.map({ $0.articleID })) { _ in
self.processAccountError(account, error)
os_log(.error, log: self.log, "Send article status modify articles error: %@.", error.localizedDescription)
completion()
completion(true)
}
}
}
@ -152,7 +160,7 @@ private extension CloudKitSendStatusOperation {
case .failure(let databaseError):
self.database.resetSelectedForProcessing(syncStatuses.map({ $0.articleID })) { _ in
os_log(.error, log: self.log, "Send article status fetch articles error: %@.", databaseError.localizedDescription)
completion()
completion(true)
}
}