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

Working implementations

Browse Source
This commit is contained in:
Bryan Culver
2022-12-07 00:30:19 -05:00
parent 002f3e87fd
commit 35a6cf551b
16 changed files with 319 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Shared/SmartFeeds/SearchFeedDelegate.swift
View File

@@ -35,5 +35,10 @@ struct SearchFeedDelegate: SmartFeedDelegate {
func fetchUnreadCount(for: Account, completion: @escaping SingleUnreadCountCompletionBlock) {
// TODO: after 5.0
}
func fetchUnreadArticlesBetween(before: Date? = nil, after: Date? = nil) throws -> Set<Article> {
// TODO FILTER BY SEARCH
return try AccountManager.shared.fetchUnreadArticlesBetween(limit: nil, before: before, after: after)
}
}

5
Shared/SmartFeeds/SearchTimelineFeedDelegate.swift
View File

@@ -35,4 +35,9 @@ struct SearchTimelineFeedDelegate: SmartFeedDelegate {
func fetchUnreadCount(for: Account, completion: @escaping SingleUnreadCountCompletionBlock) {
// TODO: after 5.0
}
func fetchUnreadArticlesBetween(before: Date? = nil, after: Date? = nil) throws -> Set<Article> {
// TODO FILTER BY SEARCH
return try AccountManager.shared.fetchUnreadArticlesBetween(limit: nil, before: before, after: after)
}
}

2
Shared/SmartFeeds/SmartFeed.swift
View File

@@ -46,7 +46,7 @@ final class SmartFeed: PseudoFeed {
}
#endif
private let delegate: SmartFeedDelegate
public let delegate: SmartFeedDelegate
private var unreadCounts = [String: Int]()
init(delegate: SmartFeedDelegate) {

2
Shared/SmartFeeds/SmartFeedDelegate.swift
View File

@@ -32,7 +32,7 @@ extension SmartFeedDelegate {
}
func fetchUnreadArticlesBetween(before: Date? = nil, after: Date? = nil) throws -> Set<Article> {
return try fetchArticles().unreadArticlesBetween(before: before, after: after)
return try AccountManager.shared.fetchUnreadArticlesBetween(limit: nil, before: before, after: after)
}
func fetchUnreadArticlesAsync(_ completion: @escaping ArticleSetResultBlock) {

5
Shared/SmartFeeds/StarredFeedDelegate.swift
View File

@@ -29,4 +29,9 @@ struct StarredFeedDelegate: SmartFeedDelegate {
func fetchUnreadCount(for account: Account, completion: @escaping SingleUnreadCountCompletionBlock) {
account.fetchUnreadCountForStarredArticles(completion)
}
func fetchUnreadArticlesBetween(before: Date? = nil, after: Date? = nil) throws -> Set<Article> {
// TODO FILTER BY STARRED
return try AccountManager.shared.fetchUnreadArticlesBetween(limit: nil, before: before, after: after)
}
}

6
Shared/SmartFeeds/UnreadFeed.swift
View File

@@ -73,13 +73,13 @@ extension UnreadFeed: ArticleFetcher {
func fetchArticlesAsync(_ completion: @escaping ArticleSetResultBlock) {
fetchUnreadArticlesAsync(completion)
}
func fetchUnreadArticles() throws -> Set<Article> {
return try AccountManager.shared.fetchArticles(fetchType)
}
func fetchUnreadArticlesBetween(before: Date? = nil, after: Date? = nil) throws -> Set<Article> {
return try AccountManager.shared.fetchArticles(fetchType)
return try AccountManager.shared.fetchUnreadArticlesBetween(limit: nil, before: before, after: after)
}
func fetchUnreadArticlesAsync(_ completion: @escaping ArticleSetResultBlock) {