mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-25 17:28:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use RSS feed update time as a fallback

Browse source 
Some sites omit publication date in its RSS feed articles
that prevents "Ignore Subsequent Matches" to work properly.
Closes #8959.
This commit is contained in:
Vladimir Golovnev (Glassez) 2018-05-21 12:21:54 +03:00 committed by sledgehammer999
parent 0d8189efeb
commit d94b8f08ab
No known key found for this signature in database
GPG key ID: 6E4A2D025B7CC9A2
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/base/rss/rss_article.cpp
View file

@ -38,6 +38,19 @@
using namespace RSS; using namespace RSS;
namespace
{
QVariantHash articleDataFromJSON(const QJsonObject &jsonObj)
{
auto varHash = jsonObj.toVariantHash();
// JSON object store DateTime as string so we need to convert it
varHash[Article::KeyDate] =
QDateTime::fromString(jsonObj.value(Article::KeyDate).toString(), Qt::RFC2822Date);
return varHash;
}
}
const QString Article::KeyId(QStringLiteral("id")); const QString Article::KeyId(QStringLiteral("id"));
const QString Article::KeyDate(QStringLiteral("date")); const QString Article::KeyDate(QStringLiteral("date"));
const QString Article::KeyTitle(QStringLiteral("title")); const QString Article::KeyTitle(QStringLiteral("title"));
@ -60,6 +73,9 @@ Article::Article(Feed *feed, const QVariantHash &varHash)
, m_isRead(varHash.value(KeyIsRead, false).toBool()) , m_isRead(varHash.value(KeyIsRead, false).toBool())
, m_data(varHash) , m_data(varHash)
{ {
if (!m_date.isValid())
throw std::runtime_error("Bad RSS Article data");
// If item does not have a guid, fall back to some other identifier // If item does not have a guid, fall back to some other identifier
if (m_guid.isEmpty()) if (m_guid.isEmpty())
m_guid = varHash.value(KeyTorrentURL).toString(); m_guid = varHash.value(KeyTorrentURL).toString();
@ -77,11 +93,8 @@ Article::Article(Feed *feed, const QVariantHash &varHash)
} }
Article::Article(Feed *feed, const QJsonObject &jsonObj) Article::Article(Feed *feed, const QJsonObject &jsonObj)
: Article(feed, jsonObj.toVariantHash()) : Article(feed, articleDataFromJSON(jsonObj))
{ {
// JSON object store DateTime as string so we need to convert it
m_date = QDateTime::fromString(jsonObj.value(KeyDate).toString(), Qt::RFC2822Date);
m_data[KeyDate] = m_date;
} }
QString Article::guid() const QString Article::guid() const

8
src/base/rss/rss_feed.cpp
View file

@ -212,7 +212,13 @@ void Feed::handleParsingFinished(const RSS::Private::ParsingResult &result)
m_lastBuildDate = result.lastBuildDate; m_lastBuildDate = result.lastBuildDate;
int newArticlesCount = 0; int newArticlesCount = 0;
for (const QVariantHash &varHash : result.articles) { const QDateTime now {QDateTime::currentDateTime()};
for (QVariantHash varHash : result.articles) {
// if article has no publication date we use feed update time as a fallback
QVariant &articleDate = varHash[Article::KeyDate];
if (!articleDate.toDateTime().isValid())
articleDate = now;
try { try {
auto article = new Article(this, varHash); auto article = new Article(this, varHash);
if (addArticle(article)) if (addArticle(article))