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

Don't replace existing files when relocating torrent

Browse source
This commit is contained in:
Vladimir Golovnev (qlassez) 2017-08-05 15:51:53 +03:00
parent 6043584305
commit 7d78457fe0
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
2 changed files with 41 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/base/bittorrent/torrenthandle.cpp
View file

@ -390,7 +390,7 @@ void TorrentHandle::setAutoTMMEnabled(bool enabled)
m_session->handleTorrentSavingModeChanged(this); m_session->handleTorrentSavingModeChanged(this);
if (m_useAutoTMM) if (m_useAutoTMM)
move_impl(m_session->categorySavePath(m_category)); move_impl(m_session->categorySavePath(m_category), true);
} }
bool TorrentHandle::hasRootFolder() const bool TorrentHandle::hasRootFolder() const
@ -1285,7 +1285,7 @@ bool TorrentHandle::setCategory(const QString &category)
if (m_useAutoTMM) { if (m_useAutoTMM) {
if (!m_session->isDisableAutoTMMWhenCategoryChanged()) if (!m_session->isDisableAutoTMMWhenCategoryChanged())
move_impl(m_session->categorySavePath(m_category)); move_impl(m_session->categorySavePath(m_category), true);
else else
setAutoTMMEnabled(false); setAutoTMMEnabled(false);
} }
@ -1305,16 +1305,16 @@ void TorrentHandle::move(QString path)
if (!path.endsWith('/')) if (!path.endsWith('/'))
path += '/'; path += '/';
move_impl(path); move_impl(path, false);
} }
void TorrentHandle::move_impl(QString path) void TorrentHandle::move_impl(QString path, bool overwrite)
{ {
path = Utils::Fs::toNativePath(path);
if (path == savePath()) return; if (path == savePath()) return;
path = Utils::Fs::toNativePath(path);
if (!useTempPath()) { if (!useTempPath()) {
moveStorage(path); moveStorage(path, overwrite);
} }
else { else {
m_savePath = path; m_savePath = path;
@ -1416,11 +1416,12 @@ void TorrentHandle::resume(bool forced)
m_nativeHandle.resume(); m_nativeHandle.resume();
} }
void TorrentHandle::moveStorage(const QString &newPath) void TorrentHandle::moveStorage(const QString &newPath, bool overwrite)
{ {
if (isMoveInProgress()) { if (isMoveInProgress()) {
qDebug("enqueue move storage to %s", qPrintable(newPath)); qDebug("enqueue move storage to %s", qPrintable(newPath));
m_queuedPath = newPath; m_moveStorageInfo.queuedPath = newPath;
m_moveStorageInfo.queuedOverwrite = overwrite;
} }
else { else {
const QString oldPath = nativeActualSavePath(); const QString oldPath = nativeActualSavePath();
@ -1428,9 +1429,10 @@ void TorrentHandle::moveStorage(const QString &newPath)
qDebug("move storage: %s to %s", qPrintable(oldPath), qPrintable(newPath)); qDebug("move storage: %s to %s", qPrintable(oldPath), qPrintable(newPath));
// Actually move the storage // Actually move the storage
m_nativeHandle.move_storage(newPath.toUtf8().constData()); m_nativeHandle.move_storage(newPath.toUtf8().constData()
m_oldPath = oldPath; , (overwrite ? libt::always_replace_files : libt::dont_replace));
m_newPath = newPath; m_moveStorageInfo.oldPath = oldPath;
m_moveStorageInfo.newPath = newPath;
} }
} }
@ -1492,22 +1494,22 @@ void TorrentHandle::handleStorageMovedAlert(libtorrent::storage_moved_alert *p)
#else #else
const QString newPath(p->storage_path()); const QString newPath(p->storage_path());
#endif #endif
if (newPath != m_newPath) { if (newPath != m_moveStorageInfo.newPath) {
qWarning() << Q_FUNC_INFO << ": New path doesn't match a path in a queue."; qWarning() << Q_FUNC_INFO << ": New path doesn't match a path in a queue.";
return; return;
} }
qDebug("Torrent is successfully moved from %s to %s", qPrintable(m_oldPath), qPrintable(m_newPath)); qDebug("Torrent is successfully moved from %s to %s", qPrintable(m_moveStorageInfo.oldPath), qPrintable(m_moveStorageInfo.newPath));
if (QDir(m_oldPath) == QDir(m_session->torrentTempPath(info()))) { if (QDir(m_moveStorageInfo.oldPath) == QDir(m_session->torrentTempPath(info()))) {
qDebug() << "Removing torrent temp folder:" << m_oldPath; qDebug() << "Removing torrent temp folder:" << m_moveStorageInfo.oldPath;
Utils::Fs::smartRemoveEmptyFolderTree(m_oldPath); Utils::Fs::smartRemoveEmptyFolderTree(m_moveStorageInfo.oldPath);
} }
updateStatus(); updateStatus();
m_newPath.clear(); m_moveStorageInfo.newPath.clear();
if (!m_queuedPath.isEmpty()) { if (!m_moveStorageInfo.queuedPath.isEmpty()) {
moveStorage(m_queuedPath); moveStorage(m_moveStorageInfo.queuedPath, m_moveStorageInfo.queuedOverwrite);
m_queuedPath.clear(); m_moveStorageInfo.queuedPath.clear();
} }
if (!useTempPath()) { if (!useTempPath()) {
@ -1529,10 +1531,10 @@ void TorrentHandle::handleStorageMovedFailedAlert(libtorrent::storage_moved_fail
Logger::instance()->addMessage(tr("Could not move torrent: '%1'. Reason: %2") Logger::instance()->addMessage(tr("Could not move torrent: '%1'. Reason: %2")
.arg(name()).arg(QString::fromStdString(p->message())), Log::CRITICAL); .arg(name()).arg(QString::fromStdString(p->message())), Log::CRITICAL);
m_newPath.clear(); m_moveStorageInfo.newPath.clear();
if (!m_queuedPath.isEmpty()) { if (!m_moveStorageInfo.queuedPath.isEmpty()) {
moveStorage(m_queuedPath); moveStorage(m_moveStorageInfo.queuedPath, m_moveStorageInfo.queuedOverwrite);
m_queuedPath.clear(); m_moveStorageInfo.queuedPath.clear();
} }
while (!isMoveInProgress() && (m_renameCount == 0) && !m_moveFinishedTriggers.isEmpty()) while (!isMoveInProgress() && (m_renameCount == 0) && !m_moveFinishedTriggers.isEmpty())
@ -1816,7 +1818,7 @@ void TorrentHandle::handleTempPathChanged()
void TorrentHandle::handleCategorySavePathChanged() void TorrentHandle::handleCategorySavePathChanged()
{ {
if (m_useAutoTMM) if (m_useAutoTMM)
move_impl(m_session->categorySavePath(m_category)); move_impl(m_session->categorySavePath(m_category), true);
} }
void TorrentHandle::handleAppendExtensionToggled() void TorrentHandle::handleAppendExtensionToggled()
@ -1931,7 +1933,7 @@ void TorrentHandle::adjustActualSavePath_impl()
qDebug() << "Moving torrent to its temporary folder:" << path; qDebug() << "Moving torrent to its temporary folder:" << path;
} }
moveStorage(Utils::Fs::toNativePath(path)); moveStorage(Utils::Fs::toNativePath(path), true);
} }
libtorrent::torrent_handle TorrentHandle::nativeHandle() const libtorrent::torrent_handle TorrentHandle::nativeHandle() const
@ -1951,7 +1953,7 @@ void TorrentHandle::updateTorrentInfo()
bool TorrentHandle::isMoveInProgress() const bool TorrentHandle::isMoveInProgress() const
{ {
return !m_newPath.isEmpty(); return !m_moveStorageInfo.newPath.isEmpty();
} }
bool TorrentHandle::useTempPath() const bool TorrentHandle::useTempPath() const

19
src/base/bittorrent/torrenthandle.h
View file

@ -421,8 +421,8 @@ namespace BitTorrent
void adjustActualSavePath(); void adjustActualSavePath();
void adjustActualSavePath_impl(); void adjustActualSavePath_impl();
void move_impl(QString path); void move_impl(QString path, bool overwrite);
void moveStorage(const QString &newPath); void moveStorage(const QString &newPath, bool overwrite);
void manageIncompleteFiles(); void manageIncompleteFiles();
bool addTracker(const TrackerEntry &tracker); bool addTracker(const TrackerEntry &tracker);
bool addUrlSeed(const QUrl &urlSeed); bool addUrlSeed(const QUrl &urlSeed);
@ -437,11 +437,16 @@ namespace BitTorrent
InfoHash m_hash; InfoHash m_hash;
QString m_oldPath; struct
QString m_newPath; {
// m_queuedPath is where files should be moved to, QString oldPath;
// when current moving is completed QString newPath;
QString m_queuedPath; // queuedPath is where files should be moved to,
// when current moving is completed
QString queuedPath;
bool queuedOverwrite = true;
} m_moveStorageInfo;
// m_moveFinishedTriggers is activated only when the following conditions are met: // m_moveFinishedTriggers is activated only when the following conditions are met:
// all file rename jobs complete, all file move jobs complete // all file rename jobs complete, all file move jobs complete
QQueue<EventTrigger> m_moveFinishedTriggers; QQueue<EventTrigger> m_moveFinishedTriggers;