From 61235d0bcbef1a8f0efd309b2a0953146c09cc6a Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 1 Nov 2024 21:48:43 -0700 Subject: [PATCH] Rename some instances of webFeed to just feed. --- Mac/AppDelegate.swift | 14 +++++++------- .../Sidebar/SidebarOutlineDataSource.swift | 4 ++-- Mac/Scriptability/AppDelegate+Scriptability.swift | 2 +- Shared/IconImageCache.swift | 2 +- iOS/AppDelegate.swift | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index 9de0b207e..b653e3589 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -41,7 +41,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, var faviconDownloader: FaviconDownloader! var imageDownloader: ImageDownloader! var authorAvatarDownloader: AuthorAvatarDownloader! - var webFeedIconDownloader: FeedIconDownloader! + var feedIconDownloader: FeedIconDownloader! var extensionContainersFile: ExtensionContainersFile! var extensionFeedAddRequestFile: ExtensionFeedAddRequestFile! @@ -139,7 +139,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, addFolderWindowController!.runSheetOnWindow(window) } - func showAddWebFeedSheetOnWindow(_ window: NSWindow, urlString: String?, name: String?, account: Account?, folder: Folder?) { + func showAddFeedSheetOnWindow(_ window: NSWindow, urlString: String?, name: String?, account: Account?, folder: Folder?) { addFeedController = AddFeedController(hostWindow: window) addFeedController?.showAddFeedSheet(.webFeed, urlString, name, account, folder) } @@ -172,7 +172,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, imageDownloader = ImageDownloader(folder: imagesFolder) authorAvatarDownloader = AuthorAvatarDownloader(imageDownloader: imageDownloader) - webFeedIconDownloader = FeedIconDownloader(imageDownloader: imageDownloader, folder: cacheFolder) + feedIconDownloader = FeedIconDownloader(imageDownloader: imageDownloader, folder: cacheFolder) appName = (Bundle.main.infoDictionary!["CFBundleExecutable"]! as! String) } @@ -500,14 +500,14 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, } // MARK: Add Feed - func addWebFeed(_ urlString: String?, name: String? = nil, account: Account? = nil, folder: Folder? = nil) { + func addFeed(_ urlString: String?, name: String? = nil, account: Account? = nil, folder: Folder? = nil) { createAndShowMainWindowIfNecessary() if mainWindowController!.isDisplayingSheet { return } - showAddWebFeedSheetOnWindow(mainWindowController!.window!, urlString: urlString, name: name, account: account, folder: folder) + showAddFeedSheetOnWindow(mainWindowController!.window!, urlString: urlString, name: name, account: account, folder: folder) } // MARK: - Dock Badge @@ -539,7 +539,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, } @IBAction func showAddFeedWindow(_ sender: Any?) { - addWebFeed(nil) + addFeed(nil) } @IBAction func showAddFolderWindow(_ sender: Any?) { @@ -612,7 +612,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, if AccountManager.shared.anyAccountHasNetNewsWireNewsSubscription() { return } - addWebFeed(AccountManager.netNewsWireNewsURL, name: "NetNewsWire News") + addFeed(AccountManager.netNewsWireNewsURL, name: "NetNewsWire News") } @IBAction func openWebsite(_ sender: Any?) { diff --git a/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift b/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift index 43fad3aeb..f6571c74e 100644 --- a/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift +++ b/Mac/MainWindow/Sidebar/SidebarOutlineDataSource.swift @@ -480,11 +480,11 @@ private extension SidebarOutlineDataSource { // Show the add-feed sheet. if let account = parentNode.representedObject as? Account { - appDelegate.addWebFeed(draggedFeed.url, name: draggedFeed.editedName ?? draggedFeed.name, account: account, folder: nil) + appDelegate.addFeed(draggedFeed.url, name: draggedFeed.editedName ?? draggedFeed.name, account: account, folder: nil) } else { let account = parentNode.parent?.representedObject as? Account let folder = parentNode.representedObject as? Folder - appDelegate.addWebFeed(draggedFeed.url, name: draggedFeed.editedName ?? draggedFeed.name, account: account, folder: folder) + appDelegate.addFeed(draggedFeed.url, name: draggedFeed.editedName ?? draggedFeed.name, account: account, folder: folder) } return true diff --git a/Mac/Scriptability/AppDelegate+Scriptability.swift b/Mac/Scriptability/AppDelegate+Scriptability.swift index d6ea531ed..8d2178a34 100644 --- a/Mac/Scriptability/AppDelegate+Scriptability.swift +++ b/Mac/Scriptability/AppDelegate+Scriptability.swift @@ -86,7 +86,7 @@ extension AppDelegate : AppDelegateAppleEvents { DispatchQueue.main.async { - self.addWebFeed(normalizedURLString) + self.addFeed(normalizedURLString) } } } diff --git a/Shared/IconImageCache.swift b/Shared/IconImageCache.swift index 6bb016406..183c77649 100644 --- a/Shared/IconImageCache.swift +++ b/Shared/IconImageCache.swift @@ -84,7 +84,7 @@ private extension IconImageCache { if let iconImage = webFeedIconImageCache[feedID] { return iconImage } - if let iconImage = appDelegate.webFeedIconDownloader.icon(for: webFeed) { + if let iconImage = appDelegate.feedIconDownloader.icon(for: webFeed) { webFeedIconImageCache[feedID] = iconImage return iconImage } diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift index 07e63e474..0a80716bb 100644 --- a/iOS/AppDelegate.swift +++ b/iOS/AppDelegate.swift @@ -42,7 +42,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD var faviconDownloader: FaviconDownloader! var imageDownloader: ImageDownloader! var authorAvatarDownloader: AuthorAvatarDownloader! - var webFeedIconDownloader: FeedIconDownloader! + var feedIconDownloader: FeedIconDownloader! var extensionContainersFile: ExtensionContainersFile! var extensionFeedAddRequestFile: ExtensionFeedAddRequestFile! var widgetDataEncoder: WidgetDataEncoder! @@ -245,7 +245,7 @@ private extension AppDelegate { let tempFolder = tempDir.absoluteString let tempFolderPath = tempFolder.suffix(from: tempFolder.index(tempFolder.startIndex, offsetBy: 7)) - webFeedIconDownloader = FeedIconDownloader(imageDownloader: imageDownloader, folder: String(tempFolderPath)) + feedIconDownloader = FeedIconDownloader(imageDownloader: imageDownloader, folder: String(tempFolderPath)) } private func initializeHomeScreenQuickActions() {