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

Merge pull request #6138 from Chocobo1/stats2

Browse source 
Use the numbers from tracker scrape response
This commit is contained in:
sledgehammer999 2017-01-19 11:49:47 +02:00 • committed by GitHub
commit dcab1da8ab
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/base/bittorrent/torrenthandle.cpp
View file

@ -918,26 +918,29 @@ int TorrentHandle::leechsCount() const
int TorrentHandle::totalSeedsCount() const int TorrentHandle::totalSeedsCount() const
{ {
return m_nativeStatus.list_seeds; return (m_nativeStatus.num_complete > 0) ? m_nativeStatus.num_complete : m_nativeStatus.list_seeds;
} }
int TorrentHandle::totalPeersCount() const int TorrentHandle::totalPeersCount() const
{ {
return m_nativeStatus.list_peers; int peers = m_nativeStatus.num_complete + m_nativeStatus.num_incomplete;
return (peers > 0) ? peers : m_nativeStatus.list_peers;
} }
int TorrentHandle::totalLeechersCount() const int TorrentHandle::totalLeechersCount() const
{ {
return (m_nativeStatus.list_peers - m_nativeStatus.list_seeds); return (m_nativeStatus.num_incomplete > 0) ? m_nativeStatus.num_incomplete : (m_nativeStatus.list_peers - m_nativeStatus.list_seeds);
} }
int TorrentHandle::completeCount() const int TorrentHandle::completeCount() const
{ {
// additional info: https://github.com/qbittorrent/qBittorrent/pull/5300#issuecomment-267783646
return m_nativeStatus.num_complete; return m_nativeStatus.num_complete;
} }
int TorrentHandle::incompleteCount() const int TorrentHandle::incompleteCount() const
{ {
// additional info: https://github.com/qbittorrent/qBittorrent/pull/5300#issuecomment-267783646
return m_nativeStatus.num_incomplete; return m_nativeStatus.num_incomplete;
} }

4
src/webui/btjson.cpp
View file

@ -707,9 +707,9 @@ QVariantMap toMap(BitTorrent::TorrentHandle *const torrent)
ret[KEY_TORRENT_UPSPEED] = torrent->uploadPayloadRate(); ret[KEY_TORRENT_UPSPEED] = torrent->uploadPayloadRate();
ret[KEY_TORRENT_PRIORITY] = torrent->queuePosition(); ret[KEY_TORRENT_PRIORITY] = torrent->queuePosition();
ret[KEY_TORRENT_SEEDS] = torrent->seedsCount(); ret[KEY_TORRENT_SEEDS] = torrent->seedsCount();
ret[KEY_TORRENT_NUM_COMPLETE] = torrent->completeCount(); ret[KEY_TORRENT_NUM_COMPLETE] = torrent->totalSeedsCount();
ret[KEY_TORRENT_LEECHS] = torrent->leechsCount(); ret[KEY_TORRENT_LEECHS] = torrent->leechsCount();
ret[KEY_TORRENT_NUM_INCOMPLETE] = torrent->incompleteCount(); ret[KEY_TORRENT_NUM_INCOMPLETE] = torrent->totalLeechersCount();
const qreal ratio = torrent->realRatio(); const qreal ratio = torrent->realRatio();
ret[KEY_TORRENT_RATIO] = (ratio > BitTorrent::TorrentHandle::MAX_RATIO) ? -1 : ratio; ret[KEY_TORRENT_RATIO] = (ratio > BitTorrent::TorrentHandle::MAX_RATIO) ? -1 : ratio;
ret[KEY_TORRENT_STATE] = torrent->state().toString(); ret[KEY_TORRENT_STATE] = torrent->state().toString();