From 1bdfb3aafc65ec74ee52d350052ee4e58b17d8dc Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Thu, 19 Nov 2020 15:38:50 +0800 Subject: [PATCH] Make sure there is a title --- Shared/Widget/WidgetDataEncoder.swift | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Shared/Widget/WidgetDataEncoder.swift b/Shared/Widget/WidgetDataEncoder.swift index 7679af2c7..6879bc30a 100644 --- a/Shared/Widget/WidgetDataEncoder.swift +++ b/Shared/Widget/WidgetDataEncoder.swift @@ -27,7 +27,7 @@ struct WidgetDataEncoder { for article in unreadArticles { let latestArticle = LatestArticle(id: article.sortableArticleID, 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, feedIcon: article.iconImage()?.image.dataRepresentation(), pubDate: article.datePublished!.description) @@ -41,7 +41,7 @@ struct WidgetDataEncoder { for article in starredArticles { let latestArticle = LatestArticle(id: article.sortableArticleID, 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, feedIcon: article.iconImage()?.image.dataRepresentation(), pubDate: article.datePublished!.description) @@ -55,7 +55,7 @@ struct WidgetDataEncoder { for article in todayArticles { let latestArticle = LatestArticle(id: article.sortableArticleID, 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, feedIcon: article.iconImage()?.image.dataRepresentation(), pubDate: article.datePublished!.description) @@ -79,7 +79,6 @@ struct WidgetDataEncoder { try FileManager.default.removeItem(at: dataURL!) } try encodedData.write(to: dataURL!) - print(latestData.unreadArticles.count) WidgetCenter.shared.reloadAllTimelines() os_log(.info, "Finished encoding widget data") } catch {