FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-09 08:39:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Progress.

Browse Source
This commit is contained in:
Brent Simmons 2017-08-27 13:03:15 -07:00
parent 3c43732e25
commit baabf842e1
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Frameworks/Database/ArticlesTable.swift
View File

@ -61,15 +61,13 @@ final class ArticlesTable: DatabaseTable {
func fetchArticles(_ feed: Feed) -> Set<Article> { func fetchArticles(_ feed: Feed) -> Set<Article> {
let feedID = feed.feedID let feedID = feed.feedID
var articles = Set<Article>()
var fetchedArticles = Set<Article>()
queue.fetchSync { (database: FMDatabase!) -> Void in queue.fetchSync { (database: FMDatabase!) -> Void in
articles = self.fetchArticlesForFeedID(feedID, database: database)
fetchedArticles = self.fetchArticlesForFeedID(feedID, database: database)
} }
return articleCache.uniquedArticles(fetchedArticles) return articleCache.uniquedArticles(articles)
} }
func fetchArticlesAsync(_ feed: Feed, _ resultBlock: @escaping ArticleResultBlock) { func fetchArticlesAsync(_ feed: Feed, _ resultBlock: @escaping ArticleResultBlock) {
@ -87,9 +85,9 @@ final class ArticlesTable: DatabaseTable {
} }
} }
func fetchUnreadArticles(_ feeds: Set<Feed>) -> Set<Article> { func fetchUnreadArticles(for feeds: Set<Feed>) -> Set<Article> {
return Set<Article>() // TODO return fetchUnreadArticles(feeds.feedIDs())
} }
// MARK: Updating // MARK: Updating
@ -184,21 +182,45 @@ private extension ArticlesTable {
return articles return articles
} }
func fetchArticlesWithWhereClause(_ database: FMDatabase, whereClause: String, parameters: [AnyObject]?) -> Set<Article> { func fetchArticlesWithWhereClause(_ database: FMDatabase, whereClause: String, parameters: [AnyObject]) -> Set<Article> {
let sql = "select * from articles natural join statuses where \(whereClause);" let sql = "select * from articles natural join statuses where \(whereClause);"
return articlesWithSQL(sql, parameters, database)
if let resultSet = database.executeQuery(sql, withArgumentsIn: parameters) {
return articlesWithResultSet(resultSet, database)
}
return Set<Article>()
} }
func fetchArticlesForFeedID(_ feedID: String, database: FMDatabase) -> Set<Article> { func fetchArticlesForFeedID(_ feedID: String, database: FMDatabase) -> Set<Article> {
return fetchArticlesWithWhereClause(database, whereClause: "articles.feedID = ?", parameters: [feedID as AnyObject]) return fetchArticlesWithWhereClause(database, whereClause: "articles.feedID = ?", parameters: [feedID as AnyObject])
} }
func fetchUnreadArticles(_ feedIDs: Set<String>) -> Set<Article> {
if feedIDs.isEmpty {
return Set<Article>()
}
var articles = Set<Article>()
queue.fetchSync { (database) in
// select * from articles natural join statuses where feedID in ('http://ranchero.com/xml/rss.xml') and read=0
let parameters = feedIDs.map { $0 as AnyObject }
let placeholders = NSString.rs_SQLValueList(withPlaceholders: UInt(feedIDs.count))!
let whereClause = "feedID in \(placeholders) and read=0"
articles = self.fetchArticlesWithWhereClause(database, whereClause: whereClause, parameters: parameters)
}
return articleCache.uniquedArticles(articles)
}
func articlesWithSQL(_ sql: String, _ parameters: [AnyObject], _ database: FMDatabase) -> Set<Article> {
guard let resultSet = database.executeQuery(sql, withArgumentsIn: parameters) else {
return Set<Article>()
}
return articlesWithResultSet(resultSet, database)
}
} }
// MARK: - // MARK: -

2
Frameworks/Database/Database.swift
View File

@ -55,7 +55,7 @@ public final class Database {
public func fetchUnreadArticles(for folder: Folder) -> Set<Article> { public func fetchUnreadArticles(for folder: Folder) -> Set<Article> {
return articlesTable.fetchUnreadArticles(folder.flattenedFeeds()) return articlesTable.fetchUnreadArticles(for: folder.flattenedFeeds())
} }
// MARK: - Unread Counts // MARK: - Unread Counts