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

Rewrite fetchArticlesAsync to use DispatchGroup, to be sure the completion is called just once. Fix #3823

Browse Source
This commit is contained in:
Brent Simmons 2023-01-21 17:21:51 -08:00
parent 1e485f3e8d
commit 3b2b0272d7
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Account/Sources/Account/AccountManager.swift
View File

@ -11,6 +11,7 @@ import RSCore
import RSWeb
import Articles
import ArticlesDatabase
import RSDatabase
// Main thread only.
@ -363,47 +364,46 @@ public final class AccountManager: UnreadCountProvider {
}
return articles
}
public func fetchArticlesAsync(_ fetchType: FetchType, _ completion: @escaping ArticleSetResultBlock) {
precondition(Thread.isMainThread)
var allFetchedArticles = Set<Article>()
let numberOfAccounts = activeAccounts.count
var accountsReporting = 0
var didCallCompletionBlock = false
var databaseFetchDidFail = false
precondition(Thread.isMainThread)
func callCompletion(_ result: ArticleSetResult) {
guard !didCallCompletionBlock else {
return
}
completion(result)
didCallCompletionBlock = true
guard activeAccounts.count > 0 else {
completion(.success(Set<Article>()))
return
}
guard numberOfAccounts > 0 else {
callCompletion(.success(allFetchedArticles))
return
}
for account in activeAccounts {
account.fetchArticlesAsync(fetchType) { (articleSetResult) in
var allFetchedArticles = Set<Article>()
var databaseError: DatabaseError?
let dispatchGroup = DispatchGroup()
for account in activeAccounts {
dispatchGroup.enter()
account.fetchArticlesAsync(fetchType) { (articleSetResult) in
precondition(Thread.isMainThread)
accountsReporting += 1
switch articleSetResult {
case .success(let articles):
allFetchedArticles.formUnion(articles)
if accountsReporting == numberOfAccounts && !databaseFetchDidFail {
callCompletion(.success(allFetchedArticles))
}
case .failure(let databaseError):
databaseFetchDidFail = true
callCompletion(.failure(databaseError))
}
}
}
}
switch articleSetResult {
case .success(let articles):
allFetchedArticles.formUnion(articles)
case .failure(let error):
databaseError = error
}
dispatchGroup.leave()
}
}
dispatchGroup.notify(queue: .main) {
if let databaseError {
completion(.failure(databaseError))
}
else {
completion(.success(allFetchedArticles))
}
}
}
// MARK: - Fetching Article Counts