d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-10 23:07:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from Tilka/master

Browse Source 
Fix torrent transfer stats
This commit is contained in:
Christophe Dumez 2012-07-01 22:34:39 -07:00
commit 1b905d5126
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/webui/btjson.cpp
View File

@ -88,8 +88,8 @@ static const char KEY_PROP_CREATION_DATE[] = "creation_date";
static const char KEY_PROP_PIECE_SIZE[] = "piece_size"; static const char KEY_PROP_PIECE_SIZE[] = "piece_size";
static const char KEY_PROP_COMMENT[] = "comment"; static const char KEY_PROP_COMMENT[] = "comment";
static const char KEY_PROP_WASTED[] = "total_wasted"; static const char KEY_PROP_WASTED[] = "total_wasted";
static const char KEY_PROP_DOWNLOADED[] = "total_uploaded"; static const char KEY_PROP_UPLOADED[] = "total_uploaded";
static const char KEY_PROP_UPLOADED[] = "total_downloaded"; static const char KEY_PROP_DOWNLOADED[] = "total_downloaded";
static const char KEY_PROP_UP_LIMIT[] = "up_limit"; static const char KEY_PROP_UP_LIMIT[] = "up_limit";
static const char KEY_PROP_DL_LIMIT[] = "dl_limit"; static const char KEY_PROP_DL_LIMIT[] = "dl_limit";
static const char KEY_PROP_TIME_ELAPSED[] = "time_elapsed"; static const char KEY_PROP_TIME_ELAPSED[] = "time_elapsed";
@ -284,13 +284,13 @@ QString btjson::getPropertiesForTorrent(const QString& hash)
data.add(KEY_PROP_UPLOADED, QString(misc::friendlyUnit(h.all_time_upload()) + " (" + misc::friendlyUnit(h.total_payload_upload()) + " " + tr("this session") + ")")); data.add(KEY_PROP_UPLOADED, QString(misc::friendlyUnit(h.all_time_upload()) + " (" + misc::friendlyUnit(h.total_payload_upload()) + " " + tr("this session") + ")"));
data.add(KEY_PROP_DOWNLOADED, QString(misc::friendlyUnit(h.all_time_download()) + " (" + misc::friendlyUnit(h.total_payload_download()) + " " + tr("this session") + ")")); data.add(KEY_PROP_DOWNLOADED, QString(misc::friendlyUnit(h.all_time_download()) + " (" + misc::friendlyUnit(h.total_payload_download()) + " " + tr("this session") + ")"));
if (h.upload_limit() <= 0) if (h.upload_limit() <= 0)
data.add(KEY_PROP_UPLOADED, QString::fromUtf8("∞")); data.add(KEY_PROP_UP_LIMIT, QString::fromUtf8("∞"));
else else
data.add(KEY_PROP_UPLOADED, misc::friendlyUnit(h.upload_limit(), true)); data.add(KEY_PROP_UP_LIMIT, misc::friendlyUnit(h.upload_limit(), true));
if (h.download_limit() <= 0) if (h.download_limit() <= 0)
data.add(KEY_PROP_DOWNLOADED, QString::fromUtf8("∞")); data.add(KEY_PROP_DL_LIMIT, QString::fromUtf8("∞"));
else else
data.add(KEY_PROP_DOWNLOADED, misc::friendlyUnit(h.download_limit(), true)); data.add(KEY_PROP_DL_LIMIT, misc::friendlyUnit(h.download_limit(), true));
QString elapsed_txt = misc::userFriendlyDuration(h.active_time()); QString elapsed_txt = misc::userFriendlyDuration(h.active_time());
if (h.is_seed()) if (h.is_seed())
elapsed_txt += " ("+tr("Seeded for %1", "e.g. Seeded for 3m10s").arg(misc::userFriendlyDuration(h.seeding_time()))+")"; elapsed_txt += " ("+tr("Seeded for %1", "e.g. Seeded for 3m10s").arg(misc::userFriendlyDuration(h.seeding_time()))+")";