FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1137 from kielgillard/master

Browse Source 
Feedly: removes redundant mapping of articles to feed IDs.
This commit is contained in:
Maurice Parker 2019-10-16 07:34:07 -05:00 committed by GitHub
commit d2428e876b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Frameworks/Account/Feedly/Refresh/FeedlyOrganiseParsedItemsByFeedOperation.swift
View File

@ -12,8 +12,7 @@ import os.log
protocol FeedlyParsedItemsByFeedProviding { protocol FeedlyParsedItemsByFeedProviding {
var providerName: String { get } var providerName: String { get }
var allFeeds: Set<Feed> { get } var parsedItemsKeyedByFeedId: [String: Set<ParsedItem>] { get }
func parsedItems(for feed: Feed) -> Set<ParsedItem>?
} }
/// Single responsibility is to group articles by their feeds. /// Single responsibility is to group articles by their feeds.
@ -22,15 +21,9 @@ final class FeedlyOrganiseParsedItemsByFeedOperation: FeedlyOperation, FeedlyPar
private let entryProvider: FeedlyEntryProviding private let entryProvider: FeedlyEntryProviding
private let log: OSLog private let log: OSLog
var allFeeds: Set<Feed> { var parsedItemsKeyedByFeedId: [String : Set<ParsedItem>] {
assert(Thread.isMainThread) // Needs to be on main thread because Feed is a main-thread-only model type. assert(Thread.isMainThread) // Needs to be on main thread because Feed is a main-thread-only model type.
let keys = Set(itemsKeyedByFeedId.keys) return itemsKeyedByFeedId
return account.flattenedFeeds().filter { keys.contains($0.feedID) }
}
func parsedItems(for feed: Feed) -> Set<ParsedItem>? {
assert(Thread.isMainThread) // Needs to be on main thread because Feed is a main-thread-only model type.
return itemsKeyedByFeedId[feed.feedID]
} }
var providerName: String { var providerName: String {

13
Frameworks/Account/Feedly/Refresh/FeedlyUpdateAccountFeedsWithItemsOperation.swift
View File

@ -29,19 +29,10 @@ final class FeedlyUpdateAccountFeedsWithItemsOperation: FeedlyOperation {
return return
} }
let allFeeds = organisedItemsProvider.allFeeds let feedIDsAndItems = organisedItemsProvider.parsedItemsKeyedByFeedId
os_log(.debug, log: log, "Begin updating %i feeds for \"%@\"", allFeeds.count, organisedItemsProvider.providerName)
var feedIDsAndItems = [String: Set<ParsedItem>]()
for feed in allFeeds {
guard let items = organisedItemsProvider.parsedItems(for: feed) else {
continue
}
feedIDsAndItems[feed.feedID] = items
}
account.update(feedIDsAndItems: feedIDsAndItems, defaultRead: true) { account.update(feedIDsAndItems: feedIDsAndItems, defaultRead: true) {
os_log(.debug, log: self.log, "Finished updating feeds for \"%@\"", self.organisedItemsProvider.providerName) os_log(.debug, log: self.log, "Updated %i feeds for \"%@\"", feedIDsAndItems.count, self.organisedItemsProvider.providerName)
self.didFinish() self.didFinish()
} }
} }