github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-11 15:56:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Clean up 'recursive download' related code

Browse source 
Don't load .torrent files too early, otherwise qbt might emit a dubious error log message if the
.torrent file is invalid.
This commit is contained in:
Chocobo1 2022-09-14 15:28:44 +08:00
parent 80759f9e69
commit f8a2fbc4c5
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
6 changed files with 42 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/base/bittorrent/sessionimpl.cpp
View file

@ -4552,21 +4552,13 @@ void SessionImpl::handleTorrentFinished(TorrentImpl *const torrent)
if (const Path exportPath = finishedTorrentExportDirectory(); !exportPath.isEmpty())
exportTorrentFile(torrent, exportPath);
// Check if there are torrent files inside
// Check whether it contains .torrent files
for (const Path &torrentRelpath : asConst(torrent->filePaths()))
{
if (torrentRelpath.hasExtension(u".torrent"_qs))
{
const Path torrentFullpath = torrent->actualStorageLocation() / torrentRelpath;
if (TorrentInfo::loadFromFile(torrentFullpath))
{
emit recursiveTorrentDownloadPossible(torrent);
break;
}
else
{
LogMsg(tr("Unable to load torrent. File: \"%1\"").arg(torrentFullpath.toString()), Log::CRITICAL);
}
emit recursiveTorrentDownloadPossible(torrent);
break;
}
}
@ -4854,25 +4846,32 @@ void SessionImpl::disableIPFilter()
void SessionImpl::recursiveTorrentDownload(const TorrentID &id)
{
TorrentImpl *const torrent = m_torrents.value(id);
if (!torrent) return;
const TorrentImpl *torrent = m_torrents.value(id);
if (!torrent)
return;
for (const Path &torrentRelpath : asConst(torrent->filePaths()))
{
if (torrentRelpath.hasExtension(u".torrent"_qs))
{
LogMsg(tr("Recursive download .torrent file within torrent. Source torrent: \"%1\". File: \"%2\"")
.arg(torrent->name(), torrentRelpath.toString()));
const Path torrentFullpath = torrent->savePath() / torrentRelpath;
LogMsg(tr("Recursive download .torrent file within torrent. Source torrent: \"%1\". File: \"%2\"")
.arg(torrent->name(), torrentFullpath.toString()));
AddTorrentParams params;
// Passing the save path along to the sub torrent file
params.savePath = torrent->savePath();
const nonstd::expected<TorrentInfo, QString> loadResult = TorrentInfo::loadFromFile(torrentFullpath);
if (loadResult)
{
addTorrent(loadResult.value(), params);
}
else
LogMsg(tr("Failed to load torrent. Error: \"%1\"").arg(loadResult.error()), Log::WARNING);
{
LogMsg(tr("Failed to load .torrent file within torrent. Source torrent: \"%1\". File: \"%2\". Error: \"%3\"")
.arg(torrent->name(), torrentFullpath.toString(), loadResult.error()), Log::WARNING);
}
}
}
}