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

Create and use a fetchAndMergeArticlesQueue (coalescing queue) for TimelineViewController.

Browse Source
This commit is contained in:
Brent Simmons 2018-02-17 15:29:55 -08:00
parent b3ea268807
commit c8fa1b71d9
2 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Evergreen/MainWindow/MainWindowController.swift
View File

@ -132,7 +132,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
// MARK: Toolbar // MARK: Toolbar
@objc func makeToolbarValidate(_ sender: Any?) { @objc func makeToolbarValidate() {
window?.toolbar?.validateVisibleItems() window?.toolbar?.validateVisibleItems()
} }

62
Evergreen/MainWindow/Timeline/TimelineViewController.swift
View File

@ -57,7 +57,7 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
} }
private var didRegisterForNotifications = false private var didRegisterForNotifications = false
private var fetchAndMergeArticlesTimer: Timer? static let fetchAndMergeArticlesQueue = CoalescingQueue(name: "Fetch and Merge Articles", interval: 0.5)
private var sortDirection = AppDefaults.shared.timelineSortDirection { private var sortDirection = AppDefaults.shared.timelineSortDirection {
didSet { didSet {
@ -451,6 +451,28 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
rowHeightWithoutFeedName = calculateRowHeight(showingFeedNames: false) rowHeightWithoutFeedName = calculateRowHeight(showingFeedNames: false)
updateTableViewRowHeight() updateTableViewRowHeight()
} }
@objc func fetchAndMergeArticles() {
guard let representedObjects = representedObjects else {
return
}
performBlockAndRestoreSelection {
var unsortedArticles = fetchUnsortedArticles(for: representedObjects)
// Merge articles by articleID. For any unique articleID in current articles, add to unsortedArticles.
let unsortedArticleIDs = unsortedArticles.articleIDs()
for article in articles {
if !unsortedArticleIDs.contains(article.articleID) {
unsortedArticles.insert(article)
}
}
updateArticles(with: unsortedArticles)
}
}
} }
// MARK: NSUserInterfaceValidations // MARK: NSUserInterfaceValidations
@ -690,28 +712,6 @@ private extension TimelineViewController {
return fetchedArticles return fetchedArticles
} }
func fetchAndMergeArticles() {
guard let representedObjects = representedObjects else {
return
}
performBlockAndRestoreSelection {
var unsortedArticles = fetchUnsortedArticles(for: representedObjects)
// Merge articles by articleID. For any unique articleID in current articles, add to unsortedArticles.
let unsortedArticleIDs = unsortedArticles.articleIDs()
for article in articles {
if !unsortedArticleIDs.contains(article.articleID) {
unsortedArticles.insert(article)
}
}
updateArticles(with: unsortedArticles)
}
}
func selectArticles(_ articleIDs: [String]) { func selectArticles(_ articleIDs: [String]) {
let indexesToSelect = articles.indexesForArticleIDs(Set(articleIDs)) let indexesToSelect = articles.indexesForArticleIDs(Set(articleIDs))
@ -722,23 +722,9 @@ private extension TimelineViewController {
tableView.selectRowIndexes(indexesToSelect, byExtendingSelection: false) tableView.selectRowIndexes(indexesToSelect, byExtendingSelection: false)
} }
func invalidateFetchAndMergeArticlesTimer() {
if let timer = fetchAndMergeArticlesTimer {
if timer.isValid {
timer.invalidate()
}
fetchAndMergeArticlesTimer = nil
}
}
func queueFetchAndMergeArticles() { func queueFetchAndMergeArticles() {
invalidateFetchAndMergeArticlesTimer() TimelineViewController.fetchAndMergeArticlesQueue.add(self, #selector(fetchAndMergeArticles))
fetchAndMergeArticlesTimer = Timer.scheduledTimer(withTimeInterval: 0.5, repeats: false) { (timer) in
self.fetchAndMergeArticles()
self.invalidateFetchAndMergeArticlesTimer()
}
} }
func representedObjectArraysAreEqual(_ objects1: [AnyObject]?, _ objects2: [AnyObject]?) -> Bool { func representedObjectArraysAreEqual(_ objects1: [AnyObject]?, _ objects2: [AnyObject]?) -> Bool {