github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-16 02:03:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Adjust tracker tier when adding additional trackers

Browse source 
Closes #20102.
PR #20729.
This commit is contained in:
Chocobo1 2024-04-25 12:18:30 +08:00 • committed by GitHub
parent 4ac586c896
commit 321d7e5b17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 180 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/base/bittorrent/sessionimpl.cpp
View file

@ -84,6 +84,7 @@
#include "base/utils/fs.h"
#include "base/utils/io.h"
#include "base/utils/net.h"
#include "base/utils/number.h"
#include "base/utils/random.h"
#include "base/version.h"
#include "bandwidthscheduler.h"
@ -2208,15 +2209,7 @@ void SessionImpl::enableBandwidthScheduler()
void SessionImpl::populateAdditionalTrackers()
{
m_additionalTrackerList.clear();
const QString trackers = additionalTrackers();
for (QStringView tracker : asConst(QStringView(trackers).split(u'\n')))
{
tracker = tracker.trimmed();
if (!tracker.isEmpty())
m_additionalTrackerList.append({.url = tracker.toString(), .tier = 0});
}
m_additionalTrackerEntries = parseTrackerEntries(additionalTrackers());
}
void SessionImpl::processShareLimits()
@ -2786,13 +2779,16 @@ bool SessionImpl::addTorrent_impl(const TorrentDescriptor &source, const AddTorr
if (isAddTrackersEnabled() && !(hasMetadata && p.ti->priv()))
{
p.trackers.reserve(p.trackers.size() + static_cast<std::size_t>(m_additionalTrackerList.size()));
p.tracker_tiers.reserve(p.trackers.size() + static_cast<std::size_t>(m_additionalTrackerList.size()));
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_additionalTrackerEntries.size()));
p.tracker_tiers.reserve(p.trackers.size() + static_cast<std::size_t>(m_additionalTrackerEntries.size()));
p.tracker_tiers.resize(p.trackers.size(), 0);
for (const TrackerEntry &trackerEntry : asConst(m_additionalTrackerList))
for (const TrackerEntry &trackerEntry : asConst(m_additionalTrackerEntries))
{
p.trackers.push_back(trackerEntry.url.toStdString());
p.tracker_tiers.push_back(trackerEntry.tier);
p.trackers.emplace_back(trackerEntry.url.toStdString());
p.tracker_tiers.emplace_back(Utils::Number::clampingAdd(trackerEntry.tier, baseTier));
}
}
@ -2955,13 +2951,17 @@ bool SessionImpl::downloadMetadata(const TorrentDescriptor &torrentDescr)
if (isAddTrackersEnabled())
{
// Use "additional trackers" when metadata retrieving (this can help when the DHT nodes are few)
p.trackers.reserve(p.trackers.size() + static_cast<std::size_t>(m_additionalTrackerList.size()));
p.tracker_tiers.reserve(p.trackers.size() + static_cast<std::size_t>(m_additionalTrackerList.size()));
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_additionalTrackerEntries.size()));
p.tracker_tiers.reserve(p.trackers.size() + static_cast<std::size_t>(m_additionalTrackerEntries.size()));
p.tracker_tiers.resize(p.trackers.size(), 0);
for (const TrackerEntry &trackerEntry : asConst(m_additionalTrackerList))
for (const TrackerEntry &trackerEntry : asConst(m_additionalTrackerEntries))
{
p.trackers.push_back(trackerEntry.url.toStdString());
p.tracker_tiers.push_back(trackerEntry.tier);
p.trackers.emplace_back(trackerEntry.url.toStdString());
p.tracker_tiers.emplace_back(Utils::Number::clampingAdd(trackerEntry.tier, baseTier));
}
}
@ -3762,11 +3762,11 @@ QString SessionImpl::additionalTrackers() const
void SessionImpl::setAdditionalTrackers(const QString &trackers)
{
if (trackers != additionalTrackers())
{
m_additionalTrackers = trackers;
populateAdditionalTrackers();
}
if (trackers == additionalTrackers())
return;
m_additionalTrackers = trackers;
populateAdditionalTrackers();
}
bool SessionImpl::isIPFilteringEnabled() const