renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issue where new Feeds added to a folder also got left in the account container.

Browse Source
This commit is contained in:
Maurice Parker
2019-05-21 10:26:11 -05:00
parent fb33008b36
commit 8816de4a0e
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Mac/MainWindow/AddFeed/AddFeedController.swift
View File

@@ -59,6 +59,8 @@ class AddFeedController: AddFeedWindowControllerDelegate {
return
}
BatchUpdate.shared.start()
account.createFeed(url: url.absoluteString) { [weak self] result in
self?.endShowingProgress()
@@ -67,6 +69,7 @@ class AddFeedController: AddFeedWindowControllerDelegate {
case .success(let feed):
self?.processFeed(feed, account: account, folder: folder, url: url, title: title)
case .failure(let error):
BatchUpdate.shared.end()
switch error {
case AccountError.createErrorAlreadySubscribed:
self?.showAlreadySubscribedError(url.absoluteString)
@@ -139,8 +142,10 @@ private extension AddFeedController {
folder.addFeed(feed) { result in
switch result {
case .success:
BatchUpdate.shared.end()
NotificationCenter.default.post(name: .UserDidAddFeed, object: self, userInfo: [UserInfoKey.feed: feed])
case .failure(let error):
BatchUpdate.shared.end()
NSApplication.shared.presentError(error)
}
}
@@ -148,8 +153,10 @@ private extension AddFeedController {
account.addFeed(feed) { result in
switch result {
case .success:
BatchUpdate.shared.end()
NotificationCenter.default.post(name: .UserDidAddFeed, object: self, userInfo: [UserInfoKey.feed: feed])
case .failure(let error):
BatchUpdate.shared.end()
NSApplication.shared.presentError(error)
}
}