summaryrefslogtreecommitdiffstats
path: root/src/data_conversion.rs
diff options
context:
space:
mode:
authorClement Tsang <34804052+ClementTsang@users.noreply.github.com>2020-08-31 20:02:48 -0400
committerGitHub <noreply@github.com>2020-08-31 20:02:48 -0400
commit5ed573157c00a0617c786edde0a241bd75e81666 (patch)
tree93d3ba0e6d5e5ed8761749ef3cd902befcc7436d /src/data_conversion.rs
parent5aa7b4df082bce4d029757c911893a93347d0d61 (diff)
bug: Use correct labels for sensors in Linux (#215)
Update temperature sensors in Linux to use labels + names rather than just names.
Diffstat (limited to 'src/data_conversion.rs')
-rw-r--r--src/data_conversion.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/data_conversion.rs b/src/data_conversion.rs
index cada6cb6..dfa2290e 100644
--- a/src/data_conversion.rs
+++ b/src/data_conversion.rs
@@ -93,7 +93,12 @@ pub fn convert_temp_row(app: &App) -> Vec<Vec<String>> {
} else {
for sensor in &current_data.temp_harvest {
sensor_vector.push(vec![
- sensor.component_name.to_string(),
+ match (&sensor.component_name, &sensor.component_label) {
+ (Some(name), Some(label)) => format!("{}: {}", name, label),
+ (None, Some(label)) => label.to_string(),
+ (Some(name), None) => name.to_string(),
+ (None, None) => String::default(),
+ },
(sensor.temperature.ceil() as u64).to_string()
+ match temp_type {
data_harvester::temperature::TemperatureType::Celsius => "C",