FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use datePublished when fetching articles for a feed for display in the UI. This defines the window instead of dateArrived — though dateArrived is still the fallback when datePublished is nil.

Browse Source
This commit is contained in:
Brent Simmons 2019-12-08 22:17:25 -08:00
parent 03f95e4788
commit 03fd162d37
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Frameworks/ArticlesDatabase/ArticlesTable.swift
View File

@ -349,9 +349,9 @@ final class ArticlesTable: DatabaseTable {
let cutoffDate = articleCutoffDate let cutoffDate = articleCutoffDate
queue.runInDatabase { (database) in queue.runInDatabase { (database) in
let sql = "select distinct feedID, count(*) from articles natural join statuses where read=0 and userDeleted=0 and (starred=1 or dateArrived>?) group by feedID;" let sql = "select distinct feedID, count(*) from articles natural join statuses where read=0 and userDeleted=0 and (starred=1 or (datePublished > ? or (datePublished is null and dateArrived > ?))) group by feedID;"
guard let resultSet = database.executeQuery(sql, withArgumentsIn: [cutoffDate]) else { guard let resultSet = database.executeQuery(sql, withArgumentsIn: [cutoffDate, cutoffDate]) else {
DispatchQueue.main.async { DispatchQueue.main.async {
completion(UnreadCountDictionary()) completion(UnreadCountDictionary())
} }
@ -586,8 +586,8 @@ private extension ArticlesTable {
// * Must be either 1) starred or 2) dateArrived must be newer than cutoff date. // * Must be either 1) starred or 2) dateArrived must be newer than cutoff date.
if withLimits { if withLimits {
let sql = "select * from articles natural join statuses where \(whereClause) and userDeleted=0 and (starred=1 or dateArrived>?);" let sql = "select * from articles natural join statuses where \(whereClause) and userDeleted=0 and (starred=1 or (datePublished > ? or (datePublished is null and dateArrived > ?)));"
return articlesWithSQL(sql, parameters + [articleCutoffDate as AnyObject], database) return articlesWithSQL(sql, parameters + [articleCutoffDate as AnyObject] + [articleCutoffDate as AnyObject], database)
} }
else { else {
let sql = "select * from articles natural join statuses where \(whereClause);" let sql = "select * from articles natural join statuses where \(whereClause);"
@ -601,8 +601,8 @@ private extension ArticlesTable {
// * Must not be deleted. // * Must not be deleted.
// * Must be either 1) starred or 2) dateArrived must be newer than cutoff date. // * Must be either 1) starred or 2) dateArrived must be newer than cutoff date.
let sql = "select count(*) from articles natural join statuses where feedID=? and read=0 and userDeleted=0 and (starred=1 or dateArrived>?);" let sql = "select count(*) from articles natural join statuses where feedID=? and read=0 and userDeleted=0 and (starred=1 or (datePublished > ? or (datePublished is null and dateArrived > ?)));"
return numberWithSQLAndParameters(sql, [webFeedID, articleCutoffDate], in: database) return numberWithSQLAndParameters(sql, [webFeedID, articleCutoffDate, articleCutoffDate], in: database)
} }
func fetchArticlesMatching(_ searchString: String, _ database: FMDatabase) -> Set<Article> { func fetchArticlesMatching(_ searchString: String, _ database: FMDatabase) -> Set<Article> {
@ -786,20 +786,23 @@ private extension ArticlesTable {
} }
} }
func statusIndicatesArticleIsIgnorable(_ status: ArticleStatus) -> Bool { func articleIsIgnorable(_ article: Article) -> Bool {
// Ignorable articles: either userDeleted==1 or (not starred and arrival date > 4 months). // Ignorable articles: either userDeleted==1 or (not starred and arrival date > 4 months).
if status.userDeleted { if article.status.userDeleted {
return true return true
} }
if status.starred { if article.status.starred {
return false return false
} }
return status.dateArrived < maximumArticleCutoffDate if let datePublished = article.datePublished {
return datePublished < maximumArticleCutoffDate
}
return article.status.dateArrived < maximumArticleCutoffDate
} }
func filterIncomingArticles(_ articles: Set<Article>) -> 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{ !statusIndicatesArticleIsIgnorable($0.status) }) return Set(articles.filter{ !articleIsIgnorable($0) })
} }
func removeArticles(_ articleIDs: Set<String>, _ database: FMDatabase) { func removeArticles(_ articleIDs: Set<String>, _ database: FMDatabase) {