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

Remove extra fetch zone changes call

Browse Source
This commit is contained in:
Maurice Parker 2020-04-29 11:07:24 -05:00
parent bedce4946f
commit fbdbc19d0b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -538,7 +538,7 @@ private extension CloudKitAccountDelegate {
completion(.failure(error)) completion(.failure(error))
} }
refreshProgress.addToNumberOfTasksAndRemaining(2) refreshProgress.addToNumberOfTasksAndRemaining(3)
accountZone.fetchChangesInZone() { result in accountZone.fetchChangesInZone() { result in
self.refreshProgress.completeTask() self.refreshProgress.completeTask()
@ -571,7 +571,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(3 + intialWebFeedsCount) refreshProgress.addToNumberOfTasksAndRemaining(4 + intialWebFeedsCount)
func fail(_ error: Error) { func fail(_ error: Error) {
self.processAccountError(account, error) self.processAccountError(account, error)
@ -626,8 +626,6 @@ private extension CloudKitAccountDelegate {
var refresherWebFeeds = Set<WebFeed>() var refresherWebFeeds = Set<WebFeed>()
let group = DispatchGroup() let group = DispatchGroup()
refreshProgress.addToNumberOfTasksAndRemaining(3)
for webFeed in webFeeds { for webFeed in webFeeds {
if let components = URLComponents(string: webFeed.url), let feedProvider = FeedProviderManager.shared.best(for: components) { if let components = URLComponents(string: webFeed.url), let feedProvider = FeedProviderManager.shared.best(for: components) {
group.enter() group.enter()
@ -670,10 +668,8 @@ private extension CloudKitAccountDelegate {
group.notify(queue: DispatchQueue.main) { group.notify(queue: DispatchQueue.main) {
self.sendArticleStatus(for: account) { _ in self.sendArticleStatus(for: account) { _ in
self.articlesZone.fetchChangesInZone() { _ in self.refreshProgress.completeTask()
self.refreshProgress.completeTask() completion()
completion()
}
} }
} }