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

Change to utilize ArticleFetchers instead of Feeds so that the single article fetcher stops getting filtered out. Issue #2416

Browse Source
This commit is contained in:
Maurice Parker
2020-09-12 18:09:42 -05:00
parent feba4a7bc6
commit c580877a86
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Mac/MainWindow/Timeline/TimelineViewController.swift
View File

@@ -1129,19 +1129,19 @@ private extension TimelineViewController {
func fetchUnsortedArticlesSync(for representedObjects: [Any]) -> Set<Article> {
cancelPendingAsyncFetches()
let feeds = representedObjects.compactMap{ $0 as? Feed }
if feeds.isEmpty {
let fetchers = representedObjects.compactMap{ $0 as? ArticleFetcher }
if fetchers.isEmpty {
return Set<Article>()
}
var fetchedArticles = Set<Article>()
for feed in feeds {
if feed.readFiltered(readFilterEnabledTable: readFilterEnabledTable) {
if let articles = try? feed.fetchUnreadArticles() {
for fetchers in fetchers {
if (fetchers as? Feed)?.readFiltered(readFilterEnabledTable: readFilterEnabledTable) ?? true {
if let articles = try? fetchers.fetchUnreadArticles() {
fetchedArticles.formUnion(articles)
}
} else {
if let articles = try? feed.fetchArticles() {
if let articles = try? fetchers.fetchArticles() {
fetchedArticles.formUnion(articles)
}
}
@@ -1154,8 +1154,8 @@ private extension TimelineViewController {
// if it’s been superseded by a newer fetch, or the timeline was emptied, etc., it won’t get called.
precondition(Thread.isMainThread)
cancelPendingAsyncFetches()
let feeds = representedObjects.compactMap { $0 as? Feed }
let fetchOperation = FetchRequestOperation(id: fetchSerialNumber, readFilterEnabledTable: readFilterEnabledTable, feeds: feeds) { [weak self] (articles, operation) in
let fetchers = representedObjects.compactMap { $0 as? ArticleFetcher }
let fetchOperation = FetchRequestOperation(id: fetchSerialNumber, readFilterEnabledTable: readFilterEnabledTable, fetchers: fetchers) { [weak self] (articles, operation) in
precondition(Thread.isMainThread)
guard !operation.isCanceled, let strongSelf = self, operation.id == strongSelf.fetchSerialNumber else {
return