This commit is contained in:
Clement Tsang 2024-12-24 03:48:32 -05:00
parent 6b80f87f21
commit efdce02d10
No known key found for this signature in database
GPG Key ID: B17834EA2182446B
2 changed files with 33 additions and 24 deletions

View File

@ -289,10 +289,7 @@ impl DataCollection {
#[cfg(not(target_os = "windows"))]
fn eat_cache(&mut self, cache: memory::MemHarvest, new_entry: &mut TimedData) {
// Cache and buffer memory
new_entry.cache_data = cache.checked_percent();
// In addition copy over latest data for easy reference
self.cache_harvest = cache;
}

View File

@ -13,21 +13,38 @@ use crate::{
widgets::{DiskWidgetData, TempWidgetData},
};
#[derive(Default, Debug)]
pub struct ConvertedNetworkData {
pub rx: Vec<Point>,
pub tx: Vec<Point>,
pub rx_display: String,
pub tx_display: String,
pub total_rx_display: Option<String>,
pub total_tx_display: Option<String>,
// TODO: [NETWORKING] add min/max/mean of each
// min_rx : f64,
// max_rx : f64,
// mean_rx: f64,
// min_tx: f64,
// max_tx: f64,
// mean_tx: f64,
// TODO: [NETWORKING] add min/max/mean of each
// min_rx : f64,
// max_rx : f64,
// mean_rx: f64,
// min_tx: f64,
// max_tx: f64,
// mean_tx: f64,
#[derive(Debug)]
pub enum ConvertedNetworkData {
Normal {
rx: Vec<Point>,
tx: Vec<Point>,
rx_display: String,
tx_display: String,
},
Basic {
rx_display: String,
tx_display: String,
total_rx_display: String,
total_tx_display: String,
},
}
impl Default for ConvertedNetworkData {
fn default() -> Self {
Self::Normal {
rx: Default::default(),
tx: Default::default(),
rx_display: Default::default(),
tx_display: Default::default(),
}
}
}
#[derive(Clone, Debug)]
@ -43,12 +60,7 @@ pub enum CpuWidgetData {
#[derive(Default)]
pub struct ConvertedData {
pub rx_display: String,
pub tx_display: String,
pub total_rx_display: String,
pub total_tx_display: String,
pub network_data_rx: Vec<Point>,
pub network_data_tx: Vec<Point>,
pub network: ConvertedNetworkData,
pub mem_labels: Option<(String, String)>,
#[cfg(not(target_os = "windows"))]