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

Return queued torrents list sorted

Browse source
This commit is contained in:
Vladimir Golovnev (Glassez) 2025-08-09 17:34:19 +03:00
commit be08259bda
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
1 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2569,11 +2569,8 @@ bool SessionImpl::cancelDownloadMetadata(const TorrentID &id)
void SessionImpl::increaseTorrentsQueuePos(const QList<TorrentID> &ids) void SessionImpl::increaseTorrentsQueuePos(const QList<TorrentID> &ids)
{ {
QList<TorrentImpl *> queuedTorrents = getQueuedTorrentsByID(ids);
std::ranges::sort(queuedTorrents, std::less<>(), &TorrentImpl::queuePosition);
// Increase torrents queue position (starting with the one in the highest queue position) // Increase torrents queue position (starting with the one in the highest queue position)
for (TorrentImpl *torrent : asConst(queuedTorrents)) for (TorrentImpl *torrent : asConst(getQueuedTorrentsByID(ids)))
torrentQueuePositionUp(torrent->nativeHandle()); torrentQueuePositionUp(torrent->nativeHandle());
m_torrentsQueueChanged = true; m_torrentsQueueChanged = true;
@ -2581,11 +2578,10 @@ void SessionImpl::increaseTorrentsQueuePos(const QList<TorrentID> &ids)
void SessionImpl::decreaseTorrentsQueuePos(const QList<TorrentID> &ids) void SessionImpl::decreaseTorrentsQueuePos(const QList<TorrentID> &ids)
{ {
QList<TorrentImpl *> queuedTorrents = getQueuedTorrentsByID(ids); const QList<TorrentImpl *> queuedTorrents = getQueuedTorrentsByID(ids);
std::ranges::sort(queuedTorrents, std::greater<>(), &TorrentImpl::queuePosition);
// Decrease torrents queue position (starting with the one in the lowest queue position) // Decrease torrents queue position (starting with the one in the lowest queue position)
for (TorrentImpl *torrent : asConst(queuedTorrents)) for (TorrentImpl *torrent : (queuedTorrents | std::views::reverse))
torrentQueuePositionDown(torrent->nativeHandle()); torrentQueuePositionDown(torrent->nativeHandle());
for (const lt::torrent_handle &torrentHandle : asConst(m_downloadedMetadata)) for (const lt::torrent_handle &torrentHandle : asConst(m_downloadedMetadata))
@ -2596,11 +2592,10 @@ void SessionImpl::decreaseTorrentsQueuePos(const QList<TorrentID> &ids)
void SessionImpl::topTorrentsQueuePos(const QList<TorrentID> &ids) void SessionImpl::topTorrentsQueuePos(const QList<TorrentID> &ids)
{ {
QList<TorrentImpl *> queuedTorrents = getQueuedTorrentsByID(ids); const QList<TorrentImpl *> queuedTorrents = getQueuedTorrentsByID(ids);
std::ranges::sort(queuedTorrents, std::greater<>(), &TorrentImpl::queuePosition);
// Top torrents queue position (starting with the one in the lowest queue position) // Top torrents queue position (starting with the one in the lowest queue position)
for (TorrentImpl *torrent : asConst(queuedTorrents)) for (TorrentImpl *torrent : (queuedTorrents | std::views::reverse))
torrentQueuePositionTop(torrent->nativeHandle()); torrentQueuePositionTop(torrent->nativeHandle());
m_torrentsQueueChanged = true; m_torrentsQueueChanged = true;
@ -2608,11 +2603,8 @@ void SessionImpl::topTorrentsQueuePos(const QList<TorrentID> &ids)
void SessionImpl::bottomTorrentsQueuePos(const QList<TorrentID> &ids) void SessionImpl::bottomTorrentsQueuePos(const QList<TorrentID> &ids)
{ {
QList<TorrentImpl *> queuedTorrents = getQueuedTorrentsByID(ids);
std::ranges::sort(queuedTorrents, std::less<>(), &TorrentImpl::queuePosition);
// Bottom torrents queue position (starting with the one in the highest queue position) // Bottom torrents queue position (starting with the one in the highest queue position)
for (TorrentImpl *torrent : asConst(queuedTorrents)) for (TorrentImpl *torrent : asConst(getQueuedTorrentsByID(ids)))
torrentQueuePositionBottom(torrent->nativeHandle()); torrentQueuePositionBottom(torrent->nativeHandle());
for (const lt::torrent_handle &torrentHandle : asConst(m_downloadedMetadata)) for (const lt::torrent_handle &torrentHandle : asConst(m_downloadedMetadata))
@ -5931,11 +5923,13 @@ TorrentImpl *SessionImpl::getTorrent(const lt::torrent_handle &nativeHandle) con
QList<TorrentImpl *> SessionImpl::getQueuedTorrentsByID(const QList<TorrentID> &torrentIDs) const QList<TorrentImpl *> SessionImpl::getQueuedTorrentsByID(const QList<TorrentID> &torrentIDs) const
{ {
auto queuedTorrents = torrentIDs auto torrents = torrentIDs
| std::views::transform([this](const TorrentID &torrentID) { return m_torrents.value(torrentID); }) | std::views::transform([this](const TorrentID &torrentID) { return m_torrents.value(torrentID); })
| std::views::filter([](const TorrentImpl *torrent) { return torrent && (torrent->queuePosition() >= 0); }); | std::views::filter([](const TorrentImpl *torrent) { return torrent && (torrent->queuePosition() >= 0); });
return {queuedTorrents.begin(), queuedTorrents.end()}; 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*/) void SessionImpl::handleTorrentRemovedAlert(const lt::torrent_removed_alert */*alert*/)