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

Add the ability to move feeds between folders for Feedbin

Browse Source
This commit is contained in:
Maurice Parker
2019-05-09 13:31:18 -05:00
parent e45362bffc
commit cda8acc66c
13 changed files with 261 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,13 +113,17 @@ class ScriptableFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectContaine
}
// add the feed, putting it in a folder if needed
account.addFeed(feed, to:folder)
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)
}
}
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)
default:
command.resumeExecution(withResult:nil)
}

8
Mac/Scriptability/Folder+Scriptability.swift
View File

@@ -51,13 +51,9 @@ class ScriptableFolder: NSObject, UniqueIdScriptingObject, ScriptingObjectContai
}
func deleteElement(_ element:ScriptingObject) {
if let scriptableFolder = element as? ScriptableFolder {
if let scriptableFeed = element as? ScriptableFeed {
BatchUpdate.shared.perform {
folder.deleteFolder(scriptableFolder.folder) { result in }
}
} else if let scriptableFeed = element as? ScriptableFeed {
BatchUpdate.shared.perform {
folder.deleteFeed(scriptableFeed.feed) { result in }
folder.account?.deleteFeed(scriptableFeed.feed) { result in }
}
}
}