FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolved issue where local account feed finder could lock up the UI if an error was thrown. Issue #720

This commit is contained in:
Maurice Parker 2019-06-06 19:46:42 -05:00
parent e7ec59f31f
commit eb71e88845
1 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Frameworks/Account/LocalAccount/LocalAccountDelegate.swift
View File

@ -93,6 +93,8 @@ final class LocalAccountDelegate: AccountDelegate {
return return
} }
DispatchQueue.global(qos: .userInitiated).async {
FeedFinder.find(url: url) { result in FeedFinder.find(url: url) { result in
switch result { switch result {
@ -100,12 +102,16 @@ final class LocalAccountDelegate: AccountDelegate {
guard let bestFeedSpecifier = FeedSpecifier.bestFeed(in: feedSpecifiers), guard let bestFeedSpecifier = FeedSpecifier.bestFeed(in: feedSpecifiers),
let url = URL(string: bestFeedSpecifier.urlString) else { let url = URL(string: bestFeedSpecifier.urlString) else {
DispatchQueue.main.async {
completion(.failure(AccountError.createErrorNotFound)) completion(.failure(AccountError.createErrorNotFound))
}
return return
} }
if account.hasFeed(withURL: bestFeedSpecifier.urlString) { if account.hasFeed(withURL: bestFeedSpecifier.urlString) {
DispatchQueue.main.async {
completion(.failure(AccountError.createErrorAlreadySubscribed)) completion(.failure(AccountError.createErrorAlreadySubscribed))
}
return return
} }
@ -120,12 +126,18 @@ final class LocalAccountDelegate: AccountDelegate {
feed.editedName = name feed.editedName = name
container.addFeed(feed) container.addFeed(feed)
DispatchQueue.main.async {
completion(.success(feed)) completion(.success(feed))
}
} }
case .failure(let error): case .failure:
completion(.failure(error)) DispatchQueue.main.async {
completion(.failure(AccountError.createErrorNotFound))
}
}
} }
} }