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

Create and use childNodesForContainerNode, which replaces two functions doing the same thing.

This commit is contained in:
Brent Simmons 2017-10-19 21:52:45 -07:00
parent 1481d72ed1
commit 5289a68433
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift
View File

@ -33,44 +33,30 @@ private extension SidebarTreeControllerDelegate {
// The child nodes are the top-level items of the local Account.
// This will be expanded later to add synthetic feeds (All Unread, for instance)
// and other accounts.
let localAccountChildren = AccountManager.shared.localAccount.children
var updatedChildNodes = [Node]()
localAccountChildren.forEach { (representedObject) in
if let existingNode = rootNode.childNodeRepresentingObject(representedObject) {
// Reuse nodes.
if !updatedChildNodes.contains(existingNode) {
updatedChildNodes += [existingNode]
return
}
}
if let newNode = createNode(representedObject: representedObject as AnyObject, parent: rootNode) {
updatedChildNodes += [newNode]
}
}
updatedChildNodes = Node.nodesSortedAlphabeticallyWithFoldersAtEnd(updatedChildNodes)
return updatedChildNodes
return childNodesForContainerNode(rootNode, AccountManager.shared.localAccount.children)
}
func childNodesForFolderNode(_ folderNode: Node) -> [Node]? {
var updatedChildNodes = [Node]()
let folder = folderNode.representedObject as! Folder
return childNodesForContainerNode(folderNode, folder.children)
}
folder.children.forEach { (representedObject) in
func childNodesForContainerNode(_ containerNode: Node, _ children: [AnyObject]) -> [Node]? {
if let existingNode = folderNode.childNodeRepresentingObject(representedObject) {
var updatedChildNodes = [Node]()
children.forEach { (representedObject) in
if let existingNode = containerNode.childNodeRepresentingObject(representedObject) {
if !updatedChildNodes.contains(existingNode) {
updatedChildNodes += [existingNode]
return
}
}
if let newNode = self.createNode(representedObject: representedObject, parent: folderNode) {
if let newNode = self.createNode(representedObject: representedObject, parent: containerNode) {
updatedChildNodes += [newNode]
}
}
@ -78,7 +64,7 @@ private extension SidebarTreeControllerDelegate {
updatedChildNodes = Node.nodesSortedAlphabeticallyWithFoldersAtEnd(updatedChildNodes)
return updatedChildNodes
}
func createNode(representedObject: Any, parent: Node) -> Node? {
if let feed = representedObject as? Feed {