github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-21 05:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Extract torrent reloading logic into separate method

Browse source
This commit is contained in:
Vladimir Golovnev (Glassez) 2021-01-01 16:08:01 +03:00
commit 06105072f9
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
2 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/base/bittorrent/torrenthandleimpl.cpp
View file

@ -1308,44 +1308,57 @@ void TorrentHandleImpl::fileSearchFinished(const QString &savePath, const QStrin
void TorrentHandleImpl::endReceivedMetadataHandling(const QString &savePath, const QStringList &fileNames) void TorrentHandleImpl::endReceivedMetadataHandling(const QString &savePath, const QStringList &fileNames)
{ {
const auto queuePos = m_nativeHandle.queue_position(); lt::add_torrent_params &p = m_ltAddTorrentParams;
lt::add_torrent_params p = m_ltAddTorrentParams;
p.ti = std::const_pointer_cast<lt::torrent_info>(m_nativeHandle.torrent_file()); p.ti = std::const_pointer_cast<lt::torrent_info>(m_nativeHandle.torrent_file());
m_nativeSession->remove_torrent(m_nativeHandle, lt::session::delete_partfile);
for (int i = 0; i < fileNames.size(); ++i) for (int i = 0; i < fileNames.size(); ++i)
p.renamed_files[lt::file_index_t {i}] = fileNames[i].toStdString(); p.renamed_files[lt::file_index_t {i}] = fileNames[i].toStdString();
p.save_path = Utils::Fs::toNativePath(savePath).toStdString(); p.save_path = Utils::Fs::toNativePath(savePath).toStdString();
p.flags |= lt::torrent_flags::update_subscribe
| lt::torrent_flags::override_trackers
| lt::torrent_flags::override_web_seeds;
m_nativeHandle = m_nativeSession->add_torrent(p); reload();
m_nativeHandle.queue_position_set(queuePos);
m_torrentInfo = TorrentInfo {m_nativeHandle.torrent_file()};
// If first/last piece priority was specified when adding this torrent, // If first/last piece priority was specified when adding this torrent,
// we should apply it now that we have metadata: // we should apply it now that we have metadata:
if (m_hasFirstLastPiecePriority) if (m_hasFirstLastPiecePriority)
applyFirstLastPiecePriority(true); applyFirstLastPiecePriority(true);
if (!m_isStopped)
{
setAutoManaged(m_operatingMode == TorrentOperatingMode::AutoManaged);
if (m_operatingMode == TorrentOperatingMode::Forced)
m_nativeHandle.resume();
}
m_maintenanceJob = MaintenanceJob::None; m_maintenanceJob = MaintenanceJob::None;
updateStatus(); updateStatus();
m_session->handleTorrentMetadataReceived(this); m_session->handleTorrentMetadataReceived(this);
} }
void TorrentHandleImpl::reload()
{
const auto queuePos = m_nativeHandle.queue_position();
m_nativeSession->remove_torrent(m_nativeHandle, lt::session::delete_partfile);
lt::add_torrent_params p = m_ltAddTorrentParams;
p.flags |= lt::torrent_flags::update_subscribe
| lt::torrent_flags::override_trackers
| lt::torrent_flags::override_web_seeds;
if (m_isStopped)
{
p.flags |= lt::torrent_flags::paused;
p.flags &= ~lt::torrent_flags::auto_managed;
}
else if (m_operatingMode == TorrentOperatingMode::AutoManaged)
{
p.flags |= (lt::torrent_flags::auto_managed | lt::torrent_flags::paused);
}
else
{
p.flags &= ~(lt::torrent_flags::auto_managed | lt::torrent_flags::paused);
}
m_nativeHandle = m_nativeSession->add_torrent(p);
m_nativeHandle.queue_position_set(queuePos);
m_torrentInfo = TorrentInfo {m_nativeHandle.torrent_file()};
}
void TorrentHandleImpl::pause() void TorrentHandleImpl::pause()
{ {
if (!m_isStopped) if (!m_isStopped)

1
src/base/bittorrent/torrenthandleimpl.h
View file

@ -291,6 +291,7 @@ namespace BitTorrent
void applyFirstLastPiecePriority(bool enabled, const QVector<DownloadPriority> &updatedFilePrio = {}); void applyFirstLastPiecePriority(bool enabled, const QVector<DownloadPriority> &updatedFilePrio = {});
void endReceivedMetadataHandling(const QString &savePath, const QStringList &fileNames); void endReceivedMetadataHandling(const QString &savePath, const QStringList &fileNames);
void reload();
Session *const m_session; Session *const m_session;
lt::session *m_nativeSession; lt::session *m_nativeSession;