d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

[RSS] Improve error handling when a RSS feed doesn't contain torrents

Browse Source
This commit is contained in:
ngosang 2015-08-04 02:43:45 +02:00
parent b78ccf289e
commit 2955bb5488
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/rss/rss_imp.cpp
View File

@ -355,6 +355,8 @@ void RSSImp::downloadSelectedTorrents()
RssArticlePtr article = feed->getItem(item->data(Article::IdRole).toString()); RssArticlePtr article = feed->getItem(item->data(Article::IdRole).toString());
if (!article) continue; if (!article) continue;
if (article->torrentUrl().isEmpty())
continue;
if (Preferences::instance()->useAdditionDialog()) if (Preferences::instance()->useAdditionDialog())
AddNewTorrentDialog::show(article->torrentUrl()); AddNewTorrentDialog::show(article->torrentUrl());
else else

4
src/gui/rss/rssarticle.cpp
View File

@ -82,7 +82,7 @@ const QString& RssArticle::author() const {
} }
const QString& RssArticle::torrentUrl() const { const QString& RssArticle::torrentUrl() const {
return m_torrentUrl.isEmpty() ? m_link : m_torrentUrl; return m_torrentUrl;
} }
const QString& RssArticle::link() const { const QString& RssArticle::link() const {
@ -123,6 +123,6 @@ const QString& RssArticle::title() const
} }
void RssArticle::handleTorrentDownloadSuccess(const QString &url) { void RssArticle::handleTorrentDownloadSuccess(const QString &url) {
if (url == m_torrentUrl || url == m_link) if (url == m_torrentUrl)
markAsRead(); markAsRead();
} }

6
src/gui/rss/rssfeed.cpp
View File

@ -364,6 +364,12 @@ void RssFeed::downloadArticleTorrentIfMatching(RssDownloadRuleList* rules, const
rules->saveRulesToStorage(); rules->saveRulesToStorage();
// Download the torrent // Download the torrent
const QString& torrent_url = article->torrentUrl(); const QString& torrent_url = article->torrentUrl();
if (torrent_url.isEmpty()) {
Logger::instance()->addMessage(tr("Automatic download %1 from %2 RSS feed failed because it doesn't contain a torrent or a magnet link...").arg(article->title()).arg(displayName()), Log::WARNING);
article->markAsRead();
return;
}
Logger::instance()->addMessage(tr("Automatically downloading %1 torrent from %2 RSS feed...").arg(article->title()).arg(displayName())); Logger::instance()->addMessage(tr("Automatically downloading %1 torrent from %2 RSS feed...").arg(article->title()).arg(displayName()));
connect(BitTorrent::Session::instance(), SIGNAL(downloadFromUrlFinished(QString)), article.data(), SLOT(handleTorrentDownloadSuccess(const QString&)), Qt::UniqueConnection); connect(BitTorrent::Session::instance(), SIGNAL(downloadFromUrlFinished(QString)), article.data(), SLOT(handleTorrentDownloadSuccess(const QString&)), Qt::UniqueConnection);
connect(article.data(), SIGNAL(articleWasRead()), SLOT(handleArticleStateChanged()), Qt::UniqueConnection); connect(article.data(), SIGNAL(articleWasRead()), SLOT(handleArticleStateChanged()), Qt::UniqueConnection);