diff --git a/src/base/bittorrent/torrent.h b/src/base/bittorrent/torrent.h index 24d11499c..6b40ef27b 100644 --- a/src/base/bittorrent/torrent.h +++ b/src/base/bittorrent/torrent.h @@ -239,8 +239,6 @@ namespace BitTorrent virtual int totalSeedsCount() const = 0; virtual int totalPeersCount() const = 0; virtual int totalLeechersCount() const = 0; - virtual int completeCount() const = 0; - virtual int incompleteCount() const = 0; virtual QDateTime lastSeenComplete() const = 0; virtual QDateTime completedTime() const = 0; virtual qlonglong timeSinceUpload() const = 0; diff --git a/src/base/bittorrent/torrentimpl.cpp b/src/base/bittorrent/torrentimpl.cpp index fe7dfeab8..2c99c09fe 100644 --- a/src/base/bittorrent/torrentimpl.cpp +++ b/src/base/bittorrent/torrentimpl.cpp @@ -1153,30 +1153,18 @@ int TorrentImpl::leechsCount() const int TorrentImpl::totalSeedsCount() const { - return (m_nativeStatus.num_complete > 0) ? m_nativeStatus.num_complete : m_nativeStatus.list_seeds; + return (m_nativeStatus.num_complete > -1) ? m_nativeStatus.num_complete : m_nativeStatus.list_seeds; } int TorrentImpl::totalPeersCount() const { const int peers = m_nativeStatus.num_complete + m_nativeStatus.num_incomplete; - return (peers > 0) ? peers : m_nativeStatus.list_peers; + return (peers > -1) ? peers : m_nativeStatus.list_peers; } int TorrentImpl::totalLeechersCount() const { - return (m_nativeStatus.num_incomplete > 0) ? m_nativeStatus.num_incomplete : (m_nativeStatus.list_peers - m_nativeStatus.list_seeds); -} - -int TorrentImpl::completeCount() const -{ - // additional info: https://github.com/qbittorrent/qBittorrent/pull/5300#issuecomment-267783646 - return m_nativeStatus.num_complete; -} - -int TorrentImpl::incompleteCount() const -{ - // additional info: https://github.com/qbittorrent/qBittorrent/pull/5300#issuecomment-267783646 - return m_nativeStatus.num_incomplete; + return (m_nativeStatus.num_incomplete > -1) ? m_nativeStatus.num_incomplete : (m_nativeStatus.list_peers - m_nativeStatus.list_seeds); } QDateTime TorrentImpl::lastSeenComplete() const diff --git a/src/base/bittorrent/torrentimpl.h b/src/base/bittorrent/torrentimpl.h index f4b33143d..166868482 100644 --- a/src/base/bittorrent/torrentimpl.h +++ b/src/base/bittorrent/torrentimpl.h @@ -171,8 +171,6 @@ namespace BitTorrent int totalSeedsCount() const override; int totalPeersCount() const override; int totalLeechersCount() const override; - int completeCount() const override; - int incompleteCount() const override; QDateTime lastSeenComplete() const override; QDateTime completedTime() const override; qlonglong timeSinceUpload() const override;