From fceae8d4426eb5e81a883e5ecb32363c8dc77974 Mon Sep 17 00:00:00 2001 From: ClementTsang Date: Fri, 13 Aug 2021 22:23:09 -0400 Subject: [PATCH] refactor: clean up some states and code --- src/app.rs | 14 +++------- src/app/widget_states/graph_state.rs | 1 - src/app/widget_states/table_state.rs | 1 - .../battery_state.rs => widgets/battery.rs} | 0 .../cpu_state.rs => widgets/cpu.rs} | 0 .../disk_state.rs => widgets/disk.rs} | 0 .../mem_state.rs => widgets/mem.rs} | 0 src/app/{widget_states => widgets}/mod.rs | 28 +++++++++---------- .../net_state.rs => widgets/net.rs} | 0 .../process_state.rs => widgets/process.rs} | 0 .../temp_state.rs => widgets/temp.rs} | 0 src/constants.rs | 8 ++++++ src/lib.rs | 11 +++----- 13 files changed, 30 insertions(+), 33 deletions(-) delete mode 100644 src/app/widget_states/graph_state.rs delete mode 100644 src/app/widget_states/table_state.rs rename src/app/{widget_states/battery_state.rs => widgets/battery.rs} (100%) rename src/app/{widget_states/cpu_state.rs => widgets/cpu.rs} (100%) rename src/app/{widget_states/disk_state.rs => widgets/disk.rs} (100%) rename src/app/{widget_states/mem_state.rs => widgets/mem.rs} (100%) rename src/app/{widget_states => widgets}/mod.rs (89%) rename src/app/{widget_states/net_state.rs => widgets/net.rs} (100%) rename src/app/{widget_states/process_state.rs => widgets/process.rs} (100%) rename src/app/{widget_states/temp_state.rs => widgets/temp.rs} (100%) diff --git a/src/app.rs b/src/app.rs index 239584f4..be767586 100644 --- a/src/app.rs +++ b/src/app.rs @@ -4,7 +4,7 @@ pub mod filter; pub mod layout_manager; mod process_killer; pub mod query; -pub mod widget_states; +pub mod widgets; use std::{ cmp::{max, min}, @@ -21,10 +21,11 @@ use data_farmer::*; use data_harvester::{processes, temperature}; pub use filter::*; use layout_manager::*; -pub use widget_states::*; +pub use widgets::*; use crate::{ - canvas, constants, + canvas, + constants::{self, MAX_SIGNAL}, units::data_units::DataUnit, utils::error::{BottomError, Result}, Pid, @@ -128,13 +129,6 @@ pub struct AppState { pub filters: DataFilters, } -#[cfg(target_os = "windows")] -const MAX_SIGNAL: usize = 1; -#[cfg(target_os = "linux")] -const MAX_SIGNAL: usize = 64; -#[cfg(target_os = "macos")] -const MAX_SIGNAL: usize = 31; - impl AppState { pub fn reset(&mut self) { // Reset multi diff --git a/src/app/widget_states/graph_state.rs b/src/app/widget_states/graph_state.rs deleted file mode 100644 index 6f3b55d4..00000000 --- a/src/app/widget_states/graph_state.rs +++ /dev/null @@ -1 +0,0 @@ -//! States for a graph widget. diff --git a/src/app/widget_states/table_state.rs b/src/app/widget_states/table_state.rs deleted file mode 100644 index 2e57e8f1..00000000 --- a/src/app/widget_states/table_state.rs +++ /dev/null @@ -1 +0,0 @@ -//! States for a table widget. diff --git a/src/app/widget_states/battery_state.rs b/src/app/widgets/battery.rs similarity index 100% rename from src/app/widget_states/battery_state.rs rename to src/app/widgets/battery.rs diff --git a/src/app/widget_states/cpu_state.rs b/src/app/widgets/cpu.rs similarity index 100% rename from src/app/widget_states/cpu_state.rs rename to src/app/widgets/cpu.rs diff --git a/src/app/widget_states/disk_state.rs b/src/app/widgets/disk.rs similarity index 100% rename from src/app/widget_states/disk_state.rs rename to src/app/widgets/disk.rs diff --git a/src/app/widget_states/mem_state.rs b/src/app/widgets/mem.rs similarity index 100% rename from src/app/widget_states/mem_state.rs rename to src/app/widgets/mem.rs diff --git a/src/app/widget_states/mod.rs b/src/app/widgets/mod.rs similarity index 89% rename from src/app/widget_states/mod.rs rename to src/app/widgets/mod.rs index dc6c02e7..a7b735ac 100644 --- a/src/app/widget_states/mod.rs +++ b/src/app/widgets/mod.rs @@ -4,26 +4,26 @@ use tui::widgets::TableState; use crate::{app::layout_manager::BottomWidgetType, constants}; -pub mod process_state; -pub use process_state::*; +pub mod process; +pub use process::*; -pub mod net_state; -pub use net_state::*; +pub mod net; +pub use net::*; -pub mod mem_state; -pub use mem_state::*; +pub mod mem; +pub use mem::*; -pub mod cpu_state; -pub use cpu_state::*; +pub mod cpu; +pub use cpu::*; -pub mod disk_state; -pub use disk_state::*; +pub mod disk; +pub use disk::*; -pub mod battery_state; -pub use battery_state::*; +pub mod battery; +pub use self::battery::*; -pub mod temp_state; -pub use temp_state::*; +pub mod temp; +pub use temp::*; #[derive(Debug)] pub enum ScrollDirection { diff --git a/src/app/widget_states/net_state.rs b/src/app/widgets/net.rs similarity index 100% rename from src/app/widget_states/net_state.rs rename to src/app/widgets/net.rs diff --git a/src/app/widget_states/process_state.rs b/src/app/widgets/process.rs similarity index 100% rename from src/app/widget_states/process_state.rs rename to src/app/widgets/process.rs diff --git a/src/app/widget_states/temp_state.rs b/src/app/widgets/temp.rs similarity index 100% rename from src/app/widget_states/temp_state.rs rename to src/app/widgets/temp.rs diff --git a/src/constants.rs b/src/constants.rs index 2397e7b1..bcd992eb 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -22,6 +22,14 @@ pub const MAX_KEY_TIMEOUT_IN_MILLISECONDS: u64 = 1000; pub const TABLE_GAP_HEIGHT_LIMIT: u16 = 7; pub const TIME_LABEL_HEIGHT_LIMIT: u16 = 7; +// For kill signals +#[cfg(target_os = "windows")] +pub const MAX_SIGNAL: usize = 1; +#[cfg(target_os = "linux")] +pub const MAX_SIGNAL: usize = 64; +#[cfg(target_os = "macos")] +pub const MAX_SIGNAL: usize = 31; + // Side borders pub static SIDE_BORDERS: Lazy = Lazy::new(|| tui::widgets::Borders::from_bits_truncate(20)); diff --git a/src/lib.rs b/src/lib.rs index f5aae7d1..d3a1ba35 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -82,13 +82,10 @@ pub enum EventResult { pub fn handle_mouse_event(event: MouseEvent, app: &mut AppState) -> EventResult { match event.kind { - MouseEventKind::Down(button) => match button { - MouseButton::Left => { - app.on_left_mouse_up(event.column, event.row); - EventResult::Redraw - } - _ => EventResult::Continue, - }, + MouseEventKind::Down(MouseButton::Left) => { + app.on_left_mouse_up(event.column, event.row); + EventResult::Redraw + } MouseEventKind::ScrollUp => { app.handle_scroll_up(); EventResult::Redraw