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

Fix lint issues.

Browse Source
This commit is contained in:
Brent Simmons
2025-01-22 22:17:02 -08:00
parent 8f1379360c
commit 40ada2ba5a
91 changed files with 1278 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
Mac/Scriptability/WebFeed+Scriptability.swift
View File

@@ -16,15 +16,15 @@ class ScriptableFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectContaine
let feed: Feed
let container: ScriptingObjectContainer
init (_ feed:Feed, container:ScriptingObjectContainer) {
init (_ feed: Feed, container: ScriptingObjectContainer) {
self.feed = feed
self.container = container
}
@objc(objectSpecifier)
override var objectSpecifier: NSScriptObjectSpecifier? {
let scriptObjectSpecifier = self.container.makeFormUniqueIDScriptObjectSpecifier(forObject:self)
let scriptObjectSpecifier = self.container.makeFormUniqueIDScriptObjectSpecifier(forObject: self)
return (scriptObjectSpecifier)
}
@@ -44,56 +44,56 @@ class ScriptableFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectContaine
// I am not sure if account should prefer to be specified by name or by ID
// but in either case it seems like the accountID would be used as the keydata, so I chose ID
@objc(uniqueId)
var scriptingUniqueId:Any {
var scriptingUniqueId: Any {
return feed.feedID
}
// MARK: --- ScriptingObjectContainer protocol ---
var scriptingClassDescription: NSScriptClassDescription {
return self.classDescription as! NSScriptClassDescription
}
func deleteElement(_ element:ScriptingObject) {
func deleteElement(_ element: ScriptingObject) {
}
// MARK: --- handle NSCreateCommand ---
class func urlForNewFeed(arguments:[String:Any]) -> String? {
var url:String?
class func urlForNewFeed(arguments: [String: Any]) -> String? {
var url: String?
if let withDataParam = arguments["ObjectData"] {
if let objectDataDescriptor = withDataParam as? NSAppleEventDescriptor {
url = objectDataDescriptor.stringValue
}
} else if let withPropsParam = arguments["ObjectProperties"] as? [String:Any] {
} else if let withPropsParam = arguments["ObjectProperties"] as? [String: Any] {
url = withPropsParam["url"] as? String
}
return url
}
class func scriptableFeed(_ feed:Feed, account:Account, folder:Folder?) -> ScriptableFeed {
class func scriptableFeed(_ feed: Feed, account: Account, folder: Folder?) -> ScriptableFeed {
let scriptableAccount = ScriptableAccount(account)
if let folder = folder {
let scriptableFolder = ScriptableFolder(folder, container:scriptableAccount)
return ScriptableFeed(feed, container:scriptableFolder)
} else {
return ScriptableFeed(feed, container:scriptableAccount)
let scriptableFolder = ScriptableFolder(folder, container: scriptableAccount)
return ScriptableFeed(feed, container: scriptableFolder)
} else {
return ScriptableFeed(feed, container: scriptableAccount)
}
}
class func handleCreateElement(command:NSCreateCommand) -> Any? {
guard command.isCreateCommand(forClass:"Feed") else { return nil }
class func handleCreateElement(command: NSCreateCommand) -> Any? {
guard command.isCreateCommand(forClass: "Feed") else { return nil }
guard let arguments = command.arguments else {return nil}
let titleFromArgs = command.property(forKey:"name") as? String
let titleFromArgs = command.property(forKey: "name") as? String
let (account, folder) = command.accountAndFolderForNewChild()
guard let url = self.urlForNewFeed(arguments:arguments) else {return nil}
if let existingFeed = account.existingFeed(withURL:url) {
return scriptableFeed(existingFeed, account:account, folder:folder).objectSpecifier
guard let url = self.urlForNewFeed(arguments: arguments) else {return nil}
if let existingFeed = account.existingFeed(withURL: url) {
return scriptableFeed(existingFeed, account: account, folder: folder).objectSpecifier
}
let container: Container = folder != nil ? folder! : account
// We need to download the feed and parse it.
// Parser does the callback for the download on the main thread.
// Because we can't wait here (on the main thread) for the callback, we have to return from this function.
@@ -101,83 +101,83 @@ class ScriptableFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectContaine
// but we don’t yet have the result of the event yet, so we prevent the Apple event from returning by calling
// suspendExecution(). When we get the callback, we supply the event result and call resumeExecution().
command.suspendExecution()
account.createFeed(url: url, name: titleFromArgs, container: container, validateFeed: true) { result in
switch result {
case .success(let feed):
NotificationCenter.default.post(name: .UserDidAddFeed, object: self, userInfo: [UserInfoKey.feed: feed])
let scriptableFeed = self.scriptableFeed(feed, account:account, folder:folder)
command.resumeExecution(withResult:scriptableFeed.objectSpecifier)
let scriptableFeed = self.scriptableFeed(feed, account: account, folder: folder)
command.resumeExecution(withResult: scriptableFeed.objectSpecifier)
case .failure:
command.resumeExecution(withResult:nil)
command.resumeExecution(withResult: nil)
}
}
return nil
}
// MARK: --- Scriptable properties ---
@objc(url)
var url:String {
var url: String {
return self.feed.url
}
@objc(name)
var name:String {
var name: String {
return self.feed.name ?? ""
}
@objc(homePageURL)
var homePageURL:String {
var homePageURL: String {
return self.feed.homePageURL ?? ""
}
@objc(iconURL)
var iconURL:String {
var iconURL: String {
return self.feed.iconURL ?? ""
}
@objc(faviconURL)
var faviconURL:String {
var faviconURL: String {
return self.feed.faviconURL ?? ""
}
@objc(opmlRepresentation)
var opmlRepresentation:String {
return self.feed.OPMLString(indentLevel:0)
var opmlRepresentation: String {
return self.feed.OPMLString(indentLevel: 0)
}
// MARK: --- scriptable elements ---
@objc(authors)
var authors:NSArray {
var authors: NSArray {
let feedAuthors = feed.authors ?? []
return feedAuthors.map { ScriptableAuthor($0, container:self) } as NSArray
return feedAuthors.map { ScriptableAuthor($0, container: self) } as NSArray
}
@objc(valueInAuthorsWithUniqueID:)
func valueInAuthors(withUniqueID id:String) -> ScriptableAuthor? {
guard let author = feed.authors?.first(where:{$0.authorID == id}) else { return nil }
return ScriptableAuthor(author, container:self)
func valueInAuthors(withUniqueID id: String) -> ScriptableAuthor? {
guard let author = feed.authors?.first(where: {$0.authorID == id}) else { return nil }
return ScriptableAuthor(author, container: self)
}
@objc(articles)
var articles:NSArray {
var articles: NSArray {
let feedArticles = (try? feed.fetchArticles()) ?? Set<Article>()
// the articles are a set, use the sorting algorithm from the viewer
let sortedArticles = feedArticles.sorted(by:{
let sortedArticles = feedArticles.sorted(by: {
return $0.logicalDatePublished > $1.logicalDatePublished
})
return sortedArticles.map { ScriptableArticle($0, container:self) } as NSArray
return sortedArticles.map { ScriptableArticle($0, container: self) } as NSArray
}
@objc(valueInArticlesWithUniqueID:)
func valueInArticles(withUniqueID id:String) -> ScriptableArticle? {
func valueInArticles(withUniqueID id: String) -> ScriptableArticle? {
let articles = (try? feed.fetchArticles()) ?? Set<Article>()
guard let article = articles.first(where:{$0.uniqueID == id}) else { return nil }
return ScriptableArticle(article, container:self)
guard let article = articles.first(where: {$0.uniqueID == id}) else { return nil }
return ScriptableArticle(article, container: self)
}
}