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

Create fetchParsedItems function.

Browse Source
This commit is contained in:
Brent Simmons 2024-04-27 11:41:18 -07:00
parent db69ddd209
commit 3612b1e8fd
2 changed files with 58 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift
View File

@ -59,8 +59,8 @@ final class FeedlyAccountDelegate: AccountDelegate {
/// Set on `accountDidInitialize` for the purposes of refreshing OAuth tokens when they expire.
/// See the implementation for `FeedlyAPICallerDelegate`.
private weak var initializedAccount: Account?
private weak var account: Account?
internal let caller: FeedlyAPICaller
private let log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "Feedly")
@ -598,7 +598,7 @@ final class FeedlyAccountDelegate: AccountDelegate {
}
func accountDidInitialize(_ account: Account) {
initializedAccount = account
self.account = account
credentials = try? account.retrieveCredentials(type: .oauthAccessToken)
}
@ -640,10 +640,12 @@ final class FeedlyAccountDelegate: AccountDelegate {
return articleIDs
}
func updateAccountFeedsWithItems(account: Account, feedIDsAndItems: [String: Set<ParsedItem>]) async throws {
func updateAccountFeedsWithItems(feedIDsAndItems: [String: Set<ParsedItem>]) async throws {
// To replace FeedlyUpdateAccountFeedsWithItemsOperation
guard let account else { return }
try await account.update(feedIDsAndItems: feedIDsAndItems, defaultRead: true)
os_log(.debug, log: self.log, "Updated %i feeds", feedIDsAndItems.count)
}
@ -666,6 +668,21 @@ final class FeedlyAccountDelegate: AccountDelegate {
}
}
func addFeedToCollection(feedResource: FeedlyFeedResourceID, feedName: String? = nil, collectionID: String, folder: Folder) async throws -> [([FeedlyFeed], Folder)] {
// To replace FeedlyAddFeedToCollectionOperation
let feedlyFeeds = try await caller.addFeed(with: feedResource, title: feedName, toCollectionWith: collectionID)
let feedsWithCreatedFeedID = feedlyFeeds.filter { $0.id == feedResource.id }
if feedsWithCreatedFeedID.isEmpty {
throw AccountError.createErrorNotFound
}
let feedsAndFolders = [(feedlyFeeds, folder)]
return feedsAndFolders
}
func parsedItemsKeyedByFeedURL(_ parsedItems: Set<ParsedItem>) -> [String: Set<ParsedItem>] {
// To replace FeedlyOrganiseParsedItemsByFeedOperation
@ -688,22 +705,45 @@ final class FeedlyAccountDelegate: AccountDelegate {
return d
}
func addFeedToCollection(feedResource: FeedlyFeedResourceID, feedName: String? = nil, collectionID: String, folder: Folder) async throws -> [([FeedlyFeed], Folder)] {
func downloadArticles(missingArticleIDs: Set<String>, updatedArticleIDs: Set<String>) async throws {
// To replace FeedlyAddFeedToCollectionOperation
// To replace FeedlyDownloadArticlesOperation
let allArticleIDs = missingArticleIDs.union(updatedArticleIDs)
let feedlyFeeds = try await caller.addFeed(with: feedResource, title: feedName, toCollectionWith: collectionID)
os_log(.debug, log: log, "Requesting %{public}i articles.", allArticleIDs.count)
let feedsWithCreatedFeedID = feedlyFeeds.filter { $0.id == feedResource.id }
if feedsWithCreatedFeedID.isEmpty {
throw AccountError.createErrorNotFound
let feedlyAPILimitBatchSize = 1000
for articleIDs in Array(allArticleIDs).chunked(into: feedlyAPILimitBatchSize) {
let parsedItems = try await fetchParsedItems(articleIDs: Set(articleIDs))
let feedIDsAndItems = parsedItemsKeyedByFeedURL(parsedItems)
try await updateAccountFeedsWithItems(feedIDsAndItems: feedIDsAndItems)
}
let feedsAndFolders = [(feedlyFeeds, folder)]
return feedsAndFolders
}
func fetchParsedItems(articleIDs: Set<String>) async throws -> Set<ParsedItem> {
// To replace FeedlyGetEntriesOperation
do {
let entries = try await caller.getEntries(for: articleIDs)
// TODO: convert directly from FeedlyEntry to ParsedItem without having to use FeedlyEntryParser.
let parsedItems = Set(entries.compactMap {
FeedlyEntryParser(entry: $0).parsedItemRepresentation
})
return parsedItems
} catch {
os_log(.debug, log: self.log, "Unable to get entries: %{public}@.", error as NSError)
throw error
}
}
// MARK: Suspend and Resume (for iOS)
/// Suspend all network activity
@ -734,7 +774,7 @@ extension FeedlyAccountDelegate: FeedlyAPICallerDelegate {
@MainActor func reauthorizeFeedlyAPICaller(_ caller: FeedlyAPICaller) async -> Bool {
guard let account = initializedAccount else {
guard let account else {
return false
}

4
Feedly/Sources/Feedly/FeedlyModel.swift
View File

@ -238,6 +238,10 @@ public struct FeedlyEntryParser: Sendable {
tags: tags,
attachments: attachments)
}
public init(entry: FeedlyEntry) {
self.entry = entry
}
}
public struct FeedlyFeed: Codable, Sendable {