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

Refactor addFeed and removeFeed usages to be more consistent

Browse Source
This commit is contained in:
Maurice Parker
2019-05-29 20:47:52 -05:00
parent 5e3fcfd955
commit f4bc17c8f1
6 changed files with 35 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift
View File

@@ -285,13 +285,11 @@ private extension SidebarOutlineDataSource {
}
func copyInAccount(node: Node, to parentNode: Node) {
guard let feed = node.representedObject as? Feed else {
guard let feed = node.representedObject as? Feed, let destination = parentNode.representedObject as? Container else {
return
}
let destination = parentNode.representedObject as? Container
destination?.addFeed(feed) { result in
destination.account?.addFeed(feed, to: destination) { result in
switch result {
case .success:
break
@@ -302,18 +300,17 @@ private extension SidebarOutlineDataSource {
}
func moveInAccount(node: Node, to parentNode: Node) {
guard let feed = node.representedObject as? Feed else {
guard let feed = node.representedObject as? Feed,
let source = node.parent?.representedObject as? Container,
let destination = parentNode.representedObject as? Container else {
return
}
let source = node.parent?.representedObject as? Container
let destination = parentNode.representedObject as? Container
BatchUpdate.shared.start()
source?.removeFeed(feed) { result in
source.account?.removeFeed(feed, from: source) { result in
switch result {
case .success:
destination?.addFeed(feed) { result in
destination.account?.addFeed(feed, to: destination) { result in
BatchUpdate.shared.end()
switch result {
case .success:
@@ -336,7 +333,7 @@ private extension SidebarOutlineDataSource {
}
if let existingFeed = destinationAccount.existingFeed(withURL: feed.url) {
destinationContainer.addFeed(existingFeed) { result in
destinationAccount.addFeed(existingFeed, to: destinationContainer) { result in
switch result {
case .success:
break
@@ -368,7 +365,7 @@ private extension SidebarOutlineDataSource {
if let existingFeed = destinationAccount.existingFeed(withURL: feed.url) {
BatchUpdate.shared.start()
destinationContainer.addFeed(existingFeed) { result in
destinationAccount.addFeed(existingFeed, to: destinationContainer) { result in
switch result {
case .success:
sourceAccount.deleteFeed(feed, from: sourceContainer) { result in