diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-03-26 17:52:35 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-12-05 12:05:17 +0100 |
| commit | 225f6594c4309b3735b24a4f9e6a97cf905274a0 (patch) | |
| tree | 331f7108c4a9e4406d89aae1e62ffb931e525f2b | |
| parent | 88ae8d2b132c73fa625c8a40036a8bf70d5282cc (diff) | |
| download | NetworkManager-225f6594c4309b3735b24a4f9e6a97cf905274a0.tar.gz | |
cli,devices: factor out device_state_to_color()
We'll use this for device status monitor too.
| -rw-r--r-- | clients/cli/devices.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c index b6e73e82ee..33df4decd3 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -1184,11 +1184,28 @@ show_device_info (NMDevice *device, NmCli *nmc) return TRUE; } +static ColorInfo +device_state_to_color (NMDeviceState state) +{ + ColorInfo color_info = { NMC_TERM_COLOR_NORMAL, NMC_TERM_FORMAT_NORMAL }; + + if (state <= NM_DEVICE_STATE_UNAVAILABLE) + color_info.color_fmt= NMC_TERM_FORMAT_DIM; + else if (state == NM_DEVICE_STATE_DISCONNECTED) + color_info.color = NMC_TERM_COLOR_RED; + else if (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_SECONDARIES) + color_info.color = NMC_TERM_COLOR_YELLOW; + else if (state == NM_DEVICE_STATE_ACTIVATED) + color_info.color = NMC_TERM_COLOR_GREEN; + return color_info; +} + static void fill_output_device_status (NMDevice *device, NmCli *nmc) { NMActiveConnection *ac; NMDeviceState state; + ColorInfo color_info; NmcOutputField *arr = nmc_dup_fields_array (nmc_fields_dev_status, sizeof (nmc_fields_dev_status), 0); @@ -1197,14 +1214,9 @@ fill_output_device_status (NMDevice *device, NmCli *nmc) ac = nm_device_get_active_connection (device); /* Show devices in color */ - if (state <= NM_DEVICE_STATE_UNAVAILABLE) - set_val_color_fmt_all (arr, NMC_TERM_FORMAT_DIM); - else if (state == NM_DEVICE_STATE_DISCONNECTED) - set_val_color_all (arr, NMC_TERM_COLOR_RED); - else if (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_SECONDARIES) - set_val_color_all (arr, NMC_TERM_COLOR_YELLOW); - else if (state == NM_DEVICE_STATE_ACTIVATED) - set_val_color_all (arr, NMC_TERM_COLOR_GREEN); + color_info = device_state_to_color (state); + set_val_color_all (arr, color_info.color); + set_val_color_fmt_all (arr, color_info.color_fmt); set_val_strc (arr, 0, nm_device_get_iface (device)); set_val_strc (arr, 1, nm_device_get_type_description (device)); |