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

Stop using urlToFeedDictionary. Feeds don’t have to be uniqued.

This commit is contained in:
Brent Simmons 2018-09-16 13:04:42 -07:00
parent f8d6cb48dc
commit 3d45231494
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Frameworks/Account/Account.swift
View File

@ -49,7 +49,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
public let type: AccountType public let type: AccountType
public var nameForDisplay = "" public var nameForDisplay = ""
public var children = [AnyObject]() public var children = [AnyObject]()
var urlToFeedDictionary = [String: Feed]() // var urlToFeedDictionary = [String: Feed]()
var idToFeedDictionary = [String: Feed]() var idToFeedDictionary = [String: Feed]()
let settingsFile: String let settingsFile: String
let dataFolder: String let dataFolder: String
@ -240,21 +240,21 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
// If it already existed in that folder, return true. // If it already existed in that folder, return true.
var didAddFeed = false var didAddFeed = false
let uniquedFeed = existingFeed(with: feed.feedID) ?? feed // let uniquedFeed = existingFeed(with: feed.feedID) ?? feed
if let folder = folder { if let folder = folder {
didAddFeed = folder.addFeed(uniquedFeed) didAddFeed = folder.addFeed(feed)
} }
else { else {
if !topLevelObjectsContainsFeed(uniquedFeed) { if !topLevelObjectsContainsFeed(feed) {
children += [uniquedFeed] children += [feed]
postChildrenDidChangeNotification() postChildrenDidChangeNotification()
} }
didAddFeed = true didAddFeed = true
} }
if didAddFeed { if didAddFeed {
addToFeedDictionaries(uniquedFeed) addToFeedDictionaries(feed)
dirty = true dirty = true
} }
@ -266,16 +266,13 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
// For syncing, this may need to be an async method with a callback, // For syncing, this may need to be an async method with a callback,
// since it will likely need to call the server. // since it will likely need to call the server.
if let feed = existingFeed(withURL: url) {
if let editedName = editedName {
feed.editedName = editedName
}
return feed
}
let feed = Feed(account: self, url: url, feedID: url) let feed = Feed(account: self, url: url, feedID: url)
if let name = name, feed.name == nil {
feed.name = name feed.name = name
}
if let editedName = editedName, feed.editedName == nil {
feed.editedName = editedName feed.editedName = editedName
}
return feed return feed
} }
@ -696,13 +693,13 @@ private extension Account {
idDictionary[feed.feedID] = feed idDictionary[feed.feedID] = feed
} }
urlToFeedDictionary = urlDictionary // urlToFeedDictionary = urlDictionary
idToFeedDictionary = idDictionary idToFeedDictionary = idDictionary
} }
func addToFeedDictionaries(_ feed: Feed) { func addToFeedDictionaries(_ feed: Feed) {
urlToFeedDictionary[feed.url] = feed // urlToFeedDictionary[feed.url] = feed
idToFeedDictionary[feed.feedID] = feed idToFeedDictionary[feed.feedID] = feed
} }
@ -798,10 +795,10 @@ private extension Account {
extension Account { extension Account {
public func existingFeed(withURL url: String) -> Feed? { // public func existingFeed(withURL url: String) -> Feed? {
//
return urlToFeedDictionary[url] // return urlToFeedDictionary[url]
} // }
public func existingFeed(with feedID: String) -> Feed? { public func existingFeed(with feedID: String) -> Feed? {