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

Rename childrenContainsFeed to childrenContain. Add assertionFailure — expecting pointer equality.

This commit is contained in:
Brent Simmons 2017-10-18 18:13:49 -07:00
parent 3ea60cb461
commit f90bf3bea1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Frameworks/Account/Folder.swift
View File

@ -109,13 +109,11 @@ public final class Folder: DisplayNameProvider, Container, UnreadCountProvider {
func addFeed(_ feed: Feed) -> Bool { func addFeed(_ feed: Feed) -> Bool {
// The feed has been uniqued at this point.
// Return true in the case where the feed is already a child. // Return true in the case where the feed is already a child.
if childrenContainsFeed(feed) { if !childrenContain(feed) {
return true children += [feed]
} }
children += [feed]
return true return true
} }
@ -141,11 +139,15 @@ private extension Folder {
unreadCount = calculateUnreadCount(children) unreadCount = calculateUnreadCount(children)
} }
func childrenContainsFeed(_ feed: Feed) -> Bool { func childrenContain(_ feed: Feed) -> Bool {
return children.contains(where: { (object) -> Bool in return children.contains(where: { (object) -> Bool in
if object === feed {
return true
}
if let oneFeed = object as? Feed { if let oneFeed = object as? Feed {
if oneFeed.feedID == feed.feedID { if oneFeed.feedID == feed.feedID {
assertionFailure("Expected feeds to match by pointer equality rather than by feedID.")
return true return true
} }
} }