d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-03-12 05:11:24 +00:00
Code Issues Projects Releases Wiki Activity

Improve "move torrent storage" queue

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez) 2020-05-08 14:42:02 +03:00
parent b6bf09fc0f
commit e49c554044
No known key found for this signature in database
GPG Key ID: 52A2C7DEE2DFA6F7
3 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1889,7 +1889,7 @@ bool Session::deleteTorrent(const InfoHash &hash, const DeleteOption deleteOptio
const auto iter = std::find_if(m_moveStorageQueue.begin() + 1, m_moveStorageQueue.end() const auto iter = std::find_if(m_moveStorageQueue.begin() + 1, m_moveStorageQueue.end()
, [torrent](const MoveStorageJob &job) , [torrent](const MoveStorageJob &job)
{ {
return job.torrent == torrent; return job.torrentHandle == torrent->nativeHandle();
}); });
if (iter != m_moveStorageQueue.end()) if (iter != m_moveStorageQueue.end())
m_moveStorageQueue.erase(iter); m_moveStorageQueue.erase(iter);
@ -4034,11 +4034,13 @@ bool Session::addMoveTorrentStorageJob(TorrentHandleImpl *torrent, const QString
{ {
Q_ASSERT(torrent); Q_ASSERT(torrent);
const lt::torrent_handle torrentHandle = torrent->nativeHandle();
if (m_moveStorageQueue.size() > 1) { if (m_moveStorageQueue.size() > 1) {
const auto iter = std::find_if(m_moveStorageQueue.begin() + 1, m_moveStorageQueue.end() const auto iter = std::find_if(m_moveStorageQueue.begin() + 1, m_moveStorageQueue.end()
, [torrent](const MoveStorageJob &job) , [&torrentHandle](const MoveStorageJob &job)
{ {
return job.torrent == torrent; return job.torrentHandle == torrentHandle;
}); });
if (iter != m_moveStorageQueue.end()) { if (iter != m_moveStorageQueue.end()) {
@ -4047,9 +4049,8 @@ bool Session::addMoveTorrentStorageJob(TorrentHandleImpl *torrent, const QString
} }
} }
QString currentLocation = QString::fromStdString( QString currentLocation = torrent->actualStorageLocation();
torrent->nativeHandle().status(lt::torrent_handle::query_save_path).save_path); if (!m_moveStorageQueue.isEmpty() && (m_moveStorageQueue.first().torrentHandle == torrentHandle)) {
if (!m_moveStorageQueue.isEmpty() && (m_moveStorageQueue.first().torrent == torrent)) {
// if there is active job for this torrent consider its target path as current location // if there is active job for this torrent consider its target path as current location
// of this torrent to prevent creating meaningless job that will do nothing // of this torrent to prevent creating meaningless job that will do nothing
currentLocation = m_moveStorageQueue.first().path; currentLocation = m_moveStorageQueue.first().path;
@ -4058,7 +4059,7 @@ bool Session::addMoveTorrentStorageJob(TorrentHandleImpl *torrent, const QString
if (QDir {currentLocation} == QDir {newPath}) if (QDir {currentLocation} == QDir {newPath})
return false; return false;
const MoveStorageJob moveStorageJob {torrent, newPath, mode}; const MoveStorageJob moveStorageJob {torrentHandle, newPath, mode};
m_moveStorageQueue << moveStorageJob; m_moveStorageQueue << moveStorageJob;
qDebug("Move storage from \"%s\" to \"%s\" is enqueued.", qUtf8Printable(currentLocation), qUtf8Printable(newPath)); qDebug("Move storage from \"%s\" to \"%s\" is enqueued.", qUtf8Printable(currentLocation), qUtf8Printable(newPath));
@ -4070,24 +4071,19 @@ bool Session::addMoveTorrentStorageJob(TorrentHandleImpl *torrent, const QString
void Session::moveTorrentStorage(const MoveStorageJob &job) const void Session::moveTorrentStorage(const MoveStorageJob &job) const
{ {
lt::torrent_handle handle = job.torrent->nativeHandle();
qDebug("Moving torrent storage to \"%s\"...", qUtf8Printable(job.path)); qDebug("Moving torrent storage to \"%s\"...", qUtf8Printable(job.path));
#if (LIBTORRENT_VERSION_NUM < 10200)
handle.move_storage(job.path.toUtf8().constData() job.torrentHandle.move_storage(job.path.toUtf8().constData()
, ((job.mode == MoveStorageMode::Overwrite) , ((job.mode == MoveStorageMode::Overwrite)
#if (LIBTORRENT_VERSION_NUM < 10200)
? lt::always_replace_files : lt::dont_replace)); ? lt::always_replace_files : lt::dont_replace));
#else #else
handle.move_storage(job.path.toUtf8().constData()
, ((job.mode == MoveStorageMode::Overwrite)
? lt::move_flags_t::always_replace_files : lt::move_flags_t::dont_replace)); ? lt::move_flags_t::always_replace_files : lt::move_flags_t::dont_replace));
#endif #endif
} }
void Session::handleMoveTorrentStorageJobFinished(const QString &errorMessage) void Session::handleMoveTorrentStorageJobFinished(const QString &errorMessage)
{ {
Q_ASSERT(!m_moveStorageQueue.isEmpty());
const MoveStorageJob finishedJob = m_moveStorageQueue.takeFirst(); const MoveStorageJob finishedJob = m_moveStorageQueue.takeFirst();
if (!m_moveStorageQueue.isEmpty()) if (!m_moveStorageQueue.isEmpty())
moveTorrentStorage(m_moveStorageQueue.first()); moveTorrentStorage(m_moveStorageQueue.first());
@ -4095,11 +4091,14 @@ void Session::handleMoveTorrentStorageJobFinished(const QString &errorMessage)
const auto iter = std::find_if(m_moveStorageQueue.cbegin(), m_moveStorageQueue.cend() const auto iter = std::find_if(m_moveStorageQueue.cbegin(), m_moveStorageQueue.cend()
, [&finishedJob](const MoveStorageJob &job) , [&finishedJob](const MoveStorageJob &job)
{ {
return job.torrent == finishedJob.torrent; return job.torrentHandle == finishedJob.torrentHandle;
}); });
if (iter == m_moveStorageQueue.cend()) { if (iter == m_moveStorageQueue.cend()) {
// There is no more job for this torrent // There is no more job for this torrent
finishedJob.torrent->handleStorageMoved(finishedJob.path, errorMessage); TorrentHandleImpl *torrent = m_torrents.value(finishedJob.torrentHandle.info_hash());
if (torrent) {
torrent->handleStorageMoved(finishedJob.path, errorMessage);
}
} }
} }
@ -4989,23 +4988,18 @@ void Session::handleAlertsDroppedAlert(const lt::alerts_dropped_alert *p) const
void Session::handleStorageMovedAlert(const lt::storage_moved_alert *p) void Session::handleStorageMovedAlert(const lt::storage_moved_alert *p)
{ {
if (m_moveStorageQueue.isEmpty()) return; Q_ASSERT(!m_moveStorageQueue.isEmpty());
Q_ASSERT(m_moveStorageQueue.first().torrentHandle == p->handle);
const TorrentHandleImpl *torrent = m_torrents.value(p->handle.info_hash());
const MoveStorageJob &currentJob = m_moveStorageQueue.first(); const MoveStorageJob &currentJob = m_moveStorageQueue.first();
if (currentJob.torrent != torrent) return;
const QString newPath {p->storage_path()}; const QString newPath {p->storage_path()};
handleMoveTorrentStorageJobFinished(newPath != currentJob.path ? tr("New path doesn't match a target path.") : QString {}); handleMoveTorrentStorageJobFinished(newPath != currentJob.path ? tr("New path doesn't match a target path.") : QString {});
} }
void Session::handleStorageMovedFailedAlert(const lt::storage_moved_failed_alert *p) void Session::handleStorageMovedFailedAlert(const lt::storage_moved_failed_alert *p)
{ {
if (m_moveStorageQueue.isEmpty()) return; Q_ASSERT(!m_moveStorageQueue.isEmpty());
Q_ASSERT(m_moveStorageQueue.first().torrentHandle == p->handle);
const TorrentHandleImpl *torrent = m_torrents.value(p->handle.info_hash());
const MoveStorageJob &currentJob = m_moveStorageQueue.first();
if (currentJob.torrent != torrent) return;
handleMoveTorrentStorageJobFinished(QString::fromStdString(p->message())); handleMoveTorrentStorageJobFinished(QString::fromStdString(p->message()));
} }

3
src/base/bittorrent/session.h
View File

@ -34,6 +34,7 @@
#include <vector> #include <vector>
#include <libtorrent/fwd.hpp> #include <libtorrent/fwd.hpp>
#include <libtorrent/torrent_handle.hpp>
#include <QHash> #include <QHash>
#include <QPointer> #include <QPointer>
@ -528,7 +529,7 @@ namespace BitTorrent
private: private:
struct MoveStorageJob struct MoveStorageJob
{ {
TorrentHandleImpl *torrent; lt::torrent_handle torrentHandle;
QString path; QString path;
MoveStorageMode mode; MoveStorageMode mode;
}; };

3
src/base/bittorrent/torrenthandleimpl.h
View File

@ -254,6 +254,8 @@ namespace BitTorrent
void saveResumeData(); void saveResumeData();
void handleStorageMoved(const QString &newPath, const QString &errorMessage); void handleStorageMoved(const QString &newPath, const QString &errorMessage);
QString actualStorageLocation() const;
private: private:
typedef std::function<void ()> EventTrigger; typedef std::function<void ()> EventTrigger;
@ -286,7 +288,6 @@ namespace BitTorrent
void resume_impl(bool forced); void resume_impl(bool forced);
bool isMoveInProgress() const; bool isMoveInProgress() const;
QString actualStorageLocation() const;
bool isAutoManaged() const; bool isAutoManaged() const;
void setAutoManaged(bool enable); void setAutoManaged(bool enable);