FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure there is a title

Browse Source
This commit is contained in:
Stuart Breckenridge 2020-11-19 15:38:50 +08:00
parent 361ca85762
commit 1bdfb3aafc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shared/Widget/WidgetDataEncoder.swift
View File

@ -27,7 +27,7 @@ struct WidgetDataEncoder {
for article in unreadArticles { for article in unreadArticles {
let latestArticle = LatestArticle(id: article.sortableArticleID, let latestArticle = LatestArticle(id: article.sortableArticleID,
feedTitle: article.sortableName, feedTitle: article.sortableName,
articleTitle: article.title?.isEmpty ?? true ? article.summary : ArticleStringFormatter.truncatedTitle(article), articleTitle: ArticleStringFormatter.truncatedTitle(article).isEmpty ? article.contentHTML?.strippingHTML().trimmingWhitespace : ArticleStringFormatter.truncatedTitle(article),
articleSummary: article.summary, articleSummary: article.summary,
feedIcon: article.iconImage()?.image.dataRepresentation(), feedIcon: article.iconImage()?.image.dataRepresentation(),
pubDate: article.datePublished!.description) pubDate: article.datePublished!.description)
@ -41,7 +41,7 @@ struct WidgetDataEncoder {
for article in starredArticles { for article in starredArticles {
let latestArticle = LatestArticle(id: article.sortableArticleID, let latestArticle = LatestArticle(id: article.sortableArticleID,
feedTitle: article.sortableName, feedTitle: article.sortableName,
articleTitle: article.title?.isEmpty ?? true ? article.summary : ArticleStringFormatter.truncatedTitle(article), articleTitle: ArticleStringFormatter.truncatedTitle(article).isEmpty ? article.contentHTML?.strippingHTML().trimmingWhitespace : ArticleStringFormatter.truncatedTitle(article),
articleSummary: article.summary, articleSummary: article.summary,
feedIcon: article.iconImage()?.image.dataRepresentation(), feedIcon: article.iconImage()?.image.dataRepresentation(),
pubDate: article.datePublished!.description) pubDate: article.datePublished!.description)
@ -55,7 +55,7 @@ struct WidgetDataEncoder {
for article in todayArticles { for article in todayArticles {
let latestArticle = LatestArticle(id: article.sortableArticleID, let latestArticle = LatestArticle(id: article.sortableArticleID,
feedTitle: article.sortableName, feedTitle: article.sortableName,
articleTitle: article.title?.isEmpty ?? true ? article.summary : ArticleStringFormatter.truncatedTitle(article), articleTitle: ArticleStringFormatter.truncatedTitle(article).isEmpty ? article.contentHTML?.strippingHTML().trimmingWhitespace : ArticleStringFormatter.truncatedTitle(article),
articleSummary: article.summary, articleSummary: article.summary,
feedIcon: article.iconImage()?.image.dataRepresentation(), feedIcon: article.iconImage()?.image.dataRepresentation(),
pubDate: article.datePublished!.description) pubDate: article.datePublished!.description)
@ -79,7 +79,6 @@ struct WidgetDataEncoder {
try FileManager.default.removeItem(at: dataURL!) try FileManager.default.removeItem(at: dataURL!)
} }
try encodedData.write(to: dataURL!) try encodedData.write(to: dataURL!)
print(latestData.unreadArticles.count)
WidgetCenter.shared.reloadAllTimelines() WidgetCenter.shared.reloadAllTimelines()
os_log(.info, "Finished encoding widget data") os_log(.info, "Finished encoding widget data")
} catch { } catch {