diff options
| author |  Alan Fitton <ajf@eth0.org.uk> | 2011-09-11 21:44:28 +0000 |
|---|---|---|
| committer | Alan Fitton <ajf@eth0.org.uk> | 2011-09-11 21:44:28 +0000 |
| commit | 2aacfd5e691a7c8b37c2fc1dbcf001615c205b97 (patch) | |
| tree | b594b99f18040d95a7c1b2325f76fc20ebd46e81 /src/torrent.c | |
| parent | 70bf14ea3eade947baf6fab49541f3b19c4db099 (diff) | |
show progress in percent done column
Diffstat (limited to 'src/torrent.c')
| -rw-r--r-- | src/torrent.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/torrent.c b/src/torrent.c index 7b7ad07..7376c15 100644 --- a/src/torrent.c +++ b/src/torrent.c @@ -169,17 +169,12 @@ gboolean torrent_get_is_finished(JsonObject * t) gdouble torrent_get_percent_done(JsonObject * t) { - JsonNode *percentDone = json_object_get_member(t, FIELD_PERCENTDONE); - GValue a = { 0 }; - json_node_get_value(percentDone, &a); - switch (G_VALUE_TYPE(&a)) { - case G_TYPE_INT64: - return (gdouble) g_value_get_int64(&a) * 100.0; - case G_TYPE_DOUBLE: - return g_value_get_double(&a) * 100.0; - default: - return 0.0; - } + return json_int_or_double_to_double(json_object_get_member(t, FIELD_PERCENTDONE)); +} + +gdouble torrent_get_recheck_progress(JsonObject * t) +{ + return json_int_or_double_to_double(json_object_get_member(t, FIELD_RECHECK_PROGRESS)); } guint32 torrent_get_flags(JsonObject * t, gint64 rpcv, gint64 status, gint64 downRate, gint64 upRate) @@ -192,10 +187,11 @@ guint32 torrent_get_flags(JsonObject * t, gint64 rpcv, gint64 status, gint64 dow break; case TR_STATUS_CHECK_WAIT: flags |= TORRENT_FLAG_WAITING_CHECK; - flags |= TORRENT_FLAG_CHECKING; + flags |= TORRENT_FLAG_CHECKING_ANY; break; case TR_STATUS_CHECK: flags |= TORRENT_FLAG_CHECKING; + flags |= TORRENT_FLAG_CHECKING_ANY; break; case TR_STATUS_DOWNLOAD_WAIT: flags |= TORRENT_FLAG_DOWNLOADING_WAIT; |