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

Add external id lookups for folders and web feeds.

This commit is contained in:
Maurice Parker 2020-03-29 12:07:54 -05:00
parent 2afdd26c9d
commit c0e1fbfff3
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Frameworks/Account/Account.swift
View File

@ -143,14 +143,21 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
return nil return nil
} }
private var webFeedDictionaryNeedsUpdate = true private var webFeedDictionariesNeedUpdate = true
private var _idToWebFeedDictionary = [String: WebFeed]() private var _idToWebFeedDictionary = [String: WebFeed]()
var idToWebFeedDictionary: [String: WebFeed] { var idToWebFeedDictionary: [String: WebFeed] {
if webFeedDictionaryNeedsUpdate { if webFeedDictionariesNeedUpdate {
rebuildWebFeedDictionaries() rebuildWebFeedDictionaries()
} }
return _idToWebFeedDictionary return _idToWebFeedDictionary
} }
private var _externalIDToWebFeedDictionary = [String: WebFeed]()
var externalIDToWebFeedDictionary: [String: WebFeed] {
if webFeedDictionariesNeedUpdate {
rebuildWebFeedDictionaries()
}
return _externalIDToWebFeedDictionary
}
var username: String? { var username: String? {
get { get {
@ -520,6 +527,10 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
return folders?.first(where: { $0.nameForDisplay == displayName }) return folders?.first(where: { $0.nameForDisplay == displayName })
} }
public func existingFolder(withExternalID externalID: String) -> Folder? {
return folders?.first(where: { $0.externalID == externalID })
}
func newWebFeed(with opmlFeedSpecifier: RSOPMLFeedSpecifier) -> WebFeed { func newWebFeed(with opmlFeedSpecifier: RSOPMLFeedSpecifier) -> WebFeed {
let feedURL = opmlFeedSpecifier.feedURL let feedURL = opmlFeedSpecifier.feedURL
let metadata = webFeedMetadata(feedURL: feedURL, webFeedID: feedURL) let metadata = webFeedMetadata(feedURL: feedURL, webFeedID: feedURL)
@ -532,6 +543,10 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
return feed return feed
} }
public func existingWebFeed(withExternalID externalID: String) -> WebFeed? {
return externalIDToWebFeedDictionary[externalID]
}
public func addWebFeed(_ feed: WebFeed, to container: Container, completion: @escaping (Result<Void, Error>) -> Void) { public func addWebFeed(_ feed: WebFeed, to container: Container, completion: @escaping (Result<Void, Error>) -> Void) {
delegate.addWebFeed(for: self, with: feed, to: container, completion: completion) delegate.addWebFeed(for: self, with: feed, to: container, completion: completion)
} }
@ -678,7 +693,7 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
// Or feeds inside folders were added or deleted. // Or feeds inside folders were added or deleted.
opmlFile.markAsDirty() opmlFile.markAsDirty()
flattenedWebFeedsNeedUpdate = true flattenedWebFeedsNeedUpdate = true
webFeedDictionaryNeedsUpdate = true webFeedDictionariesNeedUpdate = true
} }
func update(_ webFeed: WebFeed, with parsedFeed: ParsedFeed, _ completion: @escaping DatabaseCompletionBlock) { func update(_ webFeed: WebFeed, with parsedFeed: ParsedFeed, _ completion: @escaping DatabaseCompletionBlock) {
@ -1149,13 +1164,18 @@ private extension Account {
func rebuildWebFeedDictionaries() { func rebuildWebFeedDictionaries() {
var idDictionary = [String: WebFeed]() var idDictionary = [String: WebFeed]()
var externalIDDictionary = [String: WebFeed]()
flattenedWebFeeds().forEach { (feed) in flattenedWebFeeds().forEach { (feed) in
idDictionary[feed.webFeedID] = feed idDictionary[feed.webFeedID] = feed
if let externalID = feed.externalID {
externalIDDictionary[externalID] = feed
}
} }
_idToWebFeedDictionary = idDictionary _idToWebFeedDictionary = idDictionary
webFeedDictionaryNeedsUpdate = false _externalIDToWebFeedDictionary = externalIDDictionary
webFeedDictionariesNeedUpdate = false
} }
func updateUnreadCount() { func updateUnreadCount() {