Browse Source

Merge pull request #14586 from glassez/varhash

Don't cause QHash relayout while using reference to its node
adaptive-webui-19844
Vladimir Golovnev 4 years ago committed by GitHub
parent
commit
9f386afe9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 23
      src/base/rss/rss_parser.cpp

23
src/base/rss/rss_parser.cpp

@ -823,21 +823,24 @@ void Parser::addArticle(QVariantHash article)
{ {
QVariant &torrentURL = article[Article::KeyTorrentURL]; QVariant &torrentURL = article[Article::KeyTorrentURL];
if (torrentURL.toString().isEmpty()) if (torrentURL.toString().isEmpty())
torrentURL = article[Article::KeyLink]; torrentURL = article.value(Article::KeyLink);
// If item does not have an ID, fall back to some other identifier. // If item does not have an ID, fall back to some other identifier.
QVariant &localId = article[Article::KeyId]; 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()) if (localId.toString().isEmpty())
{ {
// The article could not be uniquely identified localId = article.value(Article::KeyTorrentURL);
// since it has no appropriate data. if (localId.toString().isEmpty())
// Just ignore it. {
return; localId = article.value(Article::KeyTitle);
if (localId.toString().isEmpty())
{
// The article could not be uniquely identified
// since it has no appropriate data.
// Just ignore it.
return;
}
}
} }
if (m_articleIDs.contains(localId.toString())) if (m_articleIDs.contains(localId.toString()))

Loading…
Cancel
Save