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

Add batch update so that feeds stop adding to the sidebar without their names populated.

This commit is contained in:
Maurice Parker 2020-04-04 15:12:59 -05:00
parent 3a228be142
commit 2a6e1078aa
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,11 +182,14 @@ final class CloudKitAccountDelegate: AccountDelegate {
} }
func createWebFeed(for account: Account, url urlString: String, name: String?, container: Container, completion: @escaping (Result<WebFeed, Error>) -> Void) { func createWebFeed(for account: Account, url urlString: String, name: String?, container: Container, completion: @escaping (Result<WebFeed, Error>) -> Void) {
let editedName = name == nil || name!.isEmpty ? nil : name
guard let url = URL(string: urlString) else { guard let url = URL(string: urlString) else {
completion(.failure(LocalAccountDelegateError.invalidParameter)) completion(.failure(LocalAccountDelegateError.invalidParameter))
return return
} }
BatchUpdate.shared.start()
refreshProgress.addToNumberOfTasksAndRemaining(4) refreshProgress.addToNumberOfTasksAndRemaining(4)
FeedFinder.find(url: url) { result in FeedFinder.find(url: url) { result in
@ -194,25 +197,27 @@ final class CloudKitAccountDelegate: AccountDelegate {
switch result { switch result {
case .success(let feedSpecifiers): case .success(let feedSpecifiers):
guard let bestFeedSpecifier = FeedSpecifier.bestFeed(in: feedSpecifiers), let url = URL(string: bestFeedSpecifier.urlString) else { guard let bestFeedSpecifier = FeedSpecifier.bestFeed(in: feedSpecifiers), let url = URL(string: bestFeedSpecifier.urlString) else {
self.refreshProgress.completeTask() BatchUpdate.shared.end()
self.refreshProgress.clear()
completion(.failure(AccountError.createErrorNotFound)) completion(.failure(AccountError.createErrorNotFound))
return return
} }
if account.hasWebFeed(withURL: bestFeedSpecifier.urlString) { if account.hasWebFeed(withURL: bestFeedSpecifier.urlString) {
self.refreshProgress.completeTask() BatchUpdate.shared.end()
self.refreshProgress.clear()
completion(.failure(AccountError.createErrorAlreadySubscribed)) completion(.failure(AccountError.createErrorAlreadySubscribed))
return return
} }
self.accountZone.createWebFeed(url: bestFeedSpecifier.urlString, editedName: name, container: container) { result in self.accountZone.createWebFeed(url: bestFeedSpecifier.urlString, editedName: editedName, container: container) { result in
self.refreshProgress.completeTask() self.refreshProgress.completeTask()
switch result { switch result {
case .success(let externalID): case .success(let externalID):
let feed = account.createWebFeed(with: nil, url: url.absoluteString, webFeedID: url.absoluteString, homePageURL: nil) let feed = account.createWebFeed(with: nil, url: url.absoluteString, webFeedID: url.absoluteString, homePageURL: nil)
feed.editedName = name feed.editedName = editedName
feed.externalID = externalID feed.externalID = externalID
container.addWebFeed(feed) container.addWebFeed(feed)
@ -228,6 +233,7 @@ final class CloudKitAccountDelegate: AccountDelegate {
if let parsedFeed = parsedFeed { if let parsedFeed = parsedFeed {
account.update(feed, with: parsedFeed, {_ in account.update(feed, with: parsedFeed, {_ in
BatchUpdate.shared.end()
completion(.success(feed)) completion(.success(feed))
}) })
} }
@ -235,11 +241,14 @@ final class CloudKitAccountDelegate: AccountDelegate {
} }
case .failure(let error): case .failure(let error):
BatchUpdate.shared.end()
self.refreshProgress.clear()
completion(.failure(error)) completion(.failure(error))
} }
} }
case .failure: case .failure:
BatchUpdate.shared.end()
self.refreshProgress.clear() self.refreshProgress.clear()
completion(.failure(AccountError.createErrorNotFound)) completion(.failure(AccountError.createErrorNotFound))
} }