tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-23 21:55:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Rename battery_harvester to batteries (#340)

Browse Source
This commit is contained in:
Clement Tsang 2020-12-05 18:51:21 -05:00 committed by GitHub
parent 5531255135
commit f4b8386063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/data_farmer.rs
View File

@ -17,7 +17,7 @@ use once_cell::sync::Lazy;
use std::{time::Instant, vec::Vec}; use std::{time::Instant, vec::Vec};
use crate::{ 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, utils::gen_util::get_simple_byte_values,
}; };
use regex::Regex; use regex::Regex;
@ -58,7 +58,7 @@ pub struct DataCollection {
pub io_labels_and_prev: Vec<((u64, u64), (u64, u64))>, pub io_labels_and_prev: Vec<((u64, u64), (u64, u64))>,
pub io_labels: Vec<(String, String)>, pub io_labels: Vec<(String, String)>,
pub temp_harvest: Vec<temperature::TempHarvest>, pub temp_harvest: Vec<temperature::TempHarvest>,
pub battery_harvest: Vec<battery_harvester::BatteryHarvest>, pub battery_harvest: Vec<batteries::BatteryHarvest>,
} }
impl Default for DataCollection { impl Default for DataCollection {
@ -312,7 +312,7 @@ impl DataCollection {
self.process_harvest = list_of_processes.to_vec(); 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."); trace!("Eating batteries.");
self.battery_harvest = list_of_batteries.to_vec(); self.battery_harvest = list_of_batteries.to_vec();
} }

10
src/app/data_harvester.rs
View File

@ -13,7 +13,7 @@ use crate::app::layout_manager::UsedWidgets;
use futures::join; use futures::join;
pub mod battery_harvester; pub mod batteries;
pub mod cpu; pub mod cpu;
pub mod disks; pub mod disks;
pub mod mem; pub mod mem;
@ -32,7 +32,7 @@ pub struct Data {
pub list_of_processes: Option<Vec<processes::ProcessHarvest>>, pub list_of_processes: Option<Vec<processes::ProcessHarvest>>,
pub disks: Option<Vec<disks::DiskHarvest>>, pub disks: Option<Vec<disks::DiskHarvest>>,
pub io: Option<disks::IOHarvest>, 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 { impl Default for Data {
@ -220,10 +220,8 @@ impl DataCollector {
// Batteries // Batteries
if let Some(battery_manager) = &self.battery_manager { if let Some(battery_manager) = &self.battery_manager {
if let Some(battery_list) = &mut self.battery_list { if let Some(battery_list) = &mut self.battery_list {
self.data.list_of_batteries = Some(battery_harvester::refresh_batteries( self.data.list_of_batteries =
&battery_manager, Some(batteries::refresh_batteries(&battery_manager, battery_list));
battery_list,
));
} }
if log_enabled!(log::Level::Trace) { if log_enabled!(log::Level::Trace) {

0
src/app/data_harvester/battery_harvester.rs → src/app/data_harvester/batteries.rs
View File