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

Fix 'Append label to save path'. Closes #4031.

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez) 2015-11-01 09:22:18 +03:00
parent a39ce57094
commit 25feee2366
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/bittorrent/session.cpp
View File

@ -1026,7 +1026,7 @@ bool Session::addTorrent(const TorrentInfo &torrentInfo, const AddTorrentParams
}
// Add a torrent to the BitTorrent session
bool Session::addTorrent_impl(const AddTorrentData &addData, const MagnetUri &magnetUri,
bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri,
const TorrentInfo &torrentInfo, const QByteArray &fastresumeData)
{
libt::add_torrent_params p;
@ -1098,21 +1098,21 @@ bool Session::addTorrent_impl(const AddTorrentData &addData, const MagnetUri &ma
p.max_connections = pref->getMaxConnecsPerTorrent();
p.max_uploads = pref->getMaxUploadsPerTorrent();
if (addData.savePath.isEmpty()) {
addData.savePath = m_defaultSavePath;
if (m_appendLabelToSavePath && !addData.label.isEmpty())
addData.savePath += QString("%1/").arg(addData.label);
}
else if (!addData.savePath.endsWith("/")) {
addData.savePath += "/";
}
QString savePath;
// Set actual save path (e.g. temporary folder)
if (isTempPathEnabled() && !addData.disableTempPath && !addData.hasSeedStatus) {
if (isTempPathEnabled() && !addData.disableTempPath && !addData.hasSeedStatus)
savePath = m_tempPath;
}
else {
else
savePath = addData.savePath;
if (savePath.isEmpty()) {
savePath = m_defaultSavePath;
if (m_appendLabelToSavePath && !addData.label.isEmpty())
savePath += QString("%1/").arg(addData.label);
}
else if (!savePath.endsWith("/"))
savePath += "/";
}
p.save_path = Utils::String::toStdString(Utils::Fs::toNativePath(savePath));
// Check if save path exists, creating it otherwise

2
src/core/bittorrent/session.h
View File

@ -288,7 +288,7 @@ namespace BitTorrent
void setAppendExtension(bool append);
void startUpTorrents();
bool addTorrent_impl(const AddTorrentData &addData, const MagnetUri &magnetUri,
bool addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri,
const TorrentInfo &torrentInfo = TorrentInfo(),
const QByteArray &fastresumeData = QByteArray());

3
src/core/bittorrent/torrenthandle.cpp
View File

@ -202,9 +202,6 @@ TorrentHandle::TorrentHandle(Session *session, const libtorrent::torrent_handle
, m_pauseAfterRecheck(false)
, m_needSaveResumeData(false)
{
if (m_savePath.isEmpty())
m_savePath = Utils::Fs::toNativePath(m_session->defaultSavePath());
initialize();
if (!data.resumed) {