d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-06 03:44:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7688 from glassez/rss-log

Browse Source 
Improve RSS events logging
This commit is contained in:
Vladimir Golovnev 2017-11-10 14:38:38 +03:00 committed by GitHub
commit 63461e0895
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/base/rss/rss_feed.cpp
View File

@ -187,16 +187,19 @@ void Feed::handleDownloadFailed(const QString &url, const QString &error)
{ {
m_isLoading = false; m_isLoading = false;
m_hasError = true; m_hasError = true;
LogMsg(tr("Failed to download RSS feed at '%1'. Reason: %2").arg(url).arg(error)
, Log::WARNING);
emit stateChanged(this); emit stateChanged(this);
qWarning() << "Failed to download RSS feed at" << url;
qWarning() << "Reason:" << error;
} }
void Feed::handleParsingFinished(const RSS::Private::ParsingResult &result) void Feed::handleParsingFinished(const RSS::Private::ParsingResult &result)
{ {
if (!result.error.isEmpty()) { if (!result.error.isEmpty()) {
qWarning() << "Failed to parse RSS feed at" << m_url; m_hasError = true;
qWarning() << "Reason:" << result.error; LogMsg(tr("Failed to parse RSS feed at '%1'. Reason: %2").arg(m_url).arg(result.error)
, Log::WARNING);
} }
else { else {
if (title() != result.title) { if (title() != result.title) {
@ -206,22 +209,27 @@ void Feed::handleParsingFinished(const RSS::Private::ParsingResult &result)
m_lastBuildDate = result.lastBuildDate; m_lastBuildDate = result.lastBuildDate;
int newArticlesCount = 0;
foreach (const QVariantHash &varHash, result.articles) { foreach (const QVariantHash &varHash, result.articles) {
try { try {
auto article = new Article(this, varHash); auto article = new Article(this, varHash);
if (!addArticle(article)) if (addArticle(article))
delete article; ++newArticlesCount;
else else
m_dirty = true; delete article;
} }
catch (const std::runtime_error&) {} catch (const std::runtime_error&) {}
} }
m_dirty = (newArticlesCount > 0);
store(); store();
m_hasError = false;
LogMsg(tr("RSS feed at '%1' successfully updated. Added %2 new articles.")
.arg(m_url).arg(newArticlesCount));
} }
m_isLoading = false; m_isLoading = false;
m_hasError = false;
emit stateChanged(this); emit stateChanged(this);
} }
@ -239,9 +247,9 @@ void Feed::load()
file.close(); file.close();
} }
else { else {
Logger::instance()->addMessage( LogMsg(tr("Couldn't read RSS Session data from %1. Error: %2")
QString("Couldn't read RSS AutoDownloader rules from %1. Error: %2") .arg(m_dataFileName).arg(file.errorString())
.arg(m_dataFileName).arg(file.errorString()), Log::WARNING); , Log::WARNING);
} }
} }
@ -250,15 +258,13 @@ void Feed::loadArticles(const QByteArray &data)
QJsonParseError jsonError; QJsonParseError jsonError;
QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError); QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
if (jsonError.error != QJsonParseError::NoError) { if (jsonError.error != QJsonParseError::NoError) {
Logger::instance()->addMessage( LogMsg(tr("Couldn't parse RSS Session data. Error: %1").arg(jsonError.errorString())
QString("Couldn't parse RSS Session data. Error: %1") , Log::WARNING);
.arg(jsonError.errorString()), Log::WARNING);
return; return;
} }
if (!jsonDoc.isArray()) { if (!jsonDoc.isArray()) {
Logger::instance()->addMessage( LogMsg(tr("Couldn't load RSS Session data. Invalid data format."), Log::WARNING);
QString("Couldn't load RSS Session data. Invalid data format."), Log::WARNING);
return; return;
} }
@ -267,9 +273,8 @@ void Feed::loadArticles(const QByteArray &data)
foreach (const QJsonValue &jsonVal, jsonArr) { foreach (const QJsonValue &jsonVal, jsonArr) {
++i; ++i;
if (!jsonVal.isObject()) { if (!jsonVal.isObject()) {
Logger::instance()->addMessage( LogMsg(tr("Couldn't load RSS article '%1#%2'. Invalid data format.").arg(m_url).arg(i)
QString("Couldn't load RSS article '%1#%2'. Invalid data format.").arg(m_url).arg(i) , Log::WARNING);
, Log::WARNING);
continue; continue;
} }