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

Prevent Feedbin in account copy from putting a feed in both the root account and a folder at the same time.

Browse Source
This commit is contained in:
Maurice Parker 2019-05-28 13:38:40 -05:00
parent 112702020b
commit cf016c5d7d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Frameworks/Account/Account.swift
View File

@ -675,6 +675,12 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
postChildrenDidChangeNotification() postChildrenDidChangeNotification()
} }
func addFeedIfNotInAnyFolder(_ feed: Feed) {
if !flattenedFeeds().contains(feed) {
addFeed(feed)
}
}
func deleteFolder(_ folder: Folder) { func deleteFolder(_ folder: Folder) {
folders?.remove(folder) folders?.remove(folder)
structureDidChange() structureDidChange()

4
Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
View File

@ -377,6 +377,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
case .success(let taggingID): case .success(let taggingID):
DispatchQueue.main.async { DispatchQueue.main.async {
self.saveFolderRelationship(for: feed, withFolderName: folder.name ?? "", id: String(taggingID)) self.saveFolderRelationship(for: feed, withFolderName: folder.name ?? "", id: String(taggingID))
account.removeFeed(feed)
folder.addFeed(feed) folder.addFeed(feed)
completion(.success(())) completion(.success(()))
} }
@ -389,7 +390,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
} }
} else { } else {
if let account = container as? Account { if let account = container as? Account {
account.addFeed(feed) account.addFeedIfNotInAnyFolder(feed)
} }
DispatchQueue.main.async { DispatchQueue.main.async {
completion(.success(())) completion(.success(()))
@ -406,6 +407,7 @@ final class FeedbinAccountDelegate: AccountDelegate {
case .success: case .success:
DispatchQueue.main.async { DispatchQueue.main.async {
folder.removeFeed(feed) folder.removeFeed(feed)
account.addFeedIfNotInAnyFolder(feed)
completion(.success(())) completion(.success(()))
} }
case .failure(let error): case .failure(let error):