mirror of
https://github.com/qbittorrent/qBittorrent
synced 2025-07-07 21:51:25 -07:00
Support fetching tracker list from URL
Trackers specified at the URL will be added to newly added public torrents. This feature is adapted from qBittorrent-Enhanced-Edition to allow for automatically adding trackers retrieved from a URL. @ngosang's trackerlist repo is a good example, however I've opted not to include a default URL. Partially addresses #14535. PR #21828.
This commit is contained in:
parent
4f3d77963f
commit
4fc36b9e99
7 changed files with 221 additions and 0 deletions
|
@ -78,6 +78,7 @@
|
|||
#include "base/algorithm.h"
|
||||
#include "base/global.h"
|
||||
#include "base/logger.h"
|
||||
#include "base/net/downloadmanager.h"
|
||||
#include "base/net/proxyconfigurationmanager.h"
|
||||
#include "base/preferences.h"
|
||||
#include "base/profile.h"
|
||||
|
@ -463,6 +464,8 @@ SessionImpl::SessionImpl(QObject *parent)
|
|||
, m_blockPeersOnPrivilegedPorts(BITTORRENT_SESSION_KEY(u"BlockPeersOnPrivilegedPorts"_s), false)
|
||||
, m_isAddTrackersEnabled(BITTORRENT_SESSION_KEY(u"AddTrackersEnabled"_s), false)
|
||||
, m_additionalTrackers(BITTORRENT_SESSION_KEY(u"AdditionalTrackers"_s))
|
||||
, m_isAddTrackersFromURLEnabled(BITTORRENT_SESSION_KEY(u"AddTrackersFromURLEnabled"_s), false)
|
||||
, m_additionalTrackersURL(BITTORRENT_SESSION_KEY(u"AdditionalTrackersURL"_s))
|
||||
, m_globalMaxRatio(BITTORRENT_SESSION_KEY(u"GlobalMaxRatio"_s), -1, [](qreal r) { return r < 0 ? -1. : r;})
|
||||
, m_globalMaxSeedingMinutes(BITTORRENT_SESSION_KEY(u"GlobalMaxSeedingMinutes"_s), -1, lowerLimited(-1))
|
||||
, m_globalMaxInactiveSeedingMinutes(BITTORRENT_SESSION_KEY(u"GlobalMaxInactiveSeedingMinutes"_s), -1, lowerLimited(-1))
|
||||
|
@ -617,6 +620,15 @@ SessionImpl::SessionImpl(QObject *parent)
|
|||
enableTracker(isTrackerEnabled());
|
||||
|
||||
prepareStartup();
|
||||
|
||||
m_updateTrackersFromURLTimer = new QTimer(this);
|
||||
m_updateTrackersFromURLTimer->setInterval(24h);
|
||||
connect(m_updateTrackersFromURLTimer, &QTimer::timeout, this, &SessionImpl::updateTrackersFromURL);
|
||||
if (isAddTrackersFromURLEnabled())
|
||||
{
|
||||
updateTrackersFromURL();
|
||||
m_updateTrackersFromURLTimer->start();
|
||||
}
|
||||
}
|
||||
|
||||
SessionImpl::~SessionImpl()
|
||||
|
@ -2268,6 +2280,11 @@ void SessionImpl::populateAdditionalTrackers()
|
|||
m_additionalTrackerEntries = parseTrackerEntries(additionalTrackers());
|
||||
}
|
||||
|
||||
void SessionImpl::populateAdditionalTrackersFromURL()
|
||||
{
|
||||
m_additionalTrackerEntriesFromURL = parseTrackerEntries(additionalTrackersFromURL());
|
||||
}
|
||||
|
||||
void SessionImpl::processTorrentShareLimits(TorrentImpl *torrent)
|
||||
{
|
||||
if (!torrent->isFinished() || torrent->isForced())
|
||||
|
@ -2887,6 +2904,21 @@ bool SessionImpl::addTorrent_impl(const TorrentDescriptor &source, const AddTorr
|
|||
}
|
||||
}
|
||||
|
||||
if (isAddTrackersFromURLEnabled() && !(hasMetadata && p.ti->priv()))
|
||||
{
|
||||
const auto maxTierIter = std::max_element(p.tracker_tiers.cbegin(), p.tracker_tiers.cend());
|
||||
const int baseTier = (maxTierIter != p.tracker_tiers.cend()) ? (*maxTierIter + 1) : 0;
|
||||
|
||||
p.trackers.reserve(p.trackers.size() + static_cast<std::size_t>(m_additionalTrackerEntriesFromURL.size()));
|
||||
p.tracker_tiers.reserve(p.trackers.size() + static_cast<std::size_t>(m_additionalTrackerEntriesFromURL.size()));
|
||||
p.tracker_tiers.resize(p.trackers.size(), 0);
|
||||
for (const TrackerEntry &trackerEntry : asConst(m_additionalTrackerEntriesFromURL))
|
||||
{
|
||||
p.trackers.emplace_back(trackerEntry.url.toStdString());
|
||||
p.tracker_tiers.emplace_back(Utils::Number::clampingAdd(trackerEntry.tier, baseTier));
|
||||
}
|
||||
}
|
||||
|
||||
p.upload_limit = addTorrentParams.uploadLimit;
|
||||
p.download_limit = addTorrentParams.downloadLimit;
|
||||
|
||||
|
@ -3879,6 +3911,82 @@ void SessionImpl::setAdditionalTrackers(const QString &trackers)
|
|||
populateAdditionalTrackers();
|
||||
}
|
||||
|
||||
bool SessionImpl::isAddTrackersFromURLEnabled() const
|
||||
{
|
||||
return m_isAddTrackersFromURLEnabled;
|
||||
}
|
||||
|
||||
void SessionImpl::setAddTrackersFromURLEnabled(const bool enabled)
|
||||
{
|
||||
if (enabled != isAddTrackersFromURLEnabled())
|
||||
{
|
||||
m_isAddTrackersFromURLEnabled = enabled;
|
||||
if (enabled)
|
||||
{
|
||||
updateTrackersFromURL();
|
||||
m_updateTrackersFromURLTimer->start();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_updateTrackersFromURLTimer->stop();
|
||||
setAdditionalTrackersFromURL({});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QString SessionImpl::additionalTrackersURL() const
|
||||
{
|
||||
return m_additionalTrackersURL;
|
||||
}
|
||||
|
||||
void SessionImpl::setAdditionalTrackersURL(const QString &url)
|
||||
{
|
||||
if (url != additionalTrackersURL())
|
||||
{
|
||||
m_additionalTrackersURL = url.trimmed();
|
||||
if (isAddTrackersFromURLEnabled())
|
||||
updateTrackersFromURL();
|
||||
}
|
||||
}
|
||||
|
||||
QString SessionImpl::additionalTrackersFromURL() const
|
||||
{
|
||||
return m_additionalTrackersFromURL;
|
||||
}
|
||||
|
||||
void SessionImpl::setAdditionalTrackersFromURL(const QString &trackers)
|
||||
{
|
||||
if (trackers != additionalTrackersFromURL())
|
||||
{
|
||||
m_additionalTrackersFromURL = trackers;
|
||||
populateAdditionalTrackersFromURL();
|
||||
}
|
||||
}
|
||||
|
||||
void SessionImpl::updateTrackersFromURL()
|
||||
{
|
||||
const QString url = additionalTrackersURL();
|
||||
if (url.isEmpty())
|
||||
{
|
||||
setAdditionalTrackersFromURL({});
|
||||
}
|
||||
else
|
||||
{
|
||||
Net::DownloadManager::instance()->download(Net::DownloadRequest(url)
|
||||
, Preferences::instance()->useProxyForGeneralPurposes(), this, [this](const Net::DownloadResult &result)
|
||||
{
|
||||
if (result.status == Net::DownloadStatus::Success)
|
||||
{
|
||||
setAdditionalTrackersFromURL(QString::fromUtf8(result.data));
|
||||
LogMsg(tr("Tracker list updated"), Log::INFO);
|
||||
return;
|
||||
}
|
||||
|
||||
LogMsg(tr("Failed to update tracker list. Reason: \"%1\"").arg(result.errorString), Log::WARNING);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
bool SessionImpl::isIPFilteringEnabled() const
|
||||
{
|
||||
return m_isIPFilteringEnabled;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue