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

Fill in initial data in add_torrent_alert handler

Browse source 
libtorrent < 2.0.7 has a bug that add_torrent_alert is posted too early
(before torrent is fully initialized and torrent extensions are created)
so we have to fill initial torrent data in add_torrent_alert handler.

PR #17491.
This commit is contained in:
Vladimir Golovnev 2022-08-06 06:09:35 +03:00 committed by GitHub
parent 33e6ca6778
commit 7f40602da9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/base/bittorrent/nativesessionextension.cpp
View file

@ -35,6 +35,26 @@
namespace namespace
{ {
void handleAddTorrentAlert(const lt::add_torrent_alert *alert)
{
#ifndef QBT_USES_LIBTORRENT2
if (alert->error)
return;
// libtorrent < 2.0.7 has a bug that add_torrent_alert is posted too early
// (before torrent is fully initialized and torrent extensions are created)
// so we have to fill "extension data" in add_torrent_alert handler
// NOTE: `data` may not exist if a torrent is added behind the scenes to download metadata
auto *data = static_cast<ExtensionData *>(alert->params.userdata);
if (data)
{
data->status = alert->handle.status({});
data->trackers = alert->handle.trackers();
}
#endif
}
void handleFastresumeRejectedAlert(const lt::fastresume_rejected_alert *alert) void handleFastresumeRejectedAlert(const lt::fastresume_rejected_alert *alert)
{ {
alert->handle.unset_flags(lt::torrent_flags::auto_managed); alert->handle.unset_flags(lt::torrent_flags::auto_managed);
@ -56,8 +76,13 @@ void NativeSessionExtension::on_alert(const lt::alert *alert)
{ {
switch (alert->type()) switch (alert->type())
{ {
case lt::add_torrent_alert::alert_type:
handleAddTorrentAlert(static_cast<const lt::add_torrent_alert *>(alert));
break;
case lt::fastresume_rejected_alert::alert_type: case lt::fastresume_rejected_alert::alert_type:
handleFastresumeRejectedAlert(static_cast<const lt::fastresume_rejected_alert *>(alert)); handleFastresumeRejectedAlert(static_cast<const lt::fastresume_rejected_alert *>(alert));
break; break;
default:
break;
} }
} }

14
src/base/bittorrent/nativetorrentextension.cpp
View file

@ -42,14 +42,22 @@ NativeTorrentExtension::NativeTorrentExtension(const lt::torrent_handle &torrent
: m_torrentHandle {torrentHandle} : m_torrentHandle {torrentHandle}
, m_data {data} , m_data {data}
{ {
lt::torrent_status torrentStatus = m_torrentHandle.status({}); // NOTE: `data` may not exist if a torrent is added behind the scenes to download metadata
on_state(torrentStatus.state);
#ifdef QBT_USES_LIBTORRENT2
// libtorrent < 2.0.7 has a bug that add_torrent_alert is posted too early
// (before torrent is fully initialized and torrent extensions are created)
// so we have to fill "extension data" in add_torrent_alert handler and
// we have it already filled at this point
if (m_data) if (m_data)
{ {
m_data->status = std::move(torrentStatus); m_data->status = m_torrentHandle.status({});
m_data->trackers = m_torrentHandle.trackers(); m_data->trackers = m_torrentHandle.trackers();
} }
#endif
on_state(m_data ? m_data->status.state : m_torrentHandle.status({}).state);
} }
NativeTorrentExtension::~NativeTorrentExtension() NativeTorrentExtension::~NativeTorrentExtension()