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

Refresh progress updates for changes which cannot be applied immediately and restored on failure

This commit is contained in:
Kiel Gillard 2019-10-09 19:06:59 +11:00
parent 41ca023c31
commit 92fa66f345
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Frameworks/Account/Feedly/FeedlyAccountDelegate.swift
View File

@ -148,7 +148,13 @@ final class FeedlyAccountDelegate: AccountDelegate {
}
func addFolder(for account: Account, name: String, completion: @escaping (Result<Folder, Error>) -> Void) {
let progress = refreshProgress
progress.addToNumberOfTasksAndRemaining(1)
caller.createCollection(named: name) { result in
progress.completeTask()
switch result {
case .success(let collection):
if let folder = account.ensureFolder(with: collection.label) {
@ -194,7 +200,12 @@ final class FeedlyAccountDelegate: AccountDelegate {
}
}
let progress = refreshProgress
progress.addToNumberOfTasksAndRemaining(1)
caller.deleteCollection(with: id) { result in
progress.completeTask()
switch result {
case .success:
account.removeFolder(folder)
@ -239,7 +250,12 @@ final class FeedlyAccountDelegate: AccountDelegate {
let resourceId = FeedlyFeedResourceId(url: url)
let progress = refreshProgress
progress.addToNumberOfTasksAndRemaining(1)
caller.addFeed(with: resourceId, title: name, toCollectionWith: collectionId) { result in
progress.completeTask()
switch result {
case .success(let feedlyFeeds):
let feedsBefore = folder.flattenedFeeds()
@ -274,6 +290,8 @@ final class FeedlyAccountDelegate: AccountDelegate {
let feedId = FeedlyFeedResourceId(id: feed.feedID)
let editedNameBefore = feed.editedName
// Adding an existing feed updates it.
// Updating feed name in one folder/collection updates it for all folders/collections.
caller.addFeed(with: feedId, title: name, toCollectionWith: collectionId) { result in
switch result {
case .success: