diff options
| author | Ondrej Čerman <ondrej.cerman@gmail.com> | 2020-01-01 13:49:35 +0100 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2020-01-03 09:31:10 -0800 |
| commit | fb5e67746f5eccd07293411ff09a1120c4dcd00b (patch) | |
| tree | 90e52eb48ce79da8f7849bd81483bc60bda42aed /modules/devices.c | |
| parent | 627ebd31f52762c24d11dcb7f6f732999e334960 (diff) | |
storage: updated list
Diffstat (limited to 'modules/devices.c')
| -rw-r--r-- | modules/devices.c | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/modules/devices.c b/modules/devices.c index 850dd9d4..429dd6b6 100644 --- a/modules/devices.c +++ b/modules/devices.c @@ -272,6 +272,44 @@ gchar *get_processor_name_and_desc(void) return nd; } +gchar *get_storage_devices_simple(void) +{ + scan_storage(FALSE); + + struct Info *info = info_unflatten(storage_list); + if (!info) { + return ""; + } + + int i, fi; + struct InfoGroup *group; + struct InfoField *field; + gchar *storage_devs = NULL, *tmp; + const gchar *dev_label, *model_wo_tags; + + GRegex *regex; + regex = g_regex_new ("<.*>", 0, 0, NULL); + + for (i = 0; i < info->groups->len; i++) { + group = &g_array_index(info->groups, struct InfoGroup, info->groups->len - 1); + if (!group) + continue; + + info_group_strip_extra(group); + for (fi = 0; fi < group->fields->len; fi++) { + field = &g_array_index(group->fields, struct InfoField, fi); + if (!field->value) + continue; + + tmp = g_regex_replace(regex, field->value, -1, 0, "", 0, NULL); // remove html tags + storage_devs = h_strdup_cprintf("%s\n", storage_devs, tmp); + g_free(tmp); + } + } + g_free(info); + + return storage_devs; +} gchar *get_storage_devices(void) { @@ -515,6 +553,7 @@ ShellModuleMethod *hi_exported_methods(void) {"getProcessorFrequency", get_processor_max_frequency}, {"getProcessorFrequencyDesc", get_processor_frequency_desc}, {"getStorageDevices", get_storage_devices}, + {"getStorageDevicesSimple", get_storage_devices_simple}, {"getPrinters", get_printers}, {"getInputDevices", get_input_devices}, {"getMotherboard", get_motherboard}, @@ -745,7 +784,7 @@ gchar *callback_storage() "ColumnTitle$Value=%s\n" "ColumnTitle$Extra1=%s\n" "ShowColumnHeaders=true\n" - "ViewType=1\n%s", storage_list, _("Model"), _("Vendor"), _("Size"), storage_icons); + "ViewType=1\n%s", storage_list, _("Device"), _("Size"), _("Model"), storage_icons); } gchar *callback_input() |