mirror/qBittorrent
2
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-21 08:09:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[RSS] Handle magnet links as torrents instead of news URLs. Closes #3560

Browse Source
This commit is contained in:
ngosang 2015-08-04 01:04:00 +02:00
parent 51e0e485f4
commit c3592304b6
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/rss/rssparser.cpp
View File

@ -259,8 +259,13 @@ void RssParser::parseRssArticle(QXmlStreamReader& xml, const QString& feedUrl)
if (xml.attributes().value("type") == "application/x-bittorrent") if (xml.attributes().value("type") == "application/x-bittorrent")
article["torrent_url"] = xml.attributes().value("url").toString(); article["torrent_url"] = xml.attributes().value("url").toString();
} }
else if (xml.name() == "link") else if (xml.name() == "link") {
article["news_link"] = xml.readElementText(); QString link = xml.readElementText().trimmed();
if (link.startsWith("magnet:", Qt::CaseInsensitive))
article["torrent_url"] = link; // magnet link instead of a news URL
else
article["news_link"] = link;
}
else if (xml.name() == "description") else if (xml.name() == "description")
article["description"] = xml.readElementText(); article["description"] = xml.readElementText();
else if (xml.name() == "pubDate") else if (xml.name() == "pubDate")
@ -341,17 +346,18 @@ void RssParser::parseAtomArticle(QXmlStreamReader& xml, const QString& feedUrl,
article["title"] = doc.toPlainText(); article["title"] = doc.toPlainText();
} }
else if (xml.name() == "link") { else if (xml.name() == "link") {
QString theLink = ( xml.attributes().isEmpty() ? QString link = ( xml.attributes().isEmpty() ?
xml.readElementText() : xml.readElementText().trimmed() :
xml.attributes().value("href").toString() ); xml.attributes().value("href").toString() );
// Atom feeds can have relative links, work around this and if (link.startsWith("magnet:", Qt::CaseInsensitive))
// take the stress of figuring article full URI from UI article["torrent_url"] = link; // magnet link instead of a news URL
else
// Atom feeds can have relative links, work around this and
// take the stress of figuring article full URI from UI
// Assemble full URI
article["news_link"] = ( baseUrl.isEmpty() ? link : baseUrl + link );
// Assemble full URI
article["news_link"] = ( baseUrl.isEmpty() ?
theLink :
baseUrl + theLink );
} }
else if (xml.name() == "summary" || xml.name() == "content"){ else if (xml.name() == "summary" || xml.name() == "content"){
if(double_content) { // Duplicate content -> ignore if(double_content) { // Duplicate content -> ignore