Improve RSS subsystem initialization

PR #17227.
This commit is contained in:
Vladimir Golovnev 2022-06-18 09:56:49 +03:00 committed by GitHub
parent 7d97905716
commit a2121f2483
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 94 additions and 96 deletions

View file

@ -30,7 +30,6 @@
#include "rss_article.h"
#include <QJsonObject>
#include <QVariant>
#include "base/global.h"
@ -38,19 +37,6 @@
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 = u"id"_qs;
const QString Article::KeyDate = u"date"_qs;
const QString Article::KeyTitle = u"title"_qs;
@ -75,11 +61,6 @@ Article::Article(Feed *feed, const QVariantHash &varHash)
{
}
Article::Article(Feed *feed, const QJsonObject &jsonObj)
: Article(feed, articleDataFromJSON(jsonObj))
{
}
QString Article::guid() const
{
return m_guid;
@ -135,15 +116,6 @@ void Article::markAsRead()
}
}
QJsonObject Article::toJsonObject() const
{
auto jsonObj = QJsonObject::fromVariantHash(m_data);
// JSON object doesn't support DateTime so we need to convert it
jsonObj[KeyDate] = m_date.toString(Qt::RFC2822Date);
return jsonObj;
}
bool Article::articleDateRecentThan(const Article *article, const QDateTime &date)
{
return article->date() > date;