mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 02:36:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improve received metadata handling

Browse source 
Avoid blocking call to libtorrent when accessing underlying torrent_info object.

PR #20424.
This commit is contained in:
Vladimir Golovnev 2024-02-21 17:25:54 +03:00 committed by GitHub
parent bb8a012b1c
commit 7786e1b084
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/base/bittorrent/torrentimpl.cpp
View file

@ -811,7 +811,12 @@ void TorrentImpl::deferredRequestResumeData()
{
if (!m_deferredRequestResumeDataInvoked)
{
QMetaObject::invokeMethod(this, [this] { requestResumeData(); }, Qt::QueuedConnection);
QMetaObject::invokeMethod(this, [this]
{
requestResumeData((m_maintenanceJob == MaintenanceJob::HandleMetadata)
? lt::torrent_handle::save_info_dict : lt::resume_data_flags_t());
}, Qt::QueuedConnection);
m_deferredRequestResumeDataInvoked = true;
}
}
@ -1706,8 +1711,8 @@ void TorrentImpl::resetTrackerEntries()
std::shared_ptr<const libtorrent::torrent_info> TorrentImpl::nativeTorrentInfo() const
{
if (m_nativeStatus.torrent_file.expired())
m_nativeStatus.torrent_file = m_nativeHandle.torrent_file();
Q_ASSERT(!m_nativeStatus.torrent_file.expired());
return m_nativeStatus.torrent_file.lock();
}
@ -2041,7 +2046,7 @@ void TorrentImpl::handleSaveResumeDataAlert(const lt::save_resume_data_alert *p)
fetchURLSeeds([this](const QVector<QUrl> &urlSeeds) { m_urlSeeds = urlSeeds; });
}
if (m_maintenanceJob == MaintenanceJob::HandleMetadata)
if ((m_maintenanceJob == MaintenanceJob::HandleMetadata) && p->params.ti)
{
Q_ASSERT(m_indexMap.isEmpty());
@ -2053,7 +2058,9 @@ void TorrentImpl::handleSaveResumeDataAlert(const lt::save_resume_data_alert *p)
m_ltAddTorrentParams.have_pieces.clear();
m_ltAddTorrentParams.verified_pieces.clear();
TorrentInfo metadata = TorrentInfo(*nativeTorrentInfo());
m_nativeStatus.torrent_file = m_ltAddTorrentParams.ti;
const auto metadata = TorrentInfo(*m_ltAddTorrentParams.ti);
const auto &renamedFiles = m_ltAddTorrentParams.renamed_files;
PathList filePaths = metadata.filePaths();
@ -2061,8 +2068,7 @@ void TorrentImpl::handleSaveResumeDataAlert(const lt::save_resume_data_alert *p)
{
const Path originalRootFolder = Path::findRootFolder(filePaths);
const auto originalContentLayout = (originalRootFolder.isEmpty()
? TorrentContentLayout::NoSubfolder
: TorrentContentLayout::Subfolder);
? TorrentContentLayout::NoSubfolder : TorrentContentLayout::Subfolder);
if (m_contentLayout != originalContentLayout)
{
if (m_contentLayout == TorrentContentLayout::NoSubfolder)