github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 13:23:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve changing torrents queue positions
Some checks failed
CI - File health / Check (push) Waiting to run
Details
CI - macOS / Build (push) Waiting to run
Details
CI - Python / Check (push) Waiting to run
Details
CI - Ubuntu / Build (push) Waiting to run
Details
CI - WebUI / Check (push) Waiting to run
Details
CI - Windows / Build (push) Waiting to run
Details
cpp.yaml / Improve changing torrents queue positions (push) Failing after 0s
Details
js.yaml / Improve changing torrents queue positions (push) Failing after 0s
Details

Browse source 
PR #23068.
This commit is contained in:
Vladimir Golovnev 2025-08-10 18:37:19 +03:00 • committed by GitHub
commit 2631692cff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@
#include <concepts>
#include <cstdint>
#include <ctime>
#include <queue>
#include <ranges>
#include <string>
#ifdef Q_OS_WIN
@ -2569,52 +2569,20 @@ bool SessionImpl::cancelDownloadMetadata(const TorrentID &id)
void SessionImpl::increaseTorrentsQueuePos(const QList<TorrentID> &ids)
{
using ElementType = std::pair<int, const TorrentImpl *>;
std::priority_queue<ElementType
, std::vector<ElementType>
, std::greater<ElementType>> torrentQueue;
// Sort torrents by queue position
for (const TorrentID &id : ids)
{
const TorrentImpl *torrent = m_torrents.value(id);
if (!torrent) continue;
if (const int position = torrent->queuePosition(); position >= 0)
torrentQueue.emplace(position, torrent);
}
// Increase torrents queue position (starting with the one in the highest queue position)
while (!torrentQueue.empty())
{
const TorrentImpl *torrent = torrentQueue.top().second;
for (TorrentImpl *torrent : asConst(getQueuedTorrentsByID(ids)))
torrentQueuePositionUp(torrent->nativeHandle());
torrentQueue.pop();
}
m_torrentsQueueChanged = true;
}
void SessionImpl::decreaseTorrentsQueuePos(const QList<TorrentID> &ids)
{
using ElementType = std::pair<int, const TorrentImpl *>;
std::priority_queue<ElementType> torrentQueue;
// Sort torrents by queue position
for (const TorrentID &id : ids)
{
const TorrentImpl *torrent = m_torrents.value(id);
if (!torrent) continue;
if (const int position = torrent->queuePosition(); position >= 0)
torrentQueue.emplace(position, torrent);
}
const QList<TorrentImpl *> queuedTorrents = getQueuedTorrentsByID(ids);
// Decrease torrents queue position (starting with the one in the lowest queue position)
while (!torrentQueue.empty())
{
const TorrentImpl *torrent = torrentQueue.top().second;
for (TorrentImpl *torrent : (queuedTorrents | std::views::reverse))
torrentQueuePositionDown(torrent->nativeHandle());
torrentQueue.pop();
}
for (const lt::torrent_handle &torrentHandle : asConst(m_downloadedMetadata))
torrentQueuePositionBottom(torrentHandle);
@ -2624,52 +2592,20 @@ void SessionImpl::decreaseTorrentsQueuePos(const QList<TorrentID> &ids)
void SessionImpl::topTorrentsQueuePos(const QList<TorrentID> &ids)
{
using ElementType = std::pair<int, const TorrentImpl *>;
std::priority_queue<ElementType> torrentQueue;
// Sort torrents by queue position
for (const TorrentID &id : ids)
{
const TorrentImpl *torrent = m_torrents.value(id);
if (!torrent) continue;
if (const int position = torrent->queuePosition(); position >= 0)
torrentQueue.emplace(position, torrent);
}
const QList<TorrentImpl *> queuedTorrents = getQueuedTorrentsByID(ids);
// Top torrents queue position (starting with the one in the lowest queue position)
while (!torrentQueue.empty())
{
const TorrentImpl *torrent = torrentQueue.top().second;
for (TorrentImpl *torrent : (queuedTorrents | std::views::reverse))
torrentQueuePositionTop(torrent->nativeHandle());
torrentQueue.pop();
}
m_torrentsQueueChanged = true;
}
void SessionImpl::bottomTorrentsQueuePos(const QList<TorrentID> &ids)
{
using ElementType = std::pair<int, const TorrentImpl *>;
std::priority_queue<ElementType
, std::vector<ElementType>
, std::greater<ElementType>> torrentQueue;
// Sort torrents by queue position
for (const TorrentID &id : ids)
{
const TorrentImpl *torrent = m_torrents.value(id);
if (!torrent) continue;
if (const int position = torrent->queuePosition(); position >= 0)
torrentQueue.emplace(position, torrent);
}
// Bottom torrents queue position (starting with the one in the highest queue position)
while (!torrentQueue.empty())
{
const TorrentImpl *torrent = torrentQueue.top().second;
for (TorrentImpl *torrent : asConst(getQueuedTorrentsByID(ids)))
torrentQueuePositionBottom(torrent->nativeHandle());
torrentQueue.pop();
}
for (const lt::torrent_handle &torrentHandle : asConst(m_downloadedMetadata))
torrentQueuePositionBottom(torrentHandle);
@ -5985,6 +5921,17 @@ TorrentImpl *SessionImpl::getTorrent(const lt::torrent_handle &nativeHandle) con
return m_torrents.value(getInfoHash(nativeHandle).toTorrentID());
}
QList<TorrentImpl *> SessionImpl::getQueuedTorrentsByID(const QList<TorrentID> &torrentIDs) const
{
auto torrents = torrentIDs
| std::views::transform([this](const TorrentID &torrentID) { return m_torrents.value(torrentID); })
| std::views::filter([](const TorrentImpl *torrent) { return torrent && (torrent->queuePosition() >= 0); });
QList<TorrentImpl *> queuedTorrents = {torrents.begin(), torrents.end()};
std::ranges::sort(queuedTorrents, std::less<>(), &TorrentImpl::queuePosition);
return queuedTorrents;
}
void SessionImpl::handleTorrentRemovedAlert(const lt::torrent_removed_alert */*alert*/)
{
// We cannot consider `torrent_removed_alert` as a starting point for removing content,

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

@ -619,6 +619,7 @@ namespace BitTorrent
TorrentImpl *createTorrent(const lt::torrent_handle &nativeHandle, LoadTorrentParams params);
TorrentImpl *getTorrent(const lt::torrent_handle &nativeHandle) const;
QList<TorrentImpl *> getQueuedTorrentsByID(const QList<TorrentID> &torrentIDs) const;
void saveResumeData();
void saveTorrentsQueue();