d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-28 23:44:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9817 from Piccirello/torrent-dl-success

Browse Source 
Handle downloading .torrent file as success
This commit is contained in:
Vladimir Golovnev 2018-11-06 15:39:51 +03:00 committed by GitHub
commit 54e4806e3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/base/bittorrent/session.cpp
View File

@ -2087,10 +2087,10 @@ TorrentStatusReport Session::torrentStatusReport() const
bool Session::addTorrent(QString source, const AddTorrentParams &params) bool Session::addTorrent(QString source, const AddTorrentParams &params)
{ {
MagnetUri magnetUri(source); MagnetUri magnetUri(source);
if (magnetUri.isValid()) { if (magnetUri.isValid())
return addTorrent_impl(params, magnetUri); return addTorrent_impl(params, magnetUri);
}
else if (Utils::Misc::isUrl(source)) { if (Utils::Misc::isUrl(source)) {
LogMsg(tr("Downloading '%1', please wait...", "e.g: Downloading 'xxx.torrent', please wait...").arg(source)); LogMsg(tr("Downloading '%1', please wait...", "e.g: Downloading 'xxx.torrent', please wait...").arg(source));
// Launch downloader // Launch downloader
Net::DownloadHandler *handler = Net::DownloadHandler *handler =
@ -2100,13 +2100,13 @@ bool Session::addTorrent(QString source, const AddTorrentParams &params)
connect(handler, &Net::DownloadHandler::downloadFailed, this, &Session::handleDownloadFailed); connect(handler, &Net::DownloadHandler::downloadFailed, this, &Session::handleDownloadFailed);
connect(handler, &Net::DownloadHandler::redirectedToMagnet, this, &Session::handleRedirectedToMagnet); connect(handler, &Net::DownloadHandler::redirectedToMagnet, this, &Session::handleRedirectedToMagnet);
m_downloadedTorrents[handler->url()] = params; m_downloadedTorrents[handler->url()] = params;
return true;
} }
else {
TorrentFileGuard guard(source); TorrentFileGuard guard(source);
if (addTorrent_impl(params, MagnetUri(), TorrentInfo::loadFromFile(source))) { if (addTorrent_impl(params, MagnetUri(), TorrentInfo::loadFromFile(source))) {
guard.markAsAddedToSession(); guard.markAsAddedToSession();
return true; return true;
}
} }
return false; return false;