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 save path bugs

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez) 2016-03-06 09:25:55 +03:00
parent 45617e086c
commit c047ef5b37
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,10 +131,15 @@ namespace
return result; return result;
} }
QString normalizePath(QString path, const QString &defaultPath = Utils::Fs::QDesktopServicesDownloadLocation()) QString normalizeSavePath(QString path, const QString &defaultPath = Utils::Fs::QDesktopServicesDownloadLocation())
{ {
path = Utils::Fs::fromNativePath(path.trimmed()); path = Utils::Fs::fromNativePath(path.trimmed());
return !path.isEmpty() ? path : defaultPath; if (path.isEmpty())
path = Utils::Fs::fromNativePath(defaultPath.trimmed());
if (!path.isEmpty() && !path.endsWith('/'))
path += '/';
return path;
} }
QStringMap expandCategories(const QStringMap &categories) QStringMap expandCategories(const QStringMap &categories)
@ -242,8 +247,8 @@ Session::Session(QObject *parent)
m_statistics = new Statistics(this); m_statistics = new Statistics(this);
m_maxRatioAction = static_cast<MaxRatioAction>(m_settings->loadValue(KEY_MAXRATIOACTION, Pause).toInt()); m_maxRatioAction = static_cast<MaxRatioAction>(m_settings->loadValue(KEY_MAXRATIOACTION, Pause).toInt());
m_defaultSavePath = normalizePath(m_settings->loadValue(KEY_DEFAULTSAVEPATH).toString()); m_defaultSavePath = normalizeSavePath(m_settings->loadValue(KEY_DEFAULTSAVEPATH).toString());
m_tempPath = normalizePath(m_settings->loadValue(KEY_TEMPPATH).toString(), m_defaultSavePath + "/temp"); m_tempPath = normalizeSavePath(m_settings->loadValue(KEY_TEMPPATH).toString(), m_defaultSavePath + "temp");
// Apply user settings to BitTorrent session // Apply user settings to BitTorrent session
configure(); configure();
@ -318,7 +323,7 @@ QString Session::tempPath() const
bool Session::isValidCategoryName(const QString &name) bool Session::isValidCategoryName(const QString &name)
{ {
QRegExp re(R"#(^([^\\\/]|[^\\\/]([^\\\/]|\/(?=[^\/]))*[^\\\/])$)#"); QRegExp re(R"(^([^\\\/]|[^\\\/]([^\\\/]|\/(?=[^\/]))*[^\\\/])$)");
if (!name.isEmpty() && (re.indexIn(name) != 0)) { if (!name.isEmpty() && (re.indexIn(name) != 0)) {
qDebug() << "Incorrect category name:" << name; qDebug() << "Incorrect category name:" << name;
return false; return false;
@ -351,16 +356,16 @@ QStringList Session::categories() const
QString Session::categorySavePath(const QString &categoryName) const QString Session::categorySavePath(const QString &categoryName) const
{ {
QString basePath = m_defaultSavePath; QString basePath = m_defaultSavePath;
QString path = m_categories.value(categoryName);
if (categoryName.isEmpty()) return basePath; if (categoryName.isEmpty()) return basePath;
QString path = m_categories.value(categoryName);
if (path.isEmpty()) // use implicit save path if (path.isEmpty()) // use implicit save path
path = Utils::Fs::toValidFileSystemName(categoryName, true); path = Utils::Fs::toValidFileSystemName(categoryName, true);
if (!QDir::isAbsolutePath(path)) if (!QDir::isAbsolutePath(path))
path = QString("%1/%2").arg(basePath).arg(path); path.prepend(basePath);
return path; return normalizeSavePath(path);
} }
bool Session::addCategory(const QString &name, const QString &savePath) bool Session::addCategory(const QString &name, const QString &savePath)
@ -1218,10 +1223,9 @@ bool Session::addTorrent(const TorrentInfo &torrentInfo, const AddTorrentParams
bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri, bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri,
const TorrentInfo &torrentInfo, const QByteArray &fastresumeData) const TorrentInfo &torrentInfo, const QByteArray &fastresumeData)
{ {
if (!addData.resumed) { addData.savePath = normalizeSavePath(
if (addData.savePath.isEmpty() && isASMDisabledByDefault()) addData.savePath,
addData.savePath = m_defaultSavePath; ((!addData.resumed && isASMDisabledByDefault()) ? m_defaultSavePath : ""));
}
if (!addData.category.isEmpty()) { if (!addData.category.isEmpty()) {
if (!m_categories.contains(addData.category) && !addCategory(addData.category)) { if (!m_categories.contains(addData.category) && !addCategory(addData.category)) {
@ -1230,8 +1234,6 @@ bool Session::addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri
} }
} }
addData.savePath = Utils::Fs::fromNativePath(addData.savePath);
libt::add_torrent_params p; libt::add_torrent_params p;
InfoHash hash; InfoHash hash;
std::vector<char> buf(fastresumeData.constData(), fastresumeData.constData() + fastresumeData.size()); std::vector<char> buf(fastresumeData.constData(), fastresumeData.constData() + fastresumeData.size());
@ -1591,7 +1593,7 @@ void Session::saveResumeData()
void Session::setDefaultSavePath(QString path) void Session::setDefaultSavePath(QString path)
{ {
path = normalizePath(path); path = normalizeSavePath(path);
if (m_defaultSavePath == path) return; if (m_defaultSavePath == path) return;
m_defaultSavePath = path; m_defaultSavePath = path;
@ -1607,7 +1609,7 @@ void Session::setDefaultSavePath(QString path)
void Session::setTempPath(QString path) void Session::setTempPath(QString path)
{ {
path = normalizePath(path, m_defaultSavePath + "/temp"); path = normalizeSavePath(path, m_defaultSavePath + "temp");
if (m_tempPath == path) return; if (m_tempPath == path) return;
m_tempPath = path; m_tempPath = path;

6
src/base/bittorrent/torrenthandle.cpp
View File

@ -1172,6 +1172,12 @@ void TorrentHandle::move(QString path)
m_useASM = false; m_useASM = false;
m_session->handleTorrentSavingModeChanged(this); m_session->handleTorrentSavingModeChanged(this);
path = Utils::Fs::fromNativePath(path.trimmed());
if (path.isEmpty())
path = m_session->defaultSavePath();
if (!path.endsWith('/'))
path += '/';
move_impl(path); move_impl(path);
} }