Merge branch 'main' of https://github.com/Ranchero-Software/NetNewsWire into main
This commit is contained in:
commit
98dfd88c2f
@ -1134,14 +1134,6 @@ private extension Account {
|
|||||||
return articles
|
return articles
|
||||||
}
|
}
|
||||||
|
|
||||||
func fetchUnreadArticlesAsync(for webFeed: WebFeed, completion: @escaping (Set<Article>) -> Void) {
|
|
||||||
// database.fetchUnreadArticlesAsync(for: Set([feed.feedID])) { [weak self] (articles) in
|
|
||||||
// self?.validateUnreadCount(feed, articles)
|
|
||||||
// callback(articles)
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
func fetchArticles(forContainer container: Container) throws -> Set<Article> {
|
func fetchArticles(forContainer container: Container) throws -> Set<Article> {
|
||||||
let feeds = container.flattenedWebFeeds()
|
let feeds = container.flattenedWebFeeds()
|
||||||
let articles = try database.fetchArticles(feeds.webFeedIDs())
|
let articles = try database.fetchArticles(feeds.webFeedIDs())
|
||||||
|
@ -635,20 +635,6 @@ private extension SidebarViewController {
|
|||||||
delegate?.sidebarInvalidatedRestorationState(self)
|
delegate?.sidebarInvalidatedRestorationState(self)
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateUnreadCounts(for objects: [AnyObject]) {
|
|
||||||
// On selection, update unread counts for folders and feeds.
|
|
||||||
// For feeds, actually fetch from database.
|
|
||||||
|
|
||||||
for object in objects {
|
|
||||||
if let feed = object as? WebFeed, let account = feed.account {
|
|
||||||
account.updateUnreadCounts(for: Set([feed]))
|
|
||||||
}
|
|
||||||
else if let folder = object as? Folder, let account = folder.account {
|
|
||||||
account.updateUnreadCounts(for: folder.flattenedWebFeeds())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func nodeForItem(_ item: AnyObject?) -> Node {
|
func nodeForItem(_ item: AnyObject?) -> Node {
|
||||||
if item == nil {
|
if item == nil {
|
||||||
return treeController.rootNode
|
return treeController.rootNode
|
||||||
|
Loading…
x
Reference in New Issue
Block a user