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

Implement active account processing functionality

Browse Source
This commit is contained in:
Maurice Parker
2019-05-02 06:01:30 -05:00
parent 747079157b
commit 636468bbf0
16 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/SmartFeeds/SearchFeedDelegate.swift
View File

@@ -34,7 +34,7 @@ extension SearchFeedDelegate: ArticleFetcher {
func fetchArticles() -> Set<Article> {
var articles = Set<Article>()
for account in AccountManager.shared.accounts {
for account in AccountManager.shared.activeAccounts {
articles.formUnion(account.fetchArticlesMatching(searchString))
}
return articles

4
Shared/SmartFeeds/SmartFeed.swift
View File

@@ -51,7 +51,7 @@ final class SmartFeed: PseudoFeed {
}
@objc func fetchUnreadCounts() {
AccountManager.shared.accounts.forEach { self.fetchUnreadCount(for: $0) }
AccountManager.shared.activeAccounts.forEach { self.fetchUnreadCount(for: $0) }
}
}
@@ -80,7 +80,7 @@ private extension SmartFeed {
}
func updateUnreadCount() {
unreadCount = AccountManager.shared.accounts.reduce(0) { (result, account) -> Int in
unreadCount = AccountManager.shared.activeAccounts.reduce(0) { (result, account) -> Int in
if let oneUnreadCount = unreadCounts[account] {
return result + oneUnreadCount
}

2
Shared/SmartFeeds/StarredFeedDelegate.swift
View File

@@ -25,7 +25,7 @@ struct StarredFeedDelegate: SmartFeedDelegate {
func fetchArticles() -> Set<Article> {
var articles = Set<Article>()
for account in AccountManager.shared.accounts {
for account in AccountManager.shared.activeAccounts {
articles.formUnion(account.fetchStarredArticles())
}
return articles

2
Shared/SmartFeeds/TodayFeedDelegate.swift
View File

@@ -24,7 +24,7 @@ struct TodayFeedDelegate: SmartFeedDelegate {
func fetchArticles() -> Set<Article> {
var articles = Set<Article>()
for account in AccountManager.shared.accounts {
for account in AccountManager.shared.activeAccounts {
articles.formUnion(account.fetchTodayArticles())
}
return articles

2
Shared/SmartFeeds/UnreadFeed.swift
View File

@@ -57,7 +57,7 @@ extension UnreadFeed: ArticleFetcher {
func fetchUnreadArticles() -> Set<Article> {
var articles = Set<Article>()
for account in AccountManager.shared.accounts {
for account in AccountManager.shared.activeAccounts {
articles.formUnion(account.fetchUnreadArticles())
}
return articles

2
Shared/Tree/FeedTreeControllerDelegate.swift
View File

@@ -113,7 +113,7 @@ private extension FeedTreeControllerDelegate {
func sortedAccountNodes(_ parent: Node) -> [Node] {
let nodes = AccountManager.shared.sortedAccounts.map { (account) -> Node in
let nodes = AccountManager.shared.sortedActiveAccounts.map { (account) -> Node in
let accountNode = parent.existingOrNewChildNode(with: account)
accountNode.canHaveChildNodes = true
accountNode.isGroupItem = true

2
Shared/Tree/FolderTreeControllerDelegate.swift
View File

@@ -24,7 +24,7 @@ private extension FolderTreeControllerDelegate {
func childNodesForRootNode(_ node: Node) -> [Node]? {
let accountNodes: [Node] = AccountManager.shared.accounts.map { account in
let accountNodes: [Node] = AccountManager.shared.activeAccounts.map { account in
let accountNode = Node(representedObject: account, parent: node)
accountNode.canHaveChildNodes = true
return accountNode