diff options
| author | Ondrej Čerman <ondrej.cerman@gmail.com> | 2019-07-07 11:24:08 +0200 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-07-10 12:25:23 -0700 |
| commit | 51b6b209d270a646e82a70e9ea8450af6902504d (patch) | |
| tree | e1afcade64f258ee933f3e0bb5c6223b47fa0ba1 /modules | |
| parent | d2a3384ac0348306b691657e8cb34f28cbfec550 (diff) | |
devices/storage: added partitions info
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/devices/storage.c | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/modules/devices/storage.c b/modules/devices/storage.c index f6aafdb7..9fd576a2 100644 --- a/modules/devices/storage.c +++ b/modules/devices/storage.c @@ -27,8 +27,9 @@ gchar *storage_icons = NULL; gboolean __scan_udisks2_devices(void) { GSList *node, *drives; udiskd *disk; + udiskp *part; gchar *udisks2_storage_list = NULL, *features = NULL, *moreinfo = NULL; - gchar *devid, *label, *media_comp = NULL; + gchar *devid, *label, *tmp = NULL, *media_comp = NULL; const gchar *url, *vendor_str, *media_label, *icon, *media_curr = NULL; int n = 0, i, j; @@ -206,11 +207,31 @@ gboolean __scan_udisks2_devices(void) { } if (disk->partition_table || disk->partitions) { moreinfo = h_strdup_cprintf(_("[Partition table]\n" - "Type=%s\n" - "Partitions=%s\n"), + "Type=%s\n"), moreinfo, - disk->partition_table ? disk->partition_table : _("(Unknown)"), - disk->partitions ? disk->partitions : _("(Unknown)")); + disk->partition_table ? disk->partition_table : _("(Unknown)")); + + if (disk->partitions != NULL) { + part = disk->partitions; + while (part != NULL){ + + tmp = size_human_readable((gfloat) part->size); + if (part->label) { + tmp = h_strdup_cprintf(" - %s", tmp, part->label); + } + if (part->type && part->version) { + tmp = h_strdup_cprintf(" (%s %s)", tmp, part->type, part->version); + } + else if (part->type) { + tmp = h_strdup_cprintf(" (%s)", tmp, part->type); + } + moreinfo = h_strdup_cprintf(_("Partition %s=%s\n"), + moreinfo, + part->block, tmp); + g_free(tmp); + part = part->next; + } + } } moreinfo_add_with_prefix("DEV", devid, moreinfo); |