From c84f2a80bd2a00d60c48478101032da53de42ec8 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 2 Jul 2023 15:54:30 -0700 Subject: [PATCH] Rename ScriptableWebFeed to ScriptableFeed. --- Mac/Resources/NetNewsWire.sdef | 2 +- Mac/Scriptability/Account+Scriptability.swift | 20 +++++----- .../AppDelegate+Scriptability.swift | 2 +- Mac/Scriptability/Article+Scriptability.swift | 4 +- Mac/Scriptability/Folder+Scriptability.swift | 6 +-- .../NSApplication+Scriptability.swift | 10 ++--- Mac/Scriptability/WebFeed+Scriptability.swift | 38 +++++++++---------- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Mac/Resources/NetNewsWire.sdef b/Mac/Resources/NetNewsWire.sdef index 07a9f6f4a..4eebbc6d9 100644 --- a/Mac/Resources/NetNewsWire.sdef +++ b/Mac/Resources/NetNewsWire.sdef @@ -108,7 +108,7 @@ - + diff --git a/Mac/Scriptability/Account+Scriptability.swift b/Mac/Scriptability/Account+Scriptability.swift index 895beeed8..84145c8ea 100644 --- a/Mac/Scriptability/Account+Scriptability.swift +++ b/Mac/Scriptability/Account+Scriptability.swift @@ -73,7 +73,7 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta account.removeFolder(scriptableFolder.folder) { result in } } - } else if let scriptableFeed = element as? ScriptableWebFeed { + } else if let scriptableFeed = element as? ScriptableFeed { BatchUpdate.shared.perform { var container: Container? = nil if let scriptableFolder = scriptableFeed.container as? ScriptableFolder { @@ -81,7 +81,7 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta } else { container = account } - account.removeWebFeed(scriptableFeed.webFeed, from: container!) { result in + account.removeWebFeed(scriptableFeed.feed, from: container!) { result in } } } @@ -96,20 +96,20 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta @objc(webFeeds) var webFeeds:NSArray { - return account.topLevelWebFeeds.map { ScriptableWebFeed($0, container:self) } as NSArray + return account.topLevelWebFeeds.map { ScriptableFeed($0, container:self) } as NSArray } @objc(valueInWebFeedsWithUniqueID:) - func valueInWebFeeds(withUniqueID id:String) -> ScriptableWebFeed? { + func valueInWebFeeds(withUniqueID id:String) -> ScriptableFeed? { guard let feed = account.existingWebFeed(withWebFeedID: id) else { return nil } - return ScriptableWebFeed(feed, container:self) + return ScriptableFeed(feed, container:self) } @objc(valueInWebFeedsWithName:) - func valueInWebFeeds(withName name:String) -> ScriptableWebFeed? { + func valueInWebFeeds(withName name:String) -> ScriptableFeed? { let feeds = Array(account.flattenedWebFeeds()) guard let feed = feeds.first(where:{$0.name == name}) else { return nil } - return ScriptableWebFeed(feed, container:self) + return ScriptableFeed(feed, container:self) } @objc(folders) @@ -132,15 +132,15 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta @objc(allWebFeeds) var allWebFeeds: NSArray { - var webFeeds = [ScriptableWebFeed]() + var webFeeds = [ScriptableFeed]() for webFeed in account.topLevelWebFeeds { - webFeeds.append(ScriptableWebFeed(webFeed, container: self)) + webFeeds.append(ScriptableFeed(webFeed, container: self)) } if let folders = account.folders { for folder in folders { let scriptableFolder = ScriptableFolder(folder, container: self) for webFeed in folder.topLevelWebFeeds { - webFeeds.append(ScriptableWebFeed(webFeed, container: scriptableFolder)) + webFeeds.append(ScriptableFeed(webFeed, container: scriptableFolder)) } } } diff --git a/Mac/Scriptability/AppDelegate+Scriptability.swift b/Mac/Scriptability/AppDelegate+Scriptability.swift index a16334eaf..4b8ae29a2 100644 --- a/Mac/Scriptability/AppDelegate+Scriptability.swift +++ b/Mac/Scriptability/AppDelegate+Scriptability.swift @@ -98,7 +98,7 @@ class NetNewsWireCreateElementCommand : NSCreateCommand { override func performDefaultImplementation() -> Any? { let classDescription = self.createClassDescription if (classDescription.className == "webFeed") { - return ScriptableWebFeed.handleCreateElement(command:self) + return ScriptableFeed.handleCreateElement(command:self) } else if (classDescription.className == "folder") { return ScriptableFolder.handleCreateElement(command:self) } diff --git a/Mac/Scriptability/Article+Scriptability.swift b/Mac/Scriptability/Article+Scriptability.swift index 6189d35c1..b76aec52f 100644 --- a/Mac/Scriptability/Article+Scriptability.swift +++ b/Mac/Scriptability/Article+Scriptability.swift @@ -142,12 +142,12 @@ class ScriptableArticle: NSObject, UniqueIdScriptingObject, ScriptingObjectConta } @objc(feed) - var feed: ScriptableWebFeed? { + var feed: ScriptableFeed? { guard let parentFeed = self.article.webFeed, let account = parentFeed.account else { return nil } - return ScriptableWebFeed(parentFeed, container: ScriptableAccount(account)) + return ScriptableFeed(parentFeed, container: ScriptableAccount(account)) } } diff --git a/Mac/Scriptability/Folder+Scriptability.swift b/Mac/Scriptability/Folder+Scriptability.swift index 9e25698d4..6ce2f2c05 100644 --- a/Mac/Scriptability/Folder+Scriptability.swift +++ b/Mac/Scriptability/Folder+Scriptability.swift @@ -51,9 +51,9 @@ class ScriptableFolder: NSObject, UniqueIdScriptingObject, ScriptingObjectContai } func deleteElement(_ element:ScriptingObject) { - if let scriptableFeed = element as? ScriptableWebFeed { + if let scriptableFeed = element as? ScriptableFeed { BatchUpdate.shared.perform { - folder.account?.removeWebFeed(scriptableFeed.webFeed, from: folder) { result in } + folder.account?.removeWebFeed(scriptableFeed.feed, from: folder) { result in } } } } @@ -98,7 +98,7 @@ class ScriptableFolder: NSObject, UniqueIdScriptingObject, ScriptingObjectContai @objc(webFeeds) var webFeeds:NSArray { let feeds = Array(folder.topLevelWebFeeds) - return feeds.map { ScriptableWebFeed($0, container:self) } as NSArray + return feeds.map { ScriptableFeed($0, container:self) } as NSArray } // MARK: --- Scriptable properties --- diff --git a/Mac/Scriptability/NSApplication+Scriptability.swift b/Mac/Scriptability/NSApplication+Scriptability.swift index b99095259..c97f0015f 100644 --- a/Mac/Scriptability/NSApplication+Scriptability.swift +++ b/Mac/Scriptability/NSApplication+Scriptability.swift @@ -31,7 +31,7 @@ extension NSApplication : ScriptingObjectContainer { var scriptableArticle: ScriptableArticle? if let currentArticle = appDelegate.scriptingCurrentArticle { if let feed = currentArticle.webFeed { - let scriptableFeed = ScriptableWebFeed(feed, container:self) + let scriptableFeed = ScriptableFeed(feed, container:self) scriptableArticle = ScriptableArticle(currentArticle, container:scriptableFeed) } } @@ -43,7 +43,7 @@ extension NSApplication : ScriptingObjectContainer { let articles = appDelegate.scriptingSelectedArticles let scriptableArticles:[ScriptableArticle] = articles.compactMap { article in if let feed = article.webFeed { - let scriptableFeed = ScriptableWebFeed(feed, container:self) + let scriptableFeed = ScriptableFeed(feed, container:self) return ScriptableArticle(article, container:scriptableFeed) } else { return nil @@ -85,14 +85,14 @@ extension NSApplication : ScriptingObjectContainer { @objc(webFeeds) func webFeeds() -> NSArray { let webFeeds = self.allWebFeeds() - return webFeeds.map { ScriptableWebFeed($0, container:self) } as NSArray + return webFeeds.map { ScriptableFeed($0, container:self) } as NSArray } @objc(valueInWebFeedsWithUniqueID:) - func valueInWebFeeds(withUniqueID id:String) -> ScriptableWebFeed? { + func valueInWebFeeds(withUniqueID id:String) -> ScriptableFeed? { let webFeeds = self.allWebFeeds() guard let webFeed = webFeeds.first(where:{$0.webFeedID == id}) else { return nil } - return ScriptableWebFeed(webFeed, container:self) + return ScriptableFeed(webFeed, container:self) } } diff --git a/Mac/Scriptability/WebFeed+Scriptability.swift b/Mac/Scriptability/WebFeed+Scriptability.swift index e6b22e0dc..f0f87e8be 100644 --- a/Mac/Scriptability/WebFeed+Scriptability.swift +++ b/Mac/Scriptability/WebFeed+Scriptability.swift @@ -11,14 +11,14 @@ import RSParser import Account import Articles -@objc(ScriptableWebFeed) -class ScriptableWebFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { +@objc(ScriptableFeed) +class ScriptableFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { - let webFeed:WebFeed + let feed:WebFeed let container:ScriptingObjectContainer - init (_ webFeed:WebFeed, container:ScriptingObjectContainer) { - self.webFeed = webFeed + init (_ feed:WebFeed, container:ScriptingObjectContainer) { + self.feed = feed self.container = container } @@ -45,7 +45,7 @@ class ScriptableWebFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectConta // but in either case it seems like the accountID would be used as the keydata, so I chose ID @objc(uniqueId) var scriptingUniqueId:Any { - return webFeed.webFeedID + return feed.webFeedID } // MARK: --- ScriptingObjectContainer protocol --- @@ -71,13 +71,13 @@ class ScriptableWebFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectConta return url } - class func scriptableFeed(_ feed:WebFeed, account:Account, folder:Folder?) -> ScriptableWebFeed { + class func scriptableFeed(_ feed:WebFeed, account:Account, folder:Folder?) -> ScriptableFeed { let scriptableAccount = ScriptableAccount(account) if let folder = folder { let scriptableFolder = ScriptableFolder(folder, container:scriptableAccount) - return ScriptableWebFeed(feed, container:scriptableFolder) + return ScriptableFeed(feed, container:scriptableFolder) } else { - return ScriptableWebFeed(feed, container:scriptableAccount) + return ScriptableFeed(feed, container:scriptableAccount) } } @@ -121,51 +121,51 @@ class ScriptableWebFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectConta @objc(url) var url:String { - return self.webFeed.url + return self.feed.url } @objc(name) var name:String { - return self.webFeed.name ?? "" + return self.feed.name ?? "" } @objc(homePageURL) var homePageURL:String { - return self.webFeed.homePageURL ?? "" + return self.feed.homePageURL ?? "" } @objc(iconURL) var iconURL:String { - return self.webFeed.iconURL ?? "" + return self.feed.iconURL ?? "" } @objc(faviconURL) var faviconURL:String { - return self.webFeed.faviconURL ?? "" + return self.feed.faviconURL ?? "" } @objc(opmlRepresentation) var opmlRepresentation:String { - return self.webFeed.OPMLString(indentLevel:0) + return self.feed.OPMLString(indentLevel:0) } // MARK: --- scriptable elements --- @objc(authors) var authors:NSArray { - let feedAuthors = webFeed.authors ?? [] + let feedAuthors = feed.authors ?? [] return feedAuthors.map { ScriptableAuthor($0, container:self) } as NSArray } @objc(valueInAuthorsWithUniqueID:) func valueInAuthors(withUniqueID id:String) -> ScriptableAuthor? { - guard let author = webFeed.authors?.first(where:{$0.authorID == id}) else { return nil } + guard let author = feed.authors?.first(where:{$0.authorID == id}) else { return nil } return ScriptableAuthor(author, container:self) } @objc(articles) var articles:NSArray { - let feedArticles = (try? webFeed.fetchArticles()) ?? Set
() + let feedArticles = (try? feed.fetchArticles()) ?? Set
() // the articles are a set, use the sorting algorithm from the viewer let sortedArticles = feedArticles.sorted(by:{ return $0.logicalDatePublished > $1.logicalDatePublished @@ -175,7 +175,7 @@ class ScriptableWebFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectConta @objc(valueInArticlesWithUniqueID:) func valueInArticles(withUniqueID id:String) -> ScriptableArticle? { - let articles = (try? webFeed.fetchArticles()) ?? Set
() + let articles = (try? feed.fetchArticles()) ?? Set
() guard let article = articles.first(where:{$0.uniqueID == id}) else { return nil } return ScriptableArticle(article, container:self) }