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

Use best feed specifier code to determine which Feedbin option to use when creating a feed

Browse Source
This commit is contained in:
Maurice Parker
2019-05-10 10:14:24 -05:00
parent a7d1014d5b
commit fe70723eb4
10 changed files with 94 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Mac/Scriptability/Feed+Scriptability.swift
View File

@@ -102,32 +102,25 @@ class ScriptableFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectContaine
account.createFeed(url: url) { result in
switch result {
case .success(let createFeedResult):
case .success(let feed):
switch createFeedResult {
case .created(let feed):
if let editedName = titleFromArgs {
account.renameFeed(feed, to: editedName) { result in
}
if let editedName = titleFromArgs {
account.renameFeed(feed, to: editedName) { result in
}
// add the feed, putting it in a folder if needed
account.addFeed(feed) { result in
switch result {
case .success:
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)
case .failure:
command.resumeExecution(withResult:nil)
}
}
default:
command.resumeExecution(withResult:nil)
}
// add the feed, putting it in a folder if needed
account.addFeed(feed) { result in
switch result {
case .success:
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)
case .failure:
command.resumeExecution(withResult:nil)
}
}
case .failure:
command.resumeExecution(withResult:nil)
}