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

Delete no-longer-used fetchStarredAndUnreadCount completion block version.

This commit is contained in:
Brent Simmons 2024-04-03 21:53:11 -07:00
parent 2eeb0050e2
commit f0634d7ab0
3 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Account/Sources/Account/Account.swift
View File

@ -749,10 +749,6 @@ public enum FetchType {
try await database.starredAndUnreadCount(feedIDs: allFeedIDs()) ?? 0
}
public func fetchUnreadCountForStarredArticles(_ completion: @escaping SingleUnreadCountCompletionBlock) {
database.fetchStarredAndUnreadCount(for: flattenedFeeds().feedIDs(), completion: completion)
}
public func fetchUnreadArticleIDs(_ completion: @escaping ArticleIDsCompletionBlock) {
database.fetchUnreadArticleIDsAsync(completion: completion)
}
@ -1402,7 +1398,6 @@ extension Account {
public func existingFeed(withExternalID externalID: String) -> Feed? {
return externalIDToFeedDictionary[externalID]
}
}
// MARK: - OPMLRepresentable

24
ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabaseCompatibility.swift
View File

@ -14,9 +14,6 @@ import Articles
// This file exists for compatibility — it provides nonisolated functions and callback-based APIs.
// It will go away as we adopt structured concurrency.
public typealias SingleUnreadCountResult = Result<Int, DatabaseError>
public typealias SingleUnreadCountCompletionBlock = @Sendable (SingleUnreadCountResult) -> Void
public typealias UpdateArticlesResult = Result<ArticleChanges, DatabaseError>
public typealias UpdateArticlesCompletionBlock = @Sendable (UpdateArticlesResult) -> Void
@ -31,20 +28,6 @@ public typealias ArticleStatusesResultBlock = (ArticleStatusesResult) -> Void
public extension ArticlesDatabase {
// MARK: - Unread Counts
nonisolated func fetchStarredAndUnreadCount(for feedIDs: Set<String>, completion: @escaping SingleUnreadCountCompletionBlock) {
Task {
do {
let unreadCount = try await starredAndUnreadCount(feedIDs: feedIDs)!
callSingleUnreadCountCompletion(completion, .success(unreadCount))
} catch {
callSingleUnreadCountCompletion(completion, .failure(.suspended))
}
}
}
// MARK: - Saving, Updating, and Deleting Articles
/// Update articles and save new ones — for feed-based systems (local and iCloud).
@ -165,13 +148,6 @@ public extension ArticlesDatabase {
}
}
nonisolated private func callSingleUnreadCountCompletion(_ completion: @escaping SingleUnreadCountCompletionBlock, _ result: SingleUnreadCountResult) {
Task { @MainActor in
completion(result)
}
}
nonisolated private func callUpdateArticlesCompletion(_ completion: @escaping UpdateArticlesCompletionBlock, _ result: UpdateArticlesResult) {
Task { @MainActor in

4
Shared/SmartFeeds/StarredFeedDelegate.swift
View File

@ -29,8 +29,4 @@ import Account
(try? await account.unreadCountForStarredArticles()) ?? 0
}
func fetchUnreadCount(for account: Account, completion: @escaping SingleUnreadCountCompletionBlock) {
account.fetchUnreadCountForStarredArticles(completion)
}
}