d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Cache torrent handles of preloading magnets

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez) 2022-11-03 13:29:48 +03:00
parent da586828be
commit 0b70ccf9e9
No known key found for this signature in database
GPG Key ID: 52A2C7DEE2DFA6F7
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/base/bittorrent/sessionimpl.cpp
View File

@ -2293,7 +2293,7 @@ bool SessionImpl::cancelDownloadMetadata(const TorrentID &id)
if (downloadedMetadataIter == m_downloadedMetadata.end()) if (downloadedMetadataIter == m_downloadedMetadata.end())
return false; return false;
const lt::torrent_handle nativeHandle = m_nativeSession->find_torrent(id); const lt::torrent_handle nativeHandle = downloadedMetadataIter.value();
#ifdef QBT_USES_LIBTORRENT2 #ifdef QBT_USES_LIBTORRENT2
const InfoHash infoHash {nativeHandle.info_hashes()}; const InfoHash infoHash {nativeHandle.info_hashes()};
if (infoHash.isHybrid()) if (infoHash.isHybrid())
@ -2301,7 +2301,7 @@ bool SessionImpl::cancelDownloadMetadata(const TorrentID &id)
// if magnet link was hybrid initially then it is indexed also by v1 info hash // if magnet link was hybrid initially then it is indexed also by v1 info hash
// so we need to remove both entries // so we need to remove both entries
const auto altID = TorrentID::fromSHA1Hash(infoHash.v1()); const auto altID = TorrentID::fromSHA1Hash(infoHash.v1());
m_downloadedMetadata.remove((altID == *downloadedMetadataIter) ? id : altID); m_downloadedMetadata.remove((altID == downloadedMetadataIter.key()) ? id : altID);
} }
#endif #endif
m_downloadedMetadata.erase(downloadedMetadataIter); m_downloadedMetadata.erase(downloadedMetadataIter);
@ -2360,8 +2360,8 @@ void SessionImpl::decreaseTorrentsQueuePos(const QVector<TorrentID> &ids)
torrentQueue.pop(); torrentQueue.pop();
} }
for (auto i = m_downloadedMetadata.cbegin(); i != m_downloadedMetadata.cend(); ++i) for (const lt::torrent_handle &torrentHandle : asConst(m_downloadedMetadata))
torrentQueuePositionBottom(m_nativeSession->find_torrent(*i)); torrentQueuePositionBottom(torrentHandle);
saveTorrentsQueue(); saveTorrentsQueue();
} }
@ -2415,8 +2415,8 @@ void SessionImpl::bottomTorrentsQueuePos(const QVector<TorrentID> &ids)
torrentQueue.pop(); torrentQueue.pop();
} }
for (auto i = m_downloadedMetadata.cbegin(); i != m_downloadedMetadata.cend(); ++i) for (const lt::torrent_handle &torrentHandle : asConst(m_downloadedMetadata))
torrentQueuePositionBottom(m_nativeSession->find_torrent(*i)); torrentQueuePositionBottom(torrentHandle);
saveTorrentsQueue(); saveTorrentsQueue();
} }
@ -2833,16 +2833,17 @@ bool SessionImpl::downloadMetadata(const MagnetUri &magnetUri)
// Adding torrent to libtorrent session // Adding torrent to libtorrent session
lt::error_code ec; lt::error_code ec;
lt::torrent_handle h = m_nativeSession->add_torrent(p, ec); lt::torrent_handle torrentHandle = m_nativeSession->add_torrent(p, ec);
if (ec) return false; if (ec)
return false;
// waiting for metadata... // waiting for metadata...
m_downloadedMetadata.insert(id); m_downloadedMetadata.insert(id, torrentHandle);
if (infoHash.isHybrid()) if (infoHash.isHybrid())
{ {
// index hybrid magnet links by both v1 and v2 info hashes // index hybrid magnet links by both v1 and v2 info hashes
const auto altID = TorrentID::fromSHA1Hash(infoHash.v1()); const auto altID = TorrentID::fromSHA1Hash(infoHash.v1());
m_downloadedMetadata.insert(altID); m_downloadedMetadata.insert(altID, torrentHandle);
} }
++m_extraLimit; ++m_extraLimit;
adjustLimits(); adjustLimits();

2
src/base/bittorrent/sessionimpl.h
View File

@ -694,7 +694,7 @@ namespace BitTorrent
ResumeDataStorage *m_resumeDataStorage = nullptr; ResumeDataStorage *m_resumeDataStorage = nullptr;
FileSearcher *m_fileSearcher = nullptr; FileSearcher *m_fileSearcher = nullptr;
QSet<TorrentID> m_downloadedMetadata; QHash<TorrentID, lt::torrent_handle> m_downloadedMetadata;
QHash<TorrentID, TorrentImpl *> m_torrents; QHash<TorrentID, TorrentImpl *> m_torrents;
QHash<TorrentID, TorrentImpl *> m_hybridTorrentsByAltID; QHash<TorrentID, TorrentImpl *> m_hybridTorrentsByAltID;