github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-21 05:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve ratio calculation formula. Closes #3096.

Browse source
This commit is contained in:
Chocobo1 2015-05-25 15:01:33 +08:00 • committed by sledgehammer999
commit 01dbc01635
1 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/core/qtlibtorrent/qbtsession.cpp
View file

@ -1552,36 +1552,21 @@ void QBtSession::enableDHT(bool b) {
} }
qreal QBtSession::getRealRatio(const libtorrent::torrent_status &status) const { qreal QBtSession::getRealRatio(const libtorrent::torrent_status &status) const {
libtorrent::size_type all_time_upload = status.all_time_upload; libtorrent::size_type upload = status.all_time_upload;
libtorrent::size_type all_time_download = status.all_time_download; // special case for a seeder who lost its stats, also assume nobody will import a 99% done torrent
libtorrent::size_type total_done = status.total_done; libtorrent::size_type download = (status.all_time_download < status.total_done * 0.01) ? status.total_done : status.all_time_download;
if (all_time_download < total_done) { if (download == 0)
// We have more data on disk than we downloaded return (upload == 0) ? 0.0 : MAX_RATIO;
// either because the user imported the file
// or because of crash the download histroy was lost.
// Otherwise will get weird ratios
// eg when downloaded 1KB and uploaded 700MB of a
// 700MB torrent.
all_time_download = total_done;
}
if (all_time_download == 0) { qreal ratio = upload / (qreal) download;
if (all_time_upload == 0) Q_ASSERT(ratio >= 0.0);
return 0.0; return (ratio > MAX_RATIO) ? MAX_RATIO : ratio;
return MAX_RATIO+1;
}
qreal ratio = all_time_upload / (float) all_time_download;
Q_ASSERT(ratio >= 0.);
if (ratio > MAX_RATIO)
ratio = MAX_RATIO;
return ratio;
} }
// Called periodically // Called periodically
void QBtSession::saveTempFastResumeData() { void QBtSession::saveTempFastResumeData() {
std::vector<torrent_handle> torrents = s->get_torrents(); std::vector<torrent_handle> torrents = s->get_torrents();
std::vector<torrent_handle>::iterator torrentIT = torrents.begin(); std::vector<torrent_handle>::iterator torrentIT = torrents.begin();
std::vector<torrent_handle>::iterator torrentITend = torrents.end(); std::vector<torrent_handle>::iterator torrentITend = torrents.end();