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

Finish changes mandated by DatabaseQueue changes.

Browse Source
This commit is contained in:
Brent Simmons
2019-12-16 22:45:59 -08:00
parent 3c8097404f
commit 15184aa3f1
28 changed files with 291 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,7 @@ class ScriptableWebFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectConta
@objc(articles)
var articles:NSArray {
let feedArticles = webFeed.fetchArticles()
let feedArticles = (try? webFeed.fetchArticles()) ?? Set<Article>()
// 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 = webFeed.fetchArticles()
let articles = (try? webFeed.fetchArticles()) ?? Set<Article>()
guard let article = articles.first(where:{$0.uniqueID == id}) else { return nil }
return ScriptableArticle(article, container:self)
}