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

Merge articles instead of replacing them for add remove feed and account functions. Issue #1692

Browse Source
This commit is contained in:
Maurice Parker 2020-01-23 18:07:20 -07:00
parent 9f8c0ac2a6
commit aa94fbeacf
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
iOS/SceneCoordinator.swift
View File

@ -454,9 +454,13 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
@objc func containerChildrenDidChange(_ note: Notification) { @objc func containerChildrenDidChange(_ note: Notification) {
if timelineFetcherContainsAnyPseudoFeed() || timelineFetcherContainsAnyFolder() { if timelineFetcherContainsAnyPseudoFeed() || timelineFetcherContainsAnyFolder() {
refreshTimeline(resetScroll: false) fetchAndMergeArticlesAsync(animated: true) {
self.masterTimelineViewController?.reinitializeArticles(resetScroll: false)
self.rebuildBackingStores()
}
} else {
rebuildBackingStores()
} }
rebuildBackingStores()
} }
@objc func batchUpdateDidPerform(_ notification: Notification) { @objc func batchUpdateDidPerform(_ notification: Notification) {
@ -477,7 +481,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
} }
if timelineFetcherContainsAnyPseudoFeed() { if timelineFetcherContainsAnyPseudoFeed() {
fetchAndReplaceArticlesAsync(animated: true) { fetchAndMergeArticlesAsync(animated: true) {
self.masterTimelineViewController?.reinitializeArticles(resetScroll: false) self.masterTimelineViewController?.reinitializeArticles(resetScroll: false)
self.rebuildBackingStores() { self.rebuildBackingStores() {
expandNewlyActivatedAccount() expandNewlyActivatedAccount()
@ -500,7 +504,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
} }
if timelineFetcherContainsAnyPseudoFeed() { if timelineFetcherContainsAnyPseudoFeed() {
fetchAndReplaceArticlesAsync(animated: true) { fetchAndMergeArticlesAsync(animated: true) {
self.masterTimelineViewController?.reinitializeArticles(resetScroll: false) self.masterTimelineViewController?.reinitializeArticles(resetScroll: false)
self.rebuildBackingStores() { self.rebuildBackingStores() {
expandNewAccount() expandNewAccount()
@ -522,7 +526,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
} }
if timelineFetcherContainsAnyPseudoFeed() { if timelineFetcherContainsAnyPseudoFeed() {
fetchAndReplaceArticlesAsync(animated: true) { fetchAndMergeArticlesAsync(animated: true) {
self.masterTimelineViewController?.reinitializeArticles(resetScroll: false) self.masterTimelineViewController?.reinitializeArticles(resetScroll: false)
self.rebuildBackingStores() { self.rebuildBackingStores() {
cleanupAccount() cleanupAccount()
@ -1556,10 +1560,14 @@ private extension SceneCoordinator {
} }
func queueFetchAndMergeArticles() { func queueFetchAndMergeArticles() {
fetchAndMergeArticlesQueue.add(self, #selector(fetchAndMergeArticles)) fetchAndMergeArticlesQueue.add(self, #selector(fetchAndMergeArticlesAsync))
} }
@objc func fetchAndMergeArticles() { @objc func fetchAndMergeArticlesAsync() {
fetchAndMergeArticlesAsync(animated: true, completion: nil)
}
func fetchAndMergeArticlesAsync(animated: Bool = true, completion: (() -> Void)? = nil) {
guard let timelineFeed = timelineFeed else { guard let timelineFeed = timelineFeed else {
return return
@ -1576,9 +1584,13 @@ private extension SceneCoordinator {
if !unsortedArticleIDs.contains(article.articleID) { if !unsortedArticleIDs.contains(article.articleID) {
updatedArticles.insert(article) updatedArticles.insert(article)
} }
if article.account?.existingWebFeed(withWebFeedID: article.webFeedID) == nil {
updatedArticles.remove(article)
}
} }
strongSelf.replaceArticles(with: updatedArticles, animated: true) strongSelf.replaceArticles(with: updatedArticles, animated: animated)
completion?()
} }
} }