From 8be6a4b22d2bccf71d68724db986c7fff89bf5d1 Mon Sep 17 00:00:00 2001 From: DriverXX Date: Wed, 9 Mar 2016 21:20:43 +0100 Subject: Add corrupted size to general panel --- src/protocol-constants.h | 1 + src/requests.c | 1 + src/torrent.c | 5 +++++ src/torrent.h | 1 + src/trg-general-panel.c | 21 +++++++++++++++------ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/protocol-constants.h b/src/protocol-constants.h index 061a10e..8fffb00 100644 --- a/src/protocol-constants.h +++ b/src/protocol-constants.h @@ -56,6 +56,7 @@ #define FIELD_ETA "eta" #define FIELD_UPLOADEDEVER "uploadedEver" #define FIELD_DOWNLOADEDEVER "downloadedEver" +#define FIELD_CORRUPTEVER "corruptEver" #define FIELD_HAVEVALID "haveValid" #define FIELD_HAVEUNCHECKED "haveUnchecked" #define FIELD_PERCENTDONE "percentDone" diff --git a/src/requests.c b/src/requests.c index 2234302..4e044ab 100644 --- a/src/requests.c +++ b/src/requests.c @@ -184,6 +184,7 @@ JsonNode *torrent_get(gint64 id) json_array_add_string_element(fields, FIELD_ADDED_DATE); json_array_add_string_element(fields, FIELD_DOWNLOADEDEVER); json_array_add_string_element(fields, FIELD_UPLOADEDEVER); + json_array_add_string_element(fields, FIELD_CORRUPTEVER); json_array_add_string_element(fields, FIELD_SIZEWHENDONE); json_array_add_string_element(fields, FIELD_QUEUE_POSITION); json_array_add_string_element(fields, FIELD_ID); diff --git a/src/torrent.c b/src/torrent.c index fc4eaa8..e5577ee 100644 --- a/src/torrent.c +++ b/src/torrent.c @@ -180,6 +180,11 @@ gint64 torrent_get_uploaded(JsonObject * t) return json_object_get_int_member(t, FIELD_UPLOADEDEVER); } +gint64 torrent_get_corrupted(JsonObject * t) +{ + return json_object_get_int_member(t, FIELD_CORRUPTEVER); +} + gint64 torrent_get_have_valid(JsonObject * t) { return json_object_get_int_member(t, FIELD_HAVEVALID); diff --git a/src/torrent.h b/src/torrent.h index cebdd76..c837046 100644 --- a/src/torrent.h +++ b/src/torrent.h @@ -51,6 +51,7 @@ gint64 torrent_get_rate_down(JsonObject * t); gint64 torrent_get_rate_up(JsonObject * t); gint64 torrent_get_eta(JsonObject * t); gint64 torrent_get_uploaded(JsonObject * t); +gint64 torrent_get_corrupted(JsonObject * t); gint64 torrent_get_downloaded(JsonObject * t); const gchar *torrent_get_errorstr(JsonObject * t); gint64 torrent_get_error(JsonObject * t); diff --git a/src/trg-general-panel.c b/src/trg-general-panel.c index dc90984..629f965 100644 --- a/src/trg-general-panel.c +++ b/src/trg-general-panel.c @@ -60,6 +60,7 @@ struct _TrgGeneralPanelPrivate { GtkLabel *gen_eta_label; GtkLabel *gen_downloaded_label; GtkLabel *gen_uploaded_label; + GtkLabel *gen_corrupted_label; GtkLabel *gen_down_rate_label; GtkLabel *gen_up_rate_label; GtkLabel *gen_ratio_label; @@ -85,6 +86,7 @@ void trg_general_panel_clear(TrgGeneralPanel * panel) gtk_label_clear(priv->gen_eta_label); gtk_label_clear(priv->gen_downloaded_label); gtk_label_clear(priv->gen_uploaded_label); + gtk_label_clear(priv->gen_corrupted_label); gtk_label_clear(priv->gen_down_rate_label); gtk_label_clear(priv->gen_up_rate_label); gtk_label_clear(priv->gen_ratio_label); @@ -122,7 +124,7 @@ trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t, gchar *statusString, *fullStatusString, *completedAtString, *comment, *markup; const gchar *errorStr; - gint64 eta, uploaded, haveValid, completedAt; + gint64 eta, uploaded, corrupted, haveValid, completedAt; GtkLabel *keyLabel; gint64 seeders = 0, leechers = 0; @@ -144,6 +146,10 @@ trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t, trg_strlspeed(buf, torrent_get_rate_up(t) / disk_K); gtk_label_set_text(GTK_LABEL(priv->gen_up_rate_label), buf); + corrupted = torrent_get_corrupted(t); + trg_strlsize(buf, corrupted); + gtk_label_set_text(GTK_LABEL(priv->gen_corrupted_label), buf); + uploaded = torrent_get_uploaded(t); trg_strlsize(buf, uploaded); gtk_label_set_text(GTK_LABEL(priv->gen_uploaded_label), buf); @@ -311,19 +317,22 @@ static void trg_general_panel_init(TrgGeneralPanel * self) trg_general_panel_add_label(self, _("Leechers"), 0, 4); priv->gen_limit_label = trg_general_panel_add_label(self, _("Ratio limit"), 1, 4); - priv->gen_completedat_label = - trg_general_panel_add_label(self, _("Completed At"), 2, 4); + priv->gen_corrupted_label = + trg_general_panel_add_label(self, _("Corrupted"), 2, 4); priv->gen_status_label = trg_general_panel_add_label(self, _("Status"), 0, 5); + priv->gen_completedat_label = + trg_general_panel_add_label(self, _("Completed At"), 1, 5); + priv->gen_downloaddir_label = - trg_general_panel_add_label_with_width(self, _("Location"), 1, 5, -1); + trg_general_panel_add_label_with_width(self, _("Location"), 0, 6, -1); priv->gen_comment_label = - trg_general_panel_add_label(self, _("Comment"), 0, 6); + trg_general_panel_add_label(self, _("Comment"), 0, 7); priv->gen_error_label = - trg_general_panel_add_label_with_width(self, "", 0, 7, -1); + trg_general_panel_add_label_with_width(self, "", 0, 8, -1); for (i = 0; i < TRG_GENERAL_PANEL_COLUMNS_TOTAL; i++) gtk_table_set_col_spacing(GTK_TABLE(self), i, -- cgit v1.2.3