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

Remove initial send status since we do it at the end now

Browse Source
This commit is contained in:
Maurice Parker 2020-04-29 23:56:50 -05:00
parent d27b0cb2a0
commit c9ad5fe4c0
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift
View File

@ -573,7 +573,7 @@ private extension CloudKitAccountDelegate {
func standardRefreshAll(for account: Account, completion: @escaping (Result<Void, Error>) -> Void) { func standardRefreshAll(for account: Account, completion: @escaping (Result<Void, Error>) -> Void) {
let intialWebFeedsCount = account.flattenedWebFeeds().count let intialWebFeedsCount = account.flattenedWebFeeds().count
refreshProgress.addToNumberOfTasksAndRemaining(4 + intialWebFeedsCount) refreshProgress.addToNumberOfTasksAndRemaining(3 + intialWebFeedsCount)
func fail(_ error: Error) { func fail(_ error: Error) {
self.processAccountError(account, error) self.processAccountError(account, error)
@ -585,26 +585,18 @@ private extension CloudKitAccountDelegate {
switch result { switch result {
case .success: case .success:
self.refreshProgress.completeTask()
let webFeeds = account.flattenedWebFeeds() let webFeeds = account.flattenedWebFeeds()
self.refreshProgress.addToNumberOfTasksAndRemaining(webFeeds.count - intialWebFeedsCount) self.refreshProgress.addToNumberOfTasksAndRemaining(webFeeds.count - intialWebFeedsCount)
self.refreshProgress.completeTask()
self.sendArticleStatus(for: account) { result in
switch result {
case .success:
self.refreshProgress.completeTask()
self.refreshArticleStatus(for: account) { result in self.refreshArticleStatus(for: account) { result in
switch result { switch result {
case .success: case .success:
self.refreshProgress.completeTask() self.refreshProgress.completeTask()
self.combinedRefresh(account, webFeeds) { self.combinedRefresh(account, webFeeds) {
self.refreshProgress.clear() self.refreshProgress.clear()
account.metadata.lastArticleFetchEndTime = Date() account.metadata.lastArticleFetchEndTime = Date()
} }
case .failure(let error): case .failure(let error):
fail(error) fail(error)
} }
@ -613,12 +605,6 @@ private extension CloudKitAccountDelegate {
case .failure(let error): case .failure(let error):
fail(error) fail(error)
} }
}
case .failure(let error):
fail(error)
}
} }
} }