github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-29 19:18:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix the adding of .torrent files via http links which was broken by 30bc5a1da6.

Browse source
This commit is contained in:
sledgehammer999 2014-08-15 11:33:09 +03:00
parent 12302ee86f
commit efb3936ef1
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/qtlibtorrent/qbtsession.cpp
View file

@ -1016,7 +1016,12 @@ QTorrentHandle QBtSession::addTorrent(QString path, bool fromScanDir, QString fr
// Check if BT_backup directory exists // Check if BT_backup directory exists
const QDir torrentBackup(fsutils::BTBackupLocation()); const QDir torrentBackup(fsutils::BTBackupLocation());
if (!torrentBackup.exists()) return h; if (!torrentBackup.exists()) {
// If temporary file, remove it
if (!from_url.isNull() || fromScanDir)
fsutils::forceRemove(path);
return h;
}
// Fix the input path if necessary // Fix the input path if necessary
path = fsutils::fromNativePath(path); path = fsutils::fromNativePath(path);
@ -1078,7 +1083,7 @@ QTorrentHandle QBtSession::addTorrent(QString path, bool fromScanDir, QString fr
// Delete file if temporary // Delete file if temporary
if (!from_url.isNull() || fromScanDir) if (!from_url.isNull() || fromScanDir)
fsutils::forceRemove(path); fsutils::forceRemove(path);
return h; return h;
} }
@ -1087,7 +1092,7 @@ QTorrentHandle QBtSession::addTorrent(QString path, bool fromScanDir, QString fr
addConsoleMessage(tr("Error: The torrent %1 does not contain any file.").arg(misc::toQStringU(t->name()))); addConsoleMessage(tr("Error: The torrent %1 does not contain any file.").arg(misc::toQStringU(t->name())));
// Delete file if temporary // Delete file if temporary
if (!from_url.isNull() || fromScanDir) if (!from_url.isNull() || fromScanDir)
fsutils::forceRemove(path); fsutils::forceRemove(path);
return h; return h;
} }
@ -1148,8 +1153,9 @@ QTorrentHandle QBtSession::addTorrent(QString path, bool fromScanDir, QString fr
// Check if it worked // Check if it worked
if (!h.is_valid()) { if (!h.is_valid()) {
qDebug("/!\\ Error: Invalid handle"); qDebug("/!\\ Error: Invalid handle");
if (!from_url.isNull()) // If temporary file, remove it
fsutils::forceRemove(path); if (!from_url.isNull() || fromScanDir)
fsutils::forceRemove(path);
return h; return h;
} }
@ -2871,7 +2877,6 @@ void QBtSession::processDownloadedFile(QString url, QString file_path) {
h.pause(); h.pause();
emit newDownloadedTorrentFromRss(url); emit newDownloadedTorrentFromRss(url);
} }
fsutils::forceRemove(file_path);
} }
// Return current download rate for the BT // Return current download rate for the BT