diff --git a/src/app/data_farmer.rs b/src/app/data_farmer.rs index 6120afa5..585b721c 100644 --- a/src/app/data_farmer.rs +++ b/src/app/data_farmer.rs @@ -17,7 +17,7 @@ use once_cell::sync::Lazy; use std::{time::Instant, vec::Vec}; use crate::{ - data_harvester::{battery_harvester, cpu, disks, mem, network, processes, temperature, Data}, + data_harvester::{batteries, cpu, disks, mem, network, processes, temperature, Data}, utils::gen_util::get_simple_byte_values, }; use regex::Regex; @@ -58,7 +58,7 @@ pub struct DataCollection { pub io_labels_and_prev: Vec<((u64, u64), (u64, u64))>, pub io_labels: Vec<(String, String)>, pub temp_harvest: Vec, - pub battery_harvest: Vec, + pub battery_harvest: Vec, } impl Default for DataCollection { @@ -312,7 +312,7 @@ impl DataCollection { self.process_harvest = list_of_processes.to_vec(); } - fn eat_battery(&mut self, list_of_batteries: &[battery_harvester::BatteryHarvest]) { + fn eat_battery(&mut self, list_of_batteries: &[batteries::BatteryHarvest]) { trace!("Eating batteries."); self.battery_harvest = list_of_batteries.to_vec(); } diff --git a/src/app/data_harvester.rs b/src/app/data_harvester.rs index 9cf8de62..10909c8b 100644 --- a/src/app/data_harvester.rs +++ b/src/app/data_harvester.rs @@ -13,7 +13,7 @@ use crate::app::layout_manager::UsedWidgets; use futures::join; -pub mod battery_harvester; +pub mod batteries; pub mod cpu; pub mod disks; pub mod mem; @@ -32,7 +32,7 @@ pub struct Data { pub list_of_processes: Option>, pub disks: Option>, pub io: Option, - pub list_of_batteries: Option>, + pub list_of_batteries: Option>, } impl Default for Data { @@ -220,10 +220,8 @@ impl DataCollector { // Batteries if let Some(battery_manager) = &self.battery_manager { if let Some(battery_list) = &mut self.battery_list { - self.data.list_of_batteries = Some(battery_harvester::refresh_batteries( - &battery_manager, - battery_list, - )); + self.data.list_of_batteries = + Some(batteries::refresh_batteries(&battery_manager, battery_list)); } if log_enabled!(log::Level::Trace) { diff --git a/src/app/data_harvester/battery_harvester.rs b/src/app/data_harvester/batteries.rs similarity index 100% rename from src/app/data_harvester/battery_harvester.rs rename to src/app/data_harvester/batteries.rs