github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-15 01:33:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Use 'fail if exist' strategy on automatic move

Browse source 
Prevent existing files overwriting when torrent is moved automatically (e.g. when moved from incomplete to final save path).

PR #17855.
This commit is contained in:
Vladimir Golovnev 2022-10-11 10:05:21 +03:00 • committed by GitHub
parent f66ec4430d
commit 4f0990dc29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -298,6 +298,21 @@ namespace
return {};
}
#endif
constexpr lt::move_flags_t toNative(const MoveStorageMode mode)
{
switch (mode)
{
default:
Q_ASSERT(false);
case MoveStorageMode::FailIfExist:
return lt::move_flags_t::fail_if_exist;
case MoveStorageMode::KeepExistingFiles:
return lt::move_flags_t::dont_replace;
case MoveStorageMode::Overwrite:
return lt::move_flags_t::always_replace_files;
}
}
}
struct BitTorrent::SessionImpl::ResumeSessionContext final : public QObject
@ -4690,9 +4705,7 @@ void SessionImpl::moveTorrentStorage(const MoveStorageJob &job) const
const QString torrentName = (torrent ? torrent->name() : id.toString());
LogMsg(tr("Start moving torrent. Torrent: \"%1\". Destination: \"%2\"").arg(torrentName, job.path.toString()));
job.torrentHandle.move_storage(job.path.toString().toStdString()
, ((job.mode == MoveStorageMode::Overwrite)
? lt::move_flags_t::always_replace_files : lt::move_flags_t::dont_replace));
job.torrentHandle.move_storage(job.path.toString().toStdString(), toNative(job.mode));
}
void SessionImpl::handleMoveTorrentStorageJobFinished(const Path &newPath)