mirror of
https://github.com/qbittorrent/qBittorrent
synced 2025-07-06 21:21:24 -07:00
Improve RSS::Article class
Store more RSS article fields. Don't use legacy article field names in Parser code.
This commit is contained in:
parent
bd90614413
commit
475348595c
4 changed files with 69 additions and 81 deletions
|
@ -30,6 +30,7 @@
|
|||
|
||||
#include "rss_article.h"
|
||||
|
||||
#include <stdexcept>
|
||||
#include <QJsonObject>
|
||||
#include <QVariant>
|
||||
|
||||
|
@ -41,27 +42,41 @@ const QString Str_Title(QStringLiteral("title"));
|
|||
const QString Str_Author(QStringLiteral("author"));
|
||||
const QString Str_Description(QStringLiteral("description"));
|
||||
const QString Str_TorrentURL(QStringLiteral("torrentURL"));
|
||||
const QString Str_Torrent_Url(QStringLiteral("torrent_url"));
|
||||
const QString Str_Link(QStringLiteral("link"));
|
||||
const QString Str_News_Link(QStringLiteral("news_link"));
|
||||
const QString Str_IsRead(QStringLiteral("isRead"));
|
||||
const QString Str_Read(QStringLiteral("read"));
|
||||
|
||||
using namespace RSS;
|
||||
|
||||
Article::Article(Feed *feed, QString guid, QDateTime date, QString title, QString author
|
||||
, QString description, QString torrentUrl, QString link, bool isRead)
|
||||
Article::Article(Feed *feed, const QVariantHash &varHash)
|
||||
: QObject(feed)
|
||||
, m_feed(feed)
|
||||
, m_guid(guid)
|
||||
, m_date(date)
|
||||
, m_title(title)
|
||||
, m_author(author)
|
||||
, m_description(description)
|
||||
, m_torrentURL(torrentUrl)
|
||||
, m_link(link)
|
||||
, m_isRead(isRead)
|
||||
, m_guid(varHash.value(Str_Id).toString())
|
||||
, m_date(varHash.value(Str_Date).toDateTime())
|
||||
, m_title(varHash.value(Str_Title).toString())
|
||||
, m_author(varHash.value(Str_Author).toString())
|
||||
, m_description(varHash.value(Str_Description).toString())
|
||||
, m_torrentURL(varHash.value(Str_TorrentURL).toString())
|
||||
, m_link(varHash.value(Str_Link).toString())
|
||||
, m_isRead(varHash.value(Str_IsRead, false).toBool())
|
||||
, m_data(varHash)
|
||||
{
|
||||
// If item does not have a guid, fall back to some other identifier
|
||||
if (m_guid.isEmpty())
|
||||
m_guid = varHash.value(Str_TorrentURL).toString();
|
||||
if (m_guid.isEmpty())
|
||||
m_guid = varHash.value(Str_Title).toString();
|
||||
if (m_guid.isEmpty())
|
||||
throw std::runtime_error("Bad RSS Article data");
|
||||
|
||||
m_data[Str_Id] = m_guid;
|
||||
}
|
||||
|
||||
Article::Article(Feed *feed, const QJsonObject &jsonObj)
|
||||
: Article(feed, jsonObj.toVariantHash())
|
||||
{
|
||||
// JSON object store DateTime as string so we need to convert it
|
||||
m_date = QDateTime::fromString(jsonObj.value(Str_Date).toString(), Qt::RFC2822Date);
|
||||
m_data[Str_Date] = m_date;
|
||||
}
|
||||
|
||||
QString Article::guid() const
|
||||
|
@ -104,26 +119,27 @@ bool Article::isRead() const
|
|||
return m_isRead;
|
||||
}
|
||||
|
||||
QVariantHash Article::data() const
|
||||
{
|
||||
return m_data;
|
||||
}
|
||||
|
||||
void Article::markAsRead()
|
||||
{
|
||||
if (!m_isRead) {
|
||||
m_isRead = true;
|
||||
m_data[Str_IsRead] = m_isRead;
|
||||
emit read(this);
|
||||
}
|
||||
}
|
||||
|
||||
QJsonObject Article::toJsonObject() const
|
||||
{
|
||||
return {
|
||||
{Str_Id, m_guid},
|
||||
{Str_Date, m_date.toString(Qt::RFC2822Date)},
|
||||
{Str_Title, m_title},
|
||||
{Str_Author, m_author},
|
||||
{Str_Description, m_description},
|
||||
{Str_TorrentURL, m_torrentURL},
|
||||
{Str_Link, m_link},
|
||||
{Str_IsRead, m_isRead}
|
||||
};
|
||||
auto jsonObj = QJsonObject::fromVariantHash(m_data);
|
||||
// JSON object doesn't support DateTime so we need to convert it
|
||||
jsonObj[Str_Date] = m_date.toString(Qt::RFC2822Date);
|
||||
|
||||
return jsonObj;
|
||||
}
|
||||
|
||||
bool Article::articleDateRecentThan(Article *article, const QDateTime &date)
|
||||
|
@ -131,47 +147,6 @@ bool Article::articleDateRecentThan(Article *article, const QDateTime &date)
|
|||
return article->date() > date;
|
||||
}
|
||||
|
||||
Article *Article::fromJsonObject(Feed *feed, const QJsonObject &jsonObj)
|
||||
{
|
||||
QString guid = jsonObj.value(Str_Id).toString();
|
||||
// If item does not have a guid, fall back to some other identifier
|
||||
if (guid.isEmpty())
|
||||
guid = jsonObj.value(Str_Torrent_Url).toString();
|
||||
if (guid.isEmpty())
|
||||
guid = jsonObj.value(Str_Title).toString();
|
||||
if (guid.isEmpty()) return nullptr;
|
||||
|
||||
return new Article(
|
||||
feed, guid
|
||||
, QDateTime::fromString(jsonObj.value(Str_Date).toString(), Qt::RFC2822Date)
|
||||
, jsonObj.value(Str_Title).toString()
|
||||
, jsonObj.value(Str_Author).toString()
|
||||
, jsonObj.value(Str_Description).toString()
|
||||
, jsonObj.value(Str_TorrentURL).toString()
|
||||
, jsonObj.value(Str_Link).toString()
|
||||
, jsonObj.value(Str_IsRead).toBool(false));
|
||||
}
|
||||
|
||||
Article *Article::fromVariantHash(Feed *feed, const QVariantHash &varHash)
|
||||
{
|
||||
QString guid = varHash[Str_Id].toString();
|
||||
// If item does not have a guid, fall back to some other identifier
|
||||
if (guid.isEmpty())
|
||||
guid = varHash.value(Str_Torrent_Url).toString();
|
||||
if (guid.isEmpty())
|
||||
guid = varHash.value(Str_Title).toString();
|
||||
if (guid.isEmpty()) return nullptr;
|
||||
|
||||
return new Article(feed, guid
|
||||
, varHash.value(Str_Date).toDateTime()
|
||||
, varHash.value(Str_Title).toString()
|
||||
, varHash.value(Str_Author).toString()
|
||||
, varHash.value(Str_Description).toString()
|
||||
, varHash.value(Str_Torrent_Url).toString()
|
||||
, varHash.value(Str_News_Link).toString()
|
||||
, varHash.value(Str_Read, false).toBool());
|
||||
}
|
||||
|
||||
Feed *Article::feed() const
|
||||
{
|
||||
return m_feed;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue