Replace the contents property with allFeeds — which returns all the feeds, including those inside folders. This is distinct from the feeds element, which returns just top-level feeds.

This commit is contained in:
Brent Simmons
2019-08-01 22:51:03 -07:00
parent 6c20af63e5
commit 5d97e89e91
3 changed files with 21 additions and 21 deletions

View File

@@ -121,18 +121,21 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta
// MARK: --- Scriptable properties ---
@objc(contents)
var contents:NSArray {
var contentsArray:[AnyObject] = []
@objc(allFeeds)
var allFeeds: NSArray {
var feeds = [ScriptableFeed]()
for feed in account.topLevelFeeds {
contentsArray.append(ScriptableFeed(feed, container: self))
feeds.append(ScriptableFeed(feed, container: self))
}
if let folders = account.folders {
for folder in folders {
contentsArray.append(ScriptableFolder(folder, container:self))
let scriptableFolder = ScriptableFolder(folder, container: self)
for feed in folder.topLevelFeeds {
feeds.append(ScriptableFeed(feed, container: scriptableFolder))
}
}
}
return contentsArray as NSArray
return feeds as NSArray
}
@objc(opmlRepresentation)