diff options
| author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2020-12-05 18:51:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 18:51:21 -0500 |
| commit | f4b8386063d84f1a87bd08036b1c8d382b76bd9c (patch) | |
| tree | 58770f4231fd24558be2958048233c911b60bb6b | |
| parent | 55312551357f2e1bb79d1abe5ef6425e5d593ab5 (diff) | |
refactor: Rename battery_harvester to batteries (#340)
| -rw-r--r-- | src/app/data_farmer.rs | 6 | ||||
| -rw-r--r-- | src/app/data_harvester.rs | 10 | ||||
| -rw-r--r-- | src/app/data_harvester/batteries.rs (renamed from src/app/data_harvester/battery_harvester.rs) | 0 |
3 files changed, 7 insertions, 9 deletions
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<temperature::TempHarvest>, - pub battery_harvest: Vec<battery_harvester::BatteryHarvest>, + pub battery_harvest: Vec<batteries::BatteryHarvest>, } 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<Vec<processes::ProcessHarvest>>, pub disks: Option<Vec<disks::DiskHarvest>>, pub io: Option<disks::IOHarvest>, - pub list_of_batteries: Option<Vec<battery_harvester::BatteryHarvest>>, + pub list_of_batteries: Option<Vec<batteries::BatteryHarvest>>, } 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 index 66e3c76b..66e3c76b 100644 --- a/src/app/data_harvester/battery_harvester.rs +++ b/src/app/data_harvester/batteries.rs |