From 8d285c66aafb160788f1a7107a25b201470d28e0 Mon Sep 17 00:00:00 2001
From: "Vladimir Golovnev (Glassez)" <glassez@yandex.ru>
Date: Fri, 16 Mar 2018 17:43:35 +0300
Subject: [PATCH] Process loaded RSS articles in case of error

For some reason, the RSS feed may contain malformed XML data and it may not be
successfully parsed by the XML parser. We are still trying to load as many articles
as possible until we encounter corrupted data. So we can have some articles even in
case of parsing error.
Closes #8527.
Closes #8569.
---
 src/base/rss/rss_feed.cpp | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/base/rss/rss_feed.cpp b/src/base/rss/rss_feed.cpp
index 20036f523..2647f446a 100644
--- a/src/base/rss/rss_feed.cpp
+++ b/src/base/rss/rss_feed.cpp
@@ -197,12 +197,13 @@ void Feed::handleDownloadFailed(const QString &url, const QString &error)
 
 void Feed::handleParsingFinished(const RSS::Private::ParsingResult &result)
 {
-    if (!result.error.isEmpty()) {
-        m_hasError = true;
-        LogMsg(tr("Failed to parse RSS feed at '%1'. Reason: %2").arg(m_url, result.error)
-               , Log::WARNING);
-    }
-    else {
+    m_hasError = !result.error.isEmpty();
+
+    // For some reason, the RSS feed may contain malformed XML data and it may not be
+    // successfully parsed by the XML parser. We are still trying to load as many articles
+    // as possible until we encounter corrupted data. So we can have some articles here
+    // even in case of parsing error.
+    if (!m_hasError || !result.articles.isEmpty()) {
         if (title() != result.title) {
             m_title = result.title;
             emit titleChanged(this);
@@ -211,7 +212,7 @@ void Feed::handleParsingFinished(const RSS::Private::ParsingResult &result)
         m_lastBuildDate = result.lastBuildDate;
 
         int newArticlesCount = 0;
-        foreach (const QVariantHash &varHash, result.articles) {
+        for (const QVariantHash &varHash : result.articles) {
             try {
                 auto article = new Article(this, varHash);
                 if (addArticle(article))
@@ -223,11 +224,15 @@ void Feed::handleParsingFinished(const RSS::Private::ParsingResult &result)
         }
 
         m_dirty = (newArticlesCount > 0);
-
         store();
-        m_hasError = false;
-        LogMsg(tr("RSS feed at '%1' successfully updated. Added %2 new articles.")
-               .arg(m_url).arg(newArticlesCount));
+
+        LogMsg(tr("RSS feed at '%1' updated. Added %2 new articles.")
+               .arg(m_url, QString::number(newArticlesCount)));
+    }
+
+    if (m_hasError) {
+        LogMsg(tr("Failed to parse RSS feed at '%1'. Reason: %2").arg(m_url, result.error)
+               , Log::WARNING);
     }
 
     m_isLoading = false;