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

Simplify filterIncomingArticles.

This commit is contained in:
Brent Simmons 2017-09-21 18:14:37 -07:00
parent d9f0e53312
commit a7063f7a5d
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Frameworks/Database/ArticlesTable.swift
View File

@ -107,7 +107,7 @@ final class ArticlesTable: DatabaseTable {
return return
} }
let incomingArticles = self.filterIncomingArticles(allIncomingArticles, statusesDictionary) //3 let incomingArticles = self.filterIncomingArticles(allIncomingArticles) //3
if incomingArticles.isEmpty { if incomingArticles.isEmpty {
self.callUpdateArticlesCompletionBlock(nil, nil, completion) self.callUpdateArticlesCompletionBlock(nil, nil, completion)
return return
@ -431,18 +431,11 @@ private extension ArticlesTable {
return status.dateArrived < maximumArticleCutoffDate return status.dateArrived < maximumArticleCutoffDate
} }
func filterIncomingArticles(_ articles: Set<Article>, _ statuses: [String: ArticleStatus]) -> Set<Article> { func filterIncomingArticles(_ articles: Set<Article>) -> Set<Article> {
// Drop Articles that we can ignore. // Drop Articles that we can ignore.
return Set(articles.filter{ (article) -> Bool in return Set(articles.filter{ !statusIndicatesArticleIsIgnorable($0.status) })
let articleID = article.articleID
if let status = statuses[articleID] {
return !statusIndicatesArticleIsIgnorable(status)
}
assertionFailure("Expected a status for each Article.")
return true
})
} }
} }