renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename Article.webFeed to Article.feed.

Browse Source
This commit is contained in:
Brent Simmons
2023-07-02 16:22:14 -07:00
parent bb450ababa
commit 75f1eee00c
21 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Mac/MainWindow/MainWindowController.swift
View File

@@ -576,7 +576,7 @@ enum TimelineSourceMode {
}
@objc func showArticleExtractorMenu(_ button: NSButton) {
guard oneSelectedArticle?.webFeed != nil else {
guard oneSelectedArticle?.feed != nil else {
return
}
@@ -587,7 +587,7 @@ enum TimelineSourceMode {
alwaysUseReaderViewItem.target = self
alwaysUseReaderViewItem.action = #selector(alwaysUseReaderView)
alwaysUseReaderViewItem.state = {
if oneSelectedArticle?.webFeed?.isArticleExtractorAlwaysOn ?? false {
if oneSelectedArticle?.feed?.isArticleExtractorAlwaysOn ?? false {
return NSControl.StateValue.on
} else {
return NSControl.StateValue.off
@@ -600,7 +600,7 @@ enum TimelineSourceMode {
}
@objc func alwaysUseReaderView() {
guard let feed = oneSelectedArticle?.webFeed else {
guard let feed = oneSelectedArticle?.feed else {
return
}
@@ -689,7 +689,7 @@ extension MainWindowController: TimelineContainerViewControllerDelegate {
if let articles = articles {
if articles.count == 1 {
activityManager.reading(feed: nil, article: articles.first)
if articles.first?.webFeed?.isArticleExtractorAlwaysOn ?? false {
if articles.first?.feed?.isArticleExtractorAlwaysOn ?? false {
detailState = .loading
startArticleExtractorForCurrentLink()
} else {
@@ -1191,7 +1191,7 @@ private extension MainWindowController {
return currentLink != nil
}
if currentTimelineViewController?.selectedArticles.first?.webFeed != nil {
if currentTimelineViewController?.selectedArticles.first?.feed != nil {
toolbarButton.isEnabled = true
}

4
Mac/MainWindow/Timeline/ArticlePasteboardWriter.swift
View File

@@ -96,7 +96,7 @@ private extension ArticlePasteboardWriter {
s += "Date: \(article.logicalDatePublished)\n\n"
if let feed = article.webFeed {
if let feed = article.feed {
s += "Feed: \(feed.nameForDisplay)\n"
if let homePageURL = feed.homePageURL {
s += "Home page: \(homePageURL)\n"
@@ -143,7 +143,7 @@ private extension ArticlePasteboardWriter {
d[Key.articleID] = article.articleID
d[Key.uniqueID] = article.uniqueID
if let feed = article.webFeed {
if let feed = article.feed {
d[Key.feedURL] = feed.url
}

2
Mac/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift
View File

@@ -178,7 +178,7 @@ private extension TimelineViewController {
menu.addSeparatorIfNeeded()
if articles.count == 1, let feed = articles.first!.webFeed {
if articles.count == 1, let feed = articles.first!.feed {
if !(representedObjects?.contains(where: { $0 as? WebFeed == feed }) ?? false) {
menu.addItem(selectFeedInSidebarMenuItem(feed))
}

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

@@ -657,7 +657,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
guard let article = articles.articleAtRow(row) else {
return false
}
return feed == article.webFeed
return feed == article.feed
}
if let indexesToReload = indexesToReload {
reloadCells(for: indexesToReload)
@@ -962,7 +962,7 @@ extension TimelineViewController: NSTableViewDelegate {
private func configureTimelineCell(_ cell: TimelineTableCellView, article: Article) {
cell.objectValue = article
let iconImage = article.iconImage()
cell.cellData = TimelineCellData(article: article, showFeedName: showFeedNames, feedName: article.webFeed?.nameForDisplay, byline: article.byline(), iconImage: iconImage, showIcon: showIcons, featuredImage: nil)
cell.cellData = TimelineCellData(article: article, showFeedName: showFeedNames, feedName: article.feed?.nameForDisplay, byline: article.byline(), iconImage: iconImage, showIcon: showIcons, featuredImage: nil)
}
private func iconFor(_ article: Article) -> IconImage? {