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

Add article state restoration.

This commit is contained in:
Maurice Parker 2020-03-04 18:16:58 -07:00
parent de38ba9f5b
commit adb312bccb
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mac/MainWindow/Sidebar/SidebarViewController.swift
View File

@ -124,6 +124,7 @@ protocol SidebarDelegate: class {
treeController.visitNodes(selectFeedsVisitor(node:)) treeController.visitNodes(selectFeedsVisitor(node:))
outlineView.selectRowIndexes(selectIndexes, byExtendingSelection: false) outlineView.selectRowIndexes(selectIndexes, byExtendingSelection: false)
focus()
isReadFiltered = coder.decodeBool(forKey: UserInfoKey.readFeedsFilterState) isReadFiltered = coder.decodeBool(forKey: UserInfoKey.readFeedsFilterState)
} }

24
Mac/MainWindow/Timeline/TimelineViewController.swift
View File

@ -253,6 +253,10 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
readArticlesFilterState[key.userInfo] = readFilterEnabledTable[key] readArticlesFilterState[key.userInfo] = readFilterEnabledTable[key]
} }
coder.encode(readArticlesFilterState, forKey: UserInfoKey.readArticlesFilterState) coder.encode(readArticlesFilterState, forKey: UserInfoKey.readArticlesFilterState)
if selectedArticles.count == 1 {
coder.encode(selectedArticles.first!.pathUserInfo, forKey: UserInfoKey.articlePath)
}
} }
func restoreState(from coder: NSCoder) { func restoreState(from coder: NSCoder) {
@ -263,6 +267,25 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
} }
} }
} }
guard let articlePathUserInfo = try? coder.decodeTopLevelObject(forKey: UserInfoKey.articlePath) as? [AnyHashable : Any],
let accountID = articlePathUserInfo[ArticlePathKey.accountID] as? String,
let account = AccountManager.shared.existingAccount(with: accountID),
let articleID = articlePathUserInfo[ArticlePathKey.articleID] as? String else {
return
}
if isReadFiltered ?? true {
exceptionArticleFetcher = SingleArticleFetcher(account: account, articleID: articleID)
fetchAndReplaceArticlesSync()
}
if let selectedIndex = articles.firstIndex(where: { $0.articleID == articleID }) {
tableView.selectRow(selectedIndex)
tableView.scrollTo(row: selectedIndex)
focus()
}
} }
// MARK: - Actions // MARK: - Actions
@ -783,6 +806,7 @@ extension TimelineViewController: NSTableViewDelegate {
private func selectionDidChange(_ selectedArticles: ArticleArray?) { private func selectionDidChange(_ selectedArticles: ArticleArray?) {
delegate?.timelineSelectionDidChange(self, selectedArticles: selectedArticles) delegate?.timelineSelectionDidChange(self, selectedArticles: selectedArticles)
delegate?.timelineInvalidatedRestorationState(self)
} }
private func configureTimelineCell(_ cell: TimelineTableCellView, article: Article) { private func configureTimelineCell(_ cell: TimelineTableCellView, article: Article) {