summaryrefslogtreecommitdiffstats
path: root/src/app/data_harvester
diff options
context:
space:
mode:
Diffstat (limited to 'src/app/data_harvester')
-rw-r--r--src/app/data_harvester/disks/freebsd.rs3
-rw-r--r--src/app/data_harvester/disks/heim.rs2
-rw-r--r--src/app/data_harvester/temperature.rs19
-rw-r--r--src/app/data_harvester/temperature/linux.rs3
-rw-r--r--src/app/data_harvester/temperature/sysinfo.rs5
5 files changed, 4 insertions, 28 deletions
diff --git a/src/app/data_harvester/disks/freebsd.rs b/src/app/data_harvester/disks/freebsd.rs
index d657931b..5c6f6e80 100644
--- a/src/app/data_harvester/disks/freebsd.rs
+++ b/src/app/data_harvester/disks/freebsd.rs
@@ -46,7 +46,7 @@ pub async fn get_disk_usage(
return Ok(None);
}
- let mut vec_disks: Vec<DiskHarvest> = get_disk_info().map(|storage_system_information| {
+ let vec_disks: Vec<DiskHarvest> = get_disk_info().map(|storage_system_information| {
storage_system_information
.filesystem
.into_iter()
@@ -80,7 +80,6 @@ pub async fn get_disk_usage(
.collect()
})?;
- vec_disks.sort_by(|a, b| a.name.cmp(&b.name));
Ok(Some(vec_disks))
}
diff --git a/src/app/data_harvester/disks/heim.rs b/src/app/data_harvester/disks/heim.rs
index 85608858..70840aba 100644
--- a/src/app/data_harvester/disks/heim.rs
+++ b/src/app/data_harvester/disks/heim.rs
@@ -135,7 +135,5 @@ pub async fn get_disk_usage(
}
}
- vec_disks.sort_by(|a, b| a.name.cmp(&b.name));
-
Ok(Some(vec_disks))
}
diff --git a/src/app/data_harvester/temperature.rs b/src/app/data_harvester/temperature.rs
index a9855f51..48d98ad2 100644
--- a/src/app/data_harvester/temperature.rs
+++ b/src/app/data_harvester/temperature.rs
@@ -16,8 +16,6 @@ cfg_if::cfg_if! {
#[cfg(feature = "nvidia")]
pub mod nvidia;
-use std::cmp::Ordering;
-
use crate::app::Filter;
#[derive(Default, Debug, Clone)]
@@ -65,20 +63,3 @@ fn is_temp_filtered(filter: &Option<Filter>, text: &str) -> bool {
true
}
}
-
-fn temp_vec_sort(temperature_vec: &mut [TempHarvest]) {
- // By default, sort temperature, then by alphabetically!
- // TODO: [TEMPS] Allow users to control this.
-
- // Note we sort in reverse here; we want greater temps to be higher priority.
- temperature_vec.sort_by(|a, b| match a.temperature.partial_cmp(&b.temperature) {
- Some(x) => match x {
- Ordering::Less => Ordering::Greater,
- Ordering::Greater => Ordering::Less,
- Ordering::Equal => Ordering::Equal,
- },
- None => Ordering::Equal,
- });
-
- temperature_vec.sort_by(|a, b| a.name.partial_cmp(&b.name).unwrap_or(Ordering::Equal));
-}
diff --git a/src/app/data_harvester/temperature/linux.rs b/src/app/data_harvester/temperature/linux.rs
index 0bca3649..166af3db 100644
--- a/src/app/data_harvester/temperature/linux.rs
+++ b/src/app/data_harvester/temperature/linux.rs
@@ -4,7 +4,7 @@ use std::{fs, path::Path};
use anyhow::{anyhow, Result};
-use super::{is_temp_filtered, temp_vec_sort, TempHarvest, TemperatureType};
+use super::{is_temp_filtered, TempHarvest, TemperatureType};
use crate::app::{
data_harvester::temperature::{convert_celsius_to_fahrenheit, convert_celsius_to_kelvin},
Filter,
@@ -245,6 +245,5 @@ pub fn get_temperature_data(
super::nvidia::add_nvidia_data(&mut temperature_vec, temp_type, filter)?;
}
- temp_vec_sort(&mut temperature_vec);
Ok(Some(temperature_vec))
}
diff --git a/src/app/data_harvester/temperature/sysinfo.rs b/src/app/data_harvester/temperature/sysinfo.rs
index 83a15094..c1e11527 100644
--- a/src/app/data_harvester/temperature/sysinfo.rs
+++ b/src/app/data_harvester/temperature/sysinfo.rs
@@ -3,8 +3,8 @@
use anyhow::Result;
use super::{
- convert_celsius_to_fahrenheit, convert_celsius_to_kelvin, is_temp_filtered, temp_vec_sort,
- TempHarvest, TemperatureType,
+ convert_celsius_to_fahrenheit, convert_celsius_to_kelvin, is_temp_filtered, TempHarvest,
+ TemperatureType,
};
use crate::app::Filter;
@@ -38,6 +38,5 @@ pub fn get_temperature_data(
super::nvidia::add_nvidia_data(&mut temperature_vec, temp_type, filter)?;
}
- temp_vec_sort(&mut temperature_vec);
Ok(Some(temperature_vec))
}