github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-31 03:50:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3649 from glassez/savepathlabel

Browse source 
Fix 'Append label to save path'. Closes #3495.
This commit is contained in:
sledgehammer999 2015-10-10 12:45:20 -05:00
commit 4291a08d47
4 changed files with 31 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/core/bittorrent/session.cpp
View file

@ -1412,14 +1412,9 @@ void Session::setDefaultSavePath(const QString &path)
{
if (path.isEmpty()) return;
QString defaultSavePath = Utils::Fs::fromNativePath(path);
if (!defaultSavePath.endsWith("/"))
defaultSavePath += "/";
if (m_defaultSavePath != defaultSavePath) {
m_defaultSavePath = defaultSavePath;
foreach (TorrentHandlePrivate *const torrent, m_torrents)
torrent->handleDefaultSavePathChanged();
}
m_defaultSavePath = Utils::Fs::fromNativePath(path);
if (!m_defaultSavePath.endsWith("/"))
m_defaultSavePath += "/";
}
void Session::setDefaultTempPath(const QString &path)
@ -1443,8 +1438,20 @@ void Session::setAppendLabelToSavePath(bool append)
{
if (m_appendLabelToSavePath != append) {
m_appendLabelToSavePath = append;
foreach (TorrentHandlePrivate *const torrent, m_torrents)
torrent->handleDefaultSavePathChanged();
foreach (TorrentHandle *const torrent, m_torrents) {
QString label = torrent->label();
if (label.isEmpty()) continue;
QString testedOldSavePath = m_defaultSavePath;
QString newSavePath = m_defaultSavePath;
if (!m_appendLabelToSavePath)
testedOldSavePath += QString("%1/").arg(label);
else
newSavePath += QString("%1/").arg(label);
if (torrent->savePath() == testedOldSavePath)
torrent->move(newSavePath);
}
}
}
@ -1618,6 +1625,19 @@ void Session::handleTorrentSavePathChanged(TorrentHandle *const torrent)
void Session::handleTorrentLabelChanged(TorrentHandle *const torrent, const QString &oldLabel)
{
if (m_appendLabelToSavePath) {
QString testedOldSavePath = m_defaultSavePath;
if (!oldLabel.isEmpty())
testedOldSavePath += QString("%1/").arg(oldLabel);
QString newLabel = torrent->label();
if (torrent->savePath() == testedOldSavePath) {
QString newSavePath = m_defaultSavePath;
if (!newLabel.isEmpty())
newSavePath += QString("%1/").arg(newLabel);
torrent->move(newSavePath);
}
}
emit torrentLabelChanged(torrent, oldLabel);
}