From 9c761c80df18ba83337a3d713e5056bf75f50c59 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 24 Mar 2021 05:43:07 -0500 Subject: [PATCH] Add an optional limit parameter to the smart feeds. Fixes #2627 --- Account/Sources/Account/Account.swift | 68 +++++++++---------- .../ArticlesDatabase/ArticlesDatabase.swift | 24 +++---- .../ArticlesDatabase/ArticlesTable.swift | 45 +++++++----- Shared/SmartFeeds/StarredFeedDelegate.swift | 2 +- Shared/SmartFeeds/TodayFeedDelegate.swift | 2 +- Shared/SmartFeeds/UnreadFeed.swift | 2 +- 6 files changed, 76 insertions(+), 67 deletions(-) diff --git a/Account/Sources/Account/Account.swift b/Account/Sources/Account/Account.swift index 7acf4816b..6b0cd940c 100644 --- a/Account/Sources/Account/Account.swift +++ b/Account/Sources/Account/Account.swift @@ -53,9 +53,9 @@ public enum AccountType: Int, Codable { } public enum FetchType { - case starred - case unread - case today + case starred(Int?) + case unread(Int?) + case today(Int?) case folder(Folder, Bool) case webFeed(WebFeed) case articleIDs(Set) @@ -674,12 +674,12 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, public func fetchArticles(_ fetchType: FetchType) throws -> Set
{ switch fetchType { - case .starred: - return try fetchStarredArticles() - case .unread: - return try fetchUnreadArticles() - case .today: - return try fetchTodayArticles() + case .starred(let limit): + return try fetchStarredArticles(limit: limit) + case .unread(let limit): + return try fetchUnreadArticles(limit: limit) + case .today(let limit): + return try fetchTodayArticles(limit: limit) case .folder(let folder, let readFilter): if readFilter { return try fetchUnreadArticles(folder: folder) @@ -699,12 +699,12 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container, public func fetchArticlesAsync(_ fetchType: FetchType, _ completion: @escaping ArticleSetResultBlock) { switch fetchType { - case .starred: - fetchStarredArticlesAsync(completion) - case .unread: - fetchUnreadArticlesAsync(completion) - case .today: - fetchTodayArticlesAsync(completion) + case .starred(let limit): + fetchStarredArticlesAsync(limit: limit, completion) + case .unread(let limit): + fetchUnreadArticlesAsync(limit: limit, completion) + case .today(let limit): + fetchTodayArticlesAsync(limit: limit, completion) case .folder(let folder, let readFilter): if readFilter { return fetchUnreadArticlesAsync(folder: folder, completion) @@ -1046,28 +1046,28 @@ extension Account: WebFeedMetadataDelegate { private extension Account { - func fetchStarredArticles() throws -> Set
{ - return try database.fetchStarredArticles(flattenedWebFeeds().webFeedIDs()) + func fetchStarredArticles(limit: Int?) throws -> Set
{ + return try database.fetchStarredArticles(flattenedWebFeeds().webFeedIDs(), limit) } - func fetchStarredArticlesAsync(_ completion: @escaping ArticleSetResultBlock) { - database.fetchedStarredArticlesAsync(flattenedWebFeeds().webFeedIDs(), completion) + func fetchStarredArticlesAsync(limit: Int?, _ completion: @escaping ArticleSetResultBlock) { + database.fetchedStarredArticlesAsync(flattenedWebFeeds().webFeedIDs(), limit, completion) } - func fetchUnreadArticles() throws -> Set
{ - return try fetchUnreadArticles(forContainer: self) + func fetchUnreadArticles(limit: Int?) throws -> Set
{ + return try fetchUnreadArticles(forContainer: self, limit: limit) } - func fetchUnreadArticlesAsync(_ completion: @escaping ArticleSetResultBlock) { - fetchUnreadArticlesAsync(forContainer: self, completion) + func fetchUnreadArticlesAsync(limit: Int?, _ completion: @escaping ArticleSetResultBlock) { + fetchUnreadArticlesAsync(forContainer: self, limit: limit, completion) } - func fetchTodayArticles() throws -> Set
{ - return try database.fetchTodayArticles(flattenedWebFeeds().webFeedIDs()) + func fetchTodayArticles(limit: Int?) throws -> Set
{ + return try database.fetchTodayArticles(flattenedWebFeeds().webFeedIDs(), limit) } - func fetchTodayArticlesAsync(_ completion: @escaping ArticleSetResultBlock) { - database.fetchTodayArticlesAsync(flattenedWebFeeds().webFeedIDs(), completion) + func fetchTodayArticlesAsync(limit: Int?, _ completion: @escaping ArticleSetResultBlock) { + database.fetchTodayArticlesAsync(flattenedWebFeeds().webFeedIDs(), limit, completion) } func fetchArticles(folder: Folder) throws -> Set
{ @@ -1079,11 +1079,11 @@ private extension Account { } func fetchUnreadArticles(folder: Folder) throws -> Set
{ - return try fetchUnreadArticles(forContainer: folder) + return try fetchUnreadArticles(forContainer: folder, limit: nil) } func fetchUnreadArticlesAsync(folder: Folder, _ completion: @escaping ArticleSetResultBlock) { - fetchUnreadArticlesAsync(forContainer: folder, completion) + fetchUnreadArticlesAsync(forContainer: folder, limit: nil, completion) } func fetchArticles(webFeed: WebFeed) throws -> Set
{ @@ -1129,7 +1129,7 @@ private extension Account { } func fetchUnreadArticles(webFeed: WebFeed) throws -> Set
{ - let articles = try database.fetchUnreadArticles(Set([webFeed.webFeedID])) + let articles = try database.fetchUnreadArticles(Set([webFeed.webFeedID]), nil) validateUnreadCount(webFeed, articles) return articles } @@ -1154,16 +1154,16 @@ private extension Account { } } - func fetchUnreadArticles(forContainer container: Container) throws -> Set
{ + func fetchUnreadArticles(forContainer container: Container, limit: Int?) throws -> Set
{ let feeds = container.flattenedWebFeeds() - let articles = try database.fetchUnreadArticles(feeds.webFeedIDs()) + let articles = try database.fetchUnreadArticles(feeds.webFeedIDs(), limit) validateUnreadCountsAfterFetchingUnreadArticles(feeds, articles) return articles } - func fetchUnreadArticlesAsync(forContainer container: Container, _ completion: @escaping ArticleSetResultBlock) { + func fetchUnreadArticlesAsync(forContainer container: Container, limit: Int?, _ completion: @escaping ArticleSetResultBlock) { let webFeeds = container.flattenedWebFeeds() - database.fetchUnreadArticlesAsync(webFeeds.webFeedIDs()) { [weak self] (articleSetResult) in + database.fetchUnreadArticlesAsync(webFeeds.webFeedIDs(), limit) { [weak self] (articleSetResult) in switch articleSetResult { case .success(let articles): self?.validateUnreadCountsAfterFetchingUnreadArticles(webFeeds, articles) diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift b/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift index ddb576ba9..a8e05eea2 100644 --- a/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift +++ b/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift @@ -102,16 +102,16 @@ public final class ArticlesDatabase { return try articlesTable.fetchArticles(articleIDs: articleIDs) } - public func fetchUnreadArticles(_ webFeedIDs: Set) throws -> Set
{ - return try articlesTable.fetchUnreadArticles(webFeedIDs) + public func fetchUnreadArticles(_ webFeedIDs: Set, _ limit: Int?) throws -> Set
{ + return try articlesTable.fetchUnreadArticles(webFeedIDs, limit) } - public func fetchTodayArticles(_ webFeedIDs: Set) throws -> Set
{ - return try articlesTable.fetchArticlesSince(webFeedIDs, todayCutoffDate()) + public func fetchTodayArticles(_ webFeedIDs: Set, _ limit: Int?) throws -> Set
{ + return try articlesTable.fetchArticlesSince(webFeedIDs, todayCutoffDate(), limit) } - public func fetchStarredArticles(_ webFeedIDs: Set) throws -> Set
{ - return try articlesTable.fetchStarredArticles(webFeedIDs) + public func fetchStarredArticles(_ webFeedIDs: Set, _ limit: Int?) throws -> Set
{ + return try articlesTable.fetchStarredArticles(webFeedIDs, limit) } public func fetchArticlesMatching(_ searchString: String, _ webFeedIDs: Set) throws -> Set
{ @@ -136,16 +136,16 @@ public final class ArticlesDatabase { articlesTable.fetchArticlesAsync(articleIDs: articleIDs, completion) } - public func fetchUnreadArticlesAsync(_ webFeedIDs: Set, _ completion: @escaping ArticleSetResultBlock) { - articlesTable.fetchUnreadArticlesAsync(webFeedIDs, completion) + public func fetchUnreadArticlesAsync(_ webFeedIDs: Set, _ limit: Int?, _ completion: @escaping ArticleSetResultBlock) { + articlesTable.fetchUnreadArticlesAsync(webFeedIDs, limit, completion) } - public func fetchTodayArticlesAsync(_ webFeedIDs: Set, _ completion: @escaping ArticleSetResultBlock) { - articlesTable.fetchArticlesSinceAsync(webFeedIDs, todayCutoffDate(), completion) + public func fetchTodayArticlesAsync(_ webFeedIDs: Set, _ limit: Int?, _ completion: @escaping ArticleSetResultBlock) { + articlesTable.fetchArticlesSinceAsync(webFeedIDs, todayCutoffDate(), limit, completion) } - public func fetchedStarredArticlesAsync(_ webFeedIDs: Set, _ completion: @escaping ArticleSetResultBlock) { - articlesTable.fetchStarredArticlesAsync(webFeedIDs, completion) + public func fetchedStarredArticlesAsync(_ webFeedIDs: Set, _ limit: Int?, _ completion: @escaping ArticleSetResultBlock) { + articlesTable.fetchStarredArticlesAsync(webFeedIDs, limit, completion) } public func fetchArticlesMatchingAsync(_ searchString: String, _ webFeedIDs: Set, _ completion: @escaping ArticleSetResultBlock) { diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift b/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift index 61c2845ef..9518a6b84 100644 --- a/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift +++ b/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift @@ -75,32 +75,32 @@ final class ArticlesTable: DatabaseTable { // MARK: - Fetching Unread Articles - func fetchUnreadArticles(_ webFeedIDs: Set) throws -> Set
{ - return try fetchArticles{ self.fetchUnreadArticles(webFeedIDs, $0) } + func fetchUnreadArticles(_ webFeedIDs: Set, _ limit: Int?) throws -> Set
{ + return try fetchArticles{ self.fetchUnreadArticles(webFeedIDs, limit, $0) } } - func fetchUnreadArticlesAsync(_ webFeedIDs: Set, _ completion: @escaping ArticleSetResultBlock) { - fetchArticlesAsync({ self.fetchUnreadArticles(webFeedIDs, $0) }, completion) + func fetchUnreadArticlesAsync(_ webFeedIDs: Set, _ limit: Int?, _ completion: @escaping ArticleSetResultBlock) { + fetchArticlesAsync({ self.fetchUnreadArticles(webFeedIDs, limit, $0) }, completion) } // MARK: - Fetching Today Articles - func fetchArticlesSince(_ webFeedIDs: Set, _ cutoffDate: Date) throws -> Set
{ - return try fetchArticles{ self.fetchArticlesSince(webFeedIDs, cutoffDate, $0) } + func fetchArticlesSince(_ webFeedIDs: Set, _ cutoffDate: Date, _ limit: Int?) throws -> Set
{ + return try fetchArticles{ self.fetchArticlesSince(webFeedIDs, cutoffDate, limit, $0) } } - func fetchArticlesSinceAsync(_ webFeedIDs: Set, _ cutoffDate: Date, _ completion: @escaping ArticleSetResultBlock) { - fetchArticlesAsync({ self.fetchArticlesSince(webFeedIDs, cutoffDate, $0) }, completion) + func fetchArticlesSinceAsync(_ webFeedIDs: Set, _ cutoffDate: Date, _ limit: Int?, _ completion: @escaping ArticleSetResultBlock) { + fetchArticlesAsync({ self.fetchArticlesSince(webFeedIDs, cutoffDate, limit, $0) }, completion) } // MARK: - Fetching Starred Articles - func fetchStarredArticles(_ webFeedIDs: Set) throws -> Set
{ - return try fetchArticles{ self.fetchStarredArticles(webFeedIDs, $0) } + func fetchStarredArticles(_ webFeedIDs: Set, _ limit: Int?) throws -> Set
{ + return try fetchArticles{ self.fetchStarredArticles(webFeedIDs, limit, $0) } } - func fetchStarredArticlesAsync(_ webFeedIDs: Set, _ completion: @escaping ArticleSetResultBlock) { - fetchArticlesAsync({ self.fetchStarredArticles(webFeedIDs, $0) }, completion) + func fetchStarredArticlesAsync(_ webFeedIDs: Set, _ limit: Int?, _ completion: @escaping ArticleSetResultBlock) { + fetchArticlesAsync({ self.fetchStarredArticles(webFeedIDs, limit, $0) }, completion) } // MARK: - Fetching Search Articles @@ -819,14 +819,17 @@ private extension ArticlesTable { return fetchArticlesWithWhereClause(database, whereClause: whereClause, parameters: parameters) } - func fetchUnreadArticles(_ webFeedIDs: Set, _ database: FMDatabase) -> Set
{ + func fetchUnreadArticles(_ webFeedIDs: Set, _ limit: Int?, _ database: FMDatabase) -> Set
{ // select * from articles natural join statuses where feedID in ('http://ranchero.com/xml/rss.xml') and read=0 if webFeedIDs.isEmpty { return Set
() } let parameters = webFeedIDs.map { $0 as AnyObject } let placeholders = NSString.rs_SQLValueList(withPlaceholders: UInt(webFeedIDs.count))! - let whereClause = "feedID in \(placeholders) and read=0" + var whereClause = "feedID in \(placeholders) and read=0" + if let limit = limit { + whereClause.append(" order by coalesce(datePublished, dateModified, dateArrived) desc limit \(limit)") + } return fetchArticlesWithWhereClause(database, whereClause: whereClause, parameters: parameters) } @@ -844,7 +847,7 @@ private extension ArticlesTable { return fetchArticlesWithWhereClause(database, whereClause: whereClause, parameters: parameters) } - func fetchArticlesSince(_ webFeedIDs: Set, _ cutoffDate: Date, _ database: FMDatabase) -> Set
{ + func fetchArticlesSince(_ webFeedIDs: Set, _ cutoffDate: Date, _ limit: Int?, _ database: FMDatabase) -> Set
{ // select * from articles natural join statuses where feedID in ('http://ranchero.com/xml/rss.xml') and (datePublished > ? || (datePublished is null and dateArrived > ?) // // datePublished may be nil, so we fall back to dateArrived. @@ -853,18 +856,24 @@ private extension ArticlesTable { } let parameters = webFeedIDs.map { $0 as AnyObject } + [cutoffDate as AnyObject, cutoffDate as AnyObject] let placeholders = NSString.rs_SQLValueList(withPlaceholders: UInt(webFeedIDs.count))! - let whereClause = "feedID in \(placeholders) and (datePublished > ? or (datePublished is null and dateArrived > ?))" + var whereClause = "feedID in \(placeholders) and (datePublished > ? or (datePublished is null and dateArrived > ?))" + if let limit = limit { + whereClause.append(" order by coalesce(datePublished, dateModified, dateArrived) desc limit \(limit)") + } return fetchArticlesWithWhereClause(database, whereClause: whereClause, parameters: parameters) } - func fetchStarredArticles(_ webFeedIDs: Set, _ database: FMDatabase) -> Set
{ + func fetchStarredArticles(_ webFeedIDs: Set, _ limit: Int?, _ database: FMDatabase) -> Set
{ // select * from articles natural join statuses where feedID in ('http://ranchero.com/xml/rss.xml') and starred=1; if webFeedIDs.isEmpty { return Set
() } let parameters = webFeedIDs.map { $0 as AnyObject } let placeholders = NSString.rs_SQLValueList(withPlaceholders: UInt(webFeedIDs.count))! - let whereClause = "feedID in \(placeholders) and starred=1" + var whereClause = "feedID in \(placeholders) and starred=1" + if let limit = limit { + whereClause.append(" order by coalesce(datePublished, dateModified, dateArrived) desc limit \(limit)") + } return fetchArticlesWithWhereClause(database, whereClause: whereClause, parameters: parameters) } diff --git a/Shared/SmartFeeds/StarredFeedDelegate.swift b/Shared/SmartFeeds/StarredFeedDelegate.swift index 251e72cd5..55770fe36 100644 --- a/Shared/SmartFeeds/StarredFeedDelegate.swift +++ b/Shared/SmartFeeds/StarredFeedDelegate.swift @@ -21,7 +21,7 @@ struct StarredFeedDelegate: SmartFeedDelegate { } let nameForDisplay = NSLocalizedString("Starred", comment: "Starred pseudo-feed title") - let fetchType: FetchType = .starred + let fetchType: FetchType = .starred(nil) var smallIcon: IconImage? { return AppAssets.starredFeedImage } diff --git a/Shared/SmartFeeds/TodayFeedDelegate.swift b/Shared/SmartFeeds/TodayFeedDelegate.swift index 085a43777..ad6e47977 100644 --- a/Shared/SmartFeeds/TodayFeedDelegate.swift +++ b/Shared/SmartFeeds/TodayFeedDelegate.swift @@ -19,7 +19,7 @@ struct TodayFeedDelegate: SmartFeedDelegate { } let nameForDisplay = NSLocalizedString("Today", comment: "Today pseudo-feed title") - let fetchType = FetchType.today + let fetchType = FetchType.today(nil) var smallIcon: IconImage? { return AppAssets.todayFeedImage } diff --git a/Shared/SmartFeeds/UnreadFeed.swift b/Shared/SmartFeeds/UnreadFeed.swift index 4ef22635b..f8ce3660c 100644 --- a/Shared/SmartFeeds/UnreadFeed.swift +++ b/Shared/SmartFeeds/UnreadFeed.swift @@ -29,7 +29,7 @@ final class UnreadFeed: PseudoFeed { } let nameForDisplay = NSLocalizedString("All Unread", comment: "All Unread pseudo-feed title") - let fetchType = FetchType.unread + let fetchType = FetchType.unread(nil) var unreadCount = 0 { didSet {