diff options
| author | Burt P <pburt0@gmail.com> | 2019-12-28 00:26:55 -0600 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-12-28 08:32:12 -0800 |
| commit | bf72686772b249a683570d9a0b47e139f5327a3c (patch) | |
| tree | 06d78d370e9aaa23f158570b09e117dcfab220ed /modules | |
| parent | b45f68508254c3ddbcabfc536ed5f2b5a7a9528c (diff) | |
udisks2_util: try pci vendor for nvme without vendor info
Signed-off-by: Burt P <pburt0@gmail.com>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/devices.c | 10 | ||||
| -rw-r--r-- | modules/devices/storage.c | 9 |
2 files changed, 13 insertions, 6 deletions
diff --git a/modules/devices.c b/modules/devices.c index a13213ba..77f5562e 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -739,9 +739,13 @@ gchar *callback_printers() gchar *callback_storage() { return g_strdup_printf("%s\n" - "[$ShellParam$]\n" - "ReloadInterval=5000\n" - "ViewType=1\n%s", storage_list, storage_icons); + "[$ShellParam$]\n" + "ReloadInterval=5000\n" + "ColumnTitle$TextValue=%s\n" + "ColumnTitle$Value=%s\n" + "ColumnTitle$Extra1=%s\n" + "ShowColumnHeaders=true\n" + "ViewType=1\n%s", storage_list, _("Model"), _("Vendor"), _("Size"), storage_icons); } gchar *callback_input() diff --git a/modules/devices/storage.c b/modules/devices/storage.c index 72d924ce..753246f6 100644 --- a/modules/devices/storage.c +++ b/modules/devices/storage.c @@ -32,7 +32,7 @@ gboolean __scan_udisks2_devices(void) { udisksa *attrib; gchar *udisks2_storage_list = NULL, *features = NULL, *moreinfo = NULL; gchar *devid, *label, *size, *tmp = NULL, *media_comp = NULL; - const gchar *url, *vendor_str, *media_label, *alabel, *icon, *media_curr = NULL; + const gchar *url, *vendor_str, *ven_tag, *media_label, *alabel, *icon, *media_curr = NULL; int n = 0, i, j; // http://storaged.org/doc/udisks2-api/latest/gdbus-org.freedesktop.UDisks2.Drive.html#gdbus-property-org-freedesktop-UDisks2-Drive.MediaCompatibility @@ -196,7 +196,10 @@ gboolean __scan_udisks2_devices(void) { icon = "hdd"; } - udisks2_storage_list = h_strdup_cprintf("$%s$%s=\n", udisks2_storage_list, devid, label); + size = size_human_readable((gfloat) disk->size); + ven_tag = vendor_match_tag(vendor_str, params.fmt_opts); + + udisks2_storage_list = h_strdup_cprintf("$%s$%s=%s|%s\n", udisks2_storage_list, devid, label, ven_tag ? ven_tag : "", size); storage_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n", storage_icons, devid, label, icon); features = h_strdup_cprintf("%s", features, disk->removable ? _("Removable"): _("Fixed")); @@ -224,7 +227,6 @@ gboolean __scan_udisks2_devices(void) { moreinfo, _("Vendor"), vendor_str); - size = size_human_readable((gfloat) disk->size); moreinfo = h_strdup_cprintf(_("Revision=%s\n" "Block Device=%s\n" "Serial=%s\n" @@ -237,6 +239,7 @@ gboolean __scan_udisks2_devices(void) { size, features); g_free(size); + g_free(ven_tag); if (disk->rotation_rate > 0) { moreinfo = h_strdup_cprintf(_("Rotation Rate=%d RPM\n"), moreinfo, disk->rotation_rate); |