squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-17 22:18:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Perform more RSS parsing in working thread

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez)
2019-06-04 15:06:29 +03:00
parent b0af479ab9
commit fe94e14bcc
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/base/rss/private/rss_parser.cpp
View File

@@ -637,7 +637,7 @@ void Parser::parseRssArticle(QXmlStreamReader &xml)
if (article[Article::KeyTorrentURL].toString().isEmpty()) if (article[Article::KeyTorrentURL].toString().isEmpty())
article[Article::KeyTorrentURL] = altTorrentUrl; article[Article::KeyTorrentURL] = altTorrentUrl;
m_result.articles.prepend(article); addArticle(article);
} }
void Parser::parseRSSChannel(QXmlStreamReader &xml) void Parser::parseRSSChannel(QXmlStreamReader &xml)
@@ -732,7 +732,7 @@ void Parser::parseAtomArticle(QXmlStreamReader &xml)
} }
} }
m_result.articles.prepend(article); addArticle(article);
} }
void Parser::parseAtomChannel(QXmlStreamReader &xml) void Parser::parseAtomChannel(QXmlStreamReader &xml)
@@ -762,3 +762,20 @@ void Parser::parseAtomChannel(QXmlStreamReader &xml)
} }
} }
} }
void Parser::addArticle(QVariantHash article)
{
QVariant &torrentURL = article[Article::KeyTorrentURL];
if (torrentURL.toString().isEmpty())
torrentURL = article[Article::KeyLink];
// If item does not have an ID, fall back to some other identifier.
QVariant &localId = article[Article::KeyId];
if (localId.toString().isEmpty())
localId = article.value(Article::KeyTorrentURL);
if (localId.toString().isEmpty())
localId = article.value(Article::KeyTitle);
if (!localId.toString().isEmpty())
m_result.articles.prepend(article);
}

1
src/base/rss/private/rss_parser.h
View File

@@ -65,6 +65,7 @@ namespace RSS
void parseRSSChannel(QXmlStreamReader &xml); void parseRSSChannel(QXmlStreamReader &xml);
void parseAtomArticle(QXmlStreamReader &xml); void parseAtomArticle(QXmlStreamReader &xml);
void parseAtomChannel(QXmlStreamReader &xml); void parseAtomChannel(QXmlStreamReader &xml);
void addArticle(QVariantHash article);
QString m_baseUrl; QString m_baseUrl;
ParsingResult m_result; ParsingResult m_result;

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

@@ -419,24 +419,10 @@ int Feed::updateArticles(const QList<QVariantHash> &loadedArticles)
QVector<QVariantHash> newArticles; QVector<QVariantHash> newArticles;
newArticles.reserve(loadedArticles.size()); newArticles.reserve(loadedArticles.size());
for (QVariantHash article : loadedArticles) { for (QVariantHash article : loadedArticles) {
QVariant &torrentURL = article[Article::KeyTorrentURL];
if (torrentURL.toString().isEmpty())
torrentURL = article[Article::KeyLink];
// If item does not have an ID, fall back to some other identifier.
QVariant &localId = article[Article::KeyId];
if (localId.toString().isEmpty())
localId = article.value(Article::KeyTorrentURL);
if (localId.toString().isEmpty())
localId = article.value(Article::KeyTitle);
if (localId.toString().isEmpty())
continue;
// If article has no publication date we use feed update time as a fallback. // If article has no publication date we use feed update time as a fallback.
// To prevent processing of "out-of-limit" articles we must not assign dates // To prevent processing of "out-of-limit" articles we must not assign dates
// that are earlier than the dates of existing articles. // that are earlier than the dates of existing articles.
const Article *existingArticle = articleByGUID(localId.toString()); const Article *existingArticle = articleByGUID(article[Article::KeyId].toString());
if (existingArticle) { if (existingArticle) {
dummyPubDate = existingArticle->date().addMSecs(-1); dummyPubDate = existingArticle->date().addMSecs(-1);
continue; continue;