From 0f4f108eb519f86fc0df2cf6b17127242188158a Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Wed, 17 Feb 2010 08:10:57 +0000 Subject: [PATCH] BUGFIX: Fix ratio calculation for directly seeded torrents (Thanks phorane) --- src/bittorrent.cpp | 6 +++--- src/qtorrenthandle.cpp | 5 +++++ src/qtorrenthandle.h | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp index fa095054c..fa2648c32 100644 --- a/src/bittorrent.cpp +++ b/src/bittorrent.cpp @@ -1371,14 +1371,14 @@ bool Bittorrent::enableDHT(bool b) { float Bittorrent::getRealRatio(QString hash) const{ QTorrentHandle h = getTorrentHandle(hash); - Q_ASSERT(h.all_time_download() >= 0); + Q_ASSERT(h.total_done() >= 0); Q_ASSERT(h.all_time_upload() >= 0); - if(h.all_time_download() == 0) { + if(h.total_done() == 0) { if(h.all_time_upload() == 0) return 0; return 101; } - float ratio = (float)h.all_time_upload()/(float)h.all_time_download(); + float ratio = (float)h.all_time_upload()/(float)h.total_done(); Q_ASSERT(ratio >= 0.); if(ratio > 100.) ratio = 100.; diff --git a/src/qtorrenthandle.cpp b/src/qtorrenthandle.cpp index 996d7427e..375eb4a59 100644 --- a/src/qtorrenthandle.cpp +++ b/src/qtorrenthandle.cpp @@ -336,6 +336,11 @@ bool QTorrentHandle::is_checking() const { return h.status().state == torrent_status::checking_files || h.status().state == torrent_status::checking_resume_data; } +size_type QTorrentHandle::total_done() { + Q_ASSERT(h.is_valid()); + return h.status().total_done; +} + size_type QTorrentHandle::all_time_download() { Q_ASSERT(h.is_valid()); return h.status().all_time_download; diff --git a/src/qtorrenthandle.h b/src/qtorrenthandle.h index 19fcf00ef..b07041e49 100644 --- a/src/qtorrenthandle.h +++ b/src/qtorrenthandle.h @@ -107,6 +107,7 @@ class QTorrentHandle { size_type total_payload_upload(); size_type all_time_upload(); size_type all_time_download(); + size_type total_done(); QStringList files_path() const; int num_uploads() const; bool is_seed() const;