tyler.durden
/
bottom
mirror of https://github.com/ClementTsang/bottom.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added help screen.

This commit is contained in:
ClementTsang 2019-10-09 22:00:10 -04:00
parent 2d20ec7f6f
commit 2900ae2acf
5 changed files with 455 additions and 402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -45,15 +45,19 @@ Currently, I'm unable to really dev or test on MacOS, so I'm not sure how well t
#### General #### General
- `q`, `Esc`, or `Ctrl-C` to quit. - `q`, `Ctrl-C` to quit.
- `Up/k`, `Down/j`, `Left/h`, `Right/l` to navigate between panels. - `Up/k`, `Down/j`, `Left/h`, `Right/l` to navigate between panels.
- `Shift+Up` and `Shift+Down` scrolls through the list if the panel is a table (Temperature, Disks, Processes) - `Shift+Up` and `Shift+Down` scrolls through the list if the panel is a table (Temperature, Disks, Processes).
- `Esc` to close a dialog window (help or dd confirmation).
- `?` to get a help screen explaining the controls.
#### Processes Panel #### Processes Panel
- `dd` to kill the selected process (currently only on Linux) - **I would highly recommend you to be careful using this, lest you accidentally kill the wrong process**. - `dd` to kill the selected process - **I would highly recommend you to be careful using this, lest you accidentally kill the wrong process**.
- `c` to sort by CPU usage. Sorts in descending order by default. Press again to reverse sorting order. - `c` to sort by CPU usage. Sorts in descending order by default. Press again to reverse sorting order.

140
src/app.rs
View File

@ -21,7 +21,6 @@ pub enum ScrollDirection {
} }
pub struct App { pub struct App {
pub should_quit : bool,
pub process_sorting_type : processes::ProcessSorting, pub process_sorting_type : processes::ProcessSorting,
pub process_sorting_reverse : bool, pub process_sorting_reverse : bool,
pub to_be_resorted : bool, pub to_be_resorted : bool,
@ -40,13 +39,13 @@ pub struct App {
pub previous_process_position : i64, pub previous_process_position : i64,
awaiting_second_d : bool, awaiting_second_d : bool,
pub use_dot : bool, pub use_dot : bool,
pub show_help : bool,
} }
impl App { impl App {
pub fn new(show_average_cpu : bool, temperature_type : temperature::TemperatureType, update_rate_in_milliseconds : u64, use_dot : bool) -> App { pub fn new(show_average_cpu : bool, temperature_type : temperature::TemperatureType, update_rate_in_milliseconds : u64, use_dot : bool) -> App {
App { App {
process_sorting_type : processes::ProcessSorting::CPU, process_sorting_type : processes::ProcessSorting::CPU,
should_quit : false,
process_sorting_reverse : true, process_sorting_reverse : true,
to_be_resorted : false, to_be_resorted : false,
currently_selected_process_position : 0, currently_selected_process_position : 0,
@ -64,71 +63,86 @@ impl App {
previous_temp_position : 0, previous_temp_position : 0,
awaiting_second_d : false, awaiting_second_d : false,
use_dot, use_dot,
show_help : false,
} }
} }
pub fn on_key(&mut self, c : char) { pub fn on_enter(&mut self) {
match c { }
'q' => self.should_quit = true,
'd' => {
if self.awaiting_second_d {
self.awaiting_second_d = false;
self.kill_highlighted_process().unwrap_or(()); // TODO: Should this be handled?
}
else {
self.awaiting_second_d = true;
}
}
'c' => {
// TODO: This should depend on what tile you're on!
match self.process_sorting_type {
processes::ProcessSorting::CPU => self.process_sorting_reverse = !self.process_sorting_reverse,
_ => {
self.process_sorting_type = processes::ProcessSorting::CPU;
self.process_sorting_reverse = true;
}
}
self.to_be_resorted = true;
self.currently_selected_process_position = 0;
}
'm' => {
match self.process_sorting_type {
processes::ProcessSorting::MEM => self.process_sorting_reverse = !self.process_sorting_reverse,
_ => {
self.process_sorting_type = processes::ProcessSorting::MEM;
self.process_sorting_reverse = true;
}
}
self.to_be_resorted = true;
self.currently_selected_process_position = 0;
}
'p' => {
match self.process_sorting_type {
processes::ProcessSorting::PID => self.process_sorting_reverse = !self.process_sorting_reverse,
_ => {
self.process_sorting_type = processes::ProcessSorting::PID;
self.process_sorting_reverse = false;
}
}
self.to_be_resorted = true;
self.currently_selected_process_position = 0;
}
'n' => {
match self.process_sorting_type {
processes::ProcessSorting::NAME => self.process_sorting_reverse = !self.process_sorting_reverse,
_ => {
self.process_sorting_type = processes::ProcessSorting::NAME;
self.process_sorting_reverse = false;
}
}
self.to_be_resorted = true;
self.currently_selected_process_position = 0;
}
_ => {}
}
if self.awaiting_second_d && c != 'd' { pub fn on_esc(&mut self) {
self.awaiting_second_d = false; if self.show_help {
self.show_help = false;
}
}
// TODO: How should we make it for process panel specific hotkeys? Only if we're on process panel? Or what?
pub fn on_key(&mut self, c : char) {
if !self.show_help {
match c {
'd' => {
if self.awaiting_second_d {
self.awaiting_second_d = false;
self.kill_highlighted_process().unwrap_or(()); // TODO: Should this be handled?
}
else {
self.awaiting_second_d = true;
}
}
'c' => {
// TODO: This should depend on what tile you're on!
match self.process_sorting_type {
processes::ProcessSorting::CPU => self.process_sorting_reverse = !self.process_sorting_reverse,
_ => {
self.process_sorting_type = processes::ProcessSorting::CPU;
self.process_sorting_reverse = true;
}
}
self.to_be_resorted = true;
self.currently_selected_process_position = 0;
}
'm' => {
match self.process_sorting_type {
processes::ProcessSorting::MEM => self.process_sorting_reverse = !self.process_sorting_reverse,
_ => {
self.process_sorting_type = processes::ProcessSorting::MEM;
self.process_sorting_reverse = true;
}
}
self.to_be_resorted = true;
self.currently_selected_process_position = 0;
}
'p' => {
match self.process_sorting_type {
processes::ProcessSorting::PID => self.process_sorting_reverse = !self.process_sorting_reverse,
_ => {
self.process_sorting_type = processes::ProcessSorting::PID;
self.process_sorting_reverse = false;
}
}
self.to_be_resorted = true;
self.currently_selected_process_position = 0;
}
'n' => {
match self.process_sorting_type {
processes::ProcessSorting::NAME => self.process_sorting_reverse = !self.process_sorting_reverse,
_ => {
self.process_sorting_type = processes::ProcessSorting::NAME;
self.process_sorting_reverse = false;
}
}
self.to_be_resorted = true;
self.currently_selected_process_position = 0;
}
'?' => {
self.show_help = true;
}
_ => {}
}
if self.awaiting_second_d && c != 'd' {
self.awaiting_second_d = false;
}
} }
} }

696
src/canvas.rs
View File

@ -1,8 +1,8 @@
use tui_temp_fork::{ use tui_temp_fork::{
backend, backend,
layout::{Constraint, Direction, Layout}, layout::{Alignment, Constraint, Direction, Layout},
style::{Color, Modifier, Style}, style::{Color, Modifier, Style},
widgets::{Axis, Block, Borders, Chart, Dataset, Marker, Row, Table, Widget}, widgets::{Axis, Block, Borders, Chart, Dataset, Marker, Paragraph, Row, Table, Text, Widget},
Terminal, Terminal,
}; };
@ -43,360 +43,396 @@ pub fn draw_data<B : backend::Backend>(terminal : &mut Terminal<B>, app_state :
terminal.autoresize()?; terminal.autoresize()?;
terminal.draw(|mut f| { terminal.draw(|mut f| {
//debug!("Drawing!"); //debug!("Drawing!");
let vertical_chunks = Layout::default()
// Only for the "help" and "are you sure" menus
let vertical_dialog_chunk = Layout::default()
.direction(Direction::Vertical) .direction(Direction::Vertical)
.margin(1) .margin(1)
.constraints([Constraint::Percentage(34), Constraint::Percentage(34), Constraint::Percentage(33)].as_ref()) .constraints([Constraint::Percentage(32), Constraint::Percentage(40), Constraint::Percentage(28)].as_ref())
.split(f.size()); .split(f.size());
let middle_chunks = Layout::default() let middle_dialog_chunk = Layout::default()
.direction(Direction::Horizontal) .direction(Direction::Horizontal)
.margin(0) .margin(0)
.constraints([Constraint::Percentage(60), Constraint::Percentage(40)].as_ref()) .constraints([Constraint::Percentage(30), Constraint::Percentage(40), Constraint::Percentage(30)].as_ref())
.split(vertical_chunks[1]); .split(vertical_dialog_chunk[1]);
let middle_divided_chunk_2 = Layout::default() if app_state.show_help {
.direction(Direction::Vertical) let text = [
.margin(0) Text::raw("\nGeneral Keybinds\n"),
.constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) Text::raw("q, Ctrl-C to quit.\n"),
.split(middle_chunks[1]); Text::raw("Up/k, Down/j, Left/h, Right/l to navigate between panels.\n"),
Text::raw("Shift+Up and Shift+Down scrolls through the list.\n"),
Text::raw("Esc to close a dialog window (help or dd confirmation).\n"),
Text::raw("? to get this help screen.\n"),
Text::raw("\nProcess Panel Keybinds\n"),
Text::raw("dd to kill the selected process.\n"),
Text::raw("c to sort by CPU usage.\n"),
Text::raw("m to sort by memory usage.\n"),
Text::raw("p to sort by PID.\n"),
Text::raw("n to sort by process name.\n"),
];
let bottom_chunks = Layout::default() Paragraph::new(text.iter())
.direction(Direction::Horizontal) .block(Block::default().title("Help").borders(Borders::ALL))
.margin(0) .style(Style::default().fg(Color::Gray))
.constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref()) .alignment(Alignment::Left)
.split(vertical_chunks[2]); .wrap(true)
.render(&mut f, middle_dialog_chunk[1]);
// Set up blocks and their components
// CPU usage graph
{
let x_axis : Axis<String> = Axis::default().style(Style::default().fg(GRAPH_COLOUR)).bounds([0.0, 600_000.0]);
let y_axis = Axis::default()
.style(Style::default().fg(GRAPH_COLOUR))
.bounds([-0.5, 100.5])
.labels(&["0%", "100%"]);
let mut dataset_vector : Vec<Dataset> = Vec::new();
for (i, cpu) in canvas_data.cpu_data.iter().enumerate() {
let mut avg_cpu_exist_offset = 0;
if app_state.show_average_cpu {
if i == 0 {
// Skip, we want to render the average cpu last!
continue;
}
else {
avg_cpu_exist_offset = 1;
}
}
dataset_vector.push(
Dataset::default()
.name(&cpu.0)
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
.style(Style::default().fg(COLOUR_LIST[i - avg_cpu_exist_offset % COLOUR_LIST.len()]))
.data(&(cpu.1)),
);
}
if !canvas_data.cpu_data.is_empty() && app_state.show_average_cpu {
dataset_vector.push(
Dataset::default()
.name(&canvas_data.cpu_data[0].0)
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
.style(Style::default().fg(COLOUR_LIST[canvas_data.cpu_data.len() - 1 % COLOUR_LIST.len()]))
.data(&(canvas_data.cpu_data[0].1)),
);
}
Chart::default()
.block(
Block::default()
.title("CPU Usage")
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::CPU => highlighted_border_style,
_ => border_style,
}),
)
.x_axis(x_axis)
.y_axis(y_axis)
.datasets(&dataset_vector)
.render(&mut f, vertical_chunks[0]);
} }
else {
let vertical_chunks = Layout::default()
.direction(Direction::Vertical)
.margin(1)
.constraints([Constraint::Percentage(34), Constraint::Percentage(34), Constraint::Percentage(33)].as_ref())
.split(f.size());
//Memory usage graph let middle_chunks = Layout::default()
{ .direction(Direction::Horizontal)
let x_axis : Axis<String> = Axis::default().style(Style::default().fg(GRAPH_COLOUR)).bounds([0.0, 600_000.0]); .margin(0)
let y_axis = Axis::default() .constraints([Constraint::Percentage(60), Constraint::Percentage(40)].as_ref())
.style(Style::default().fg(GRAPH_COLOUR)) .split(vertical_chunks[1]);
.bounds([-0.5, 100.5]) // Offset as the zero value isn't drawn otherwise...
.labels(&["0%", "100%"]);
let mem_name = "RAM:".to_string() let middle_divided_chunk_2 = Layout::default()
+ &format!("{:3}%", (canvas_data.mem_data.last().unwrap_or(&(0_f64, 0_f64)).1.round() as u64)) .direction(Direction::Vertical)
+ &format!( .margin(0)
" {:.1}GB/{:.1}GB", .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref())
canvas_data.mem_values[0].0 as f64 / 1024.0, .split(middle_chunks[1]);
canvas_data.mem_values[0].1 as f64 / 1024.0
);
let swap_name : String;
let mut mem_canvas_vec : Vec<Dataset> = vec![Dataset::default() let bottom_chunks = Layout::default()
.name(&mem_name) .direction(Direction::Horizontal)
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille }) .margin(0)
.style(Style::default().fg(Color::LightBlue)) .constraints([Constraint::Percentage(50), Constraint::Percentage(50)].as_ref())
.data(&canvas_data.mem_data)]; .split(vertical_chunks[2]);
if !(&canvas_data.swap_data).is_empty() {
if let Some(last_canvas_result) = (&canvas_data.swap_data).last() {
if last_canvas_result.1 >= 0.0 {
swap_name = "SWP:".to_string()
+ &format!("{:3}%", (canvas_data.swap_data.last().unwrap_or(&(0_f64, 0_f64)).1.round() as u64))
+ &format!(
" {:.1}GB/{:.1}GB",
canvas_data.mem_values[1].0 as f64 / 1024.0,
canvas_data.mem_values[1].1 as f64 / 1024.0
);
mem_canvas_vec.push(
Dataset::default()
.name(&swap_name)
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
.style(Style::default().fg(Color::LightYellow))
.data(&canvas_data.swap_data),
);
}
}
}
Chart::default()
.block(
Block::default()
.title("Memory Usage")
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::MEM => highlighted_border_style,
_ => border_style,
}),
)
.x_axis(x_axis)
.y_axis(y_axis)
.datasets(&mem_canvas_vec)
.render(&mut f, middle_chunks[0]);
}
// Temperature table
{
let num_rows = i64::from(middle_divided_chunk_2[0].height) - 3;
let start_position = get_start_position(
num_rows,
&(app_state.scroll_direction),
&mut app_state.previous_temp_position,
&mut app_state.currently_selected_temperature_position,
);
let sliced_vec : Vec<Vec<String>> = (&canvas_data.temp_sensor_data[start_position as usize..]).to_vec();
let mut disk_counter = 0;
let temperature_rows = sliced_vec.iter().map(|disk| {
Row::StyledData(
disk.iter(),
if disk_counter == app_state.currently_selected_temperature_position - start_position {
// TODO: This is what controls the highlighting!
disk_counter = -1;
Style::default().fg(Color::Black).bg(Color::Cyan)
}
else {
if disk_counter >= 0 {
disk_counter += 1;
}
Style::default().fg(TEXT_COLOUR)
},
)
});
let width = f64::from(middle_divided_chunk_2[0].width);
Table::new(["Sensor", "Temp"].iter(), temperature_rows)
.block(
Block::default()
.title("Temperatures")
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::TEMP => highlighted_border_style,
_ => border_style,
}),
)
.header_style(Style::default().fg(Color::LightBlue))
.widths(&[(width * 0.45) as u16, (width * 0.4) as u16])
.render(&mut f, middle_divided_chunk_2[0]);
}
// Disk usage table
{
let num_rows = i64::from(middle_divided_chunk_2[1].height) - 3;
let start_position = get_start_position(
num_rows,
&(app_state.scroll_direction),
&mut app_state.previous_disk_position,
&mut app_state.currently_selected_disk_position,
);
let sliced_vec : Vec<Vec<String>> = (&canvas_data.disk_data[start_position as usize..]).to_vec();
let mut disk_counter = 0;
let disk_rows = sliced_vec.iter().map(|disk| {
Row::StyledData(
disk.iter(),
if disk_counter == app_state.currently_selected_disk_position - start_position {
// TODO: This is what controls the highlighting!
disk_counter = -1;
Style::default().fg(Color::Black).bg(Color::Cyan)
}
else {
if disk_counter >= 0 {
disk_counter += 1;
}
Style::default().fg(TEXT_COLOUR)
},
)
});
// TODO: We may have to dynamically remove some of these table elements based on size...
let width = f64::from(middle_divided_chunk_2[1].width);
Table::new(["Disk", "Mount", "Used", "Total", "Free", "R/s", "W/s"].iter(), disk_rows)
.block(
Block::default()
.title("Disk Usage")
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::DISK => highlighted_border_style,
_ => border_style,
}),
)
.header_style(Style::default().fg(Color::LightBlue).modifier(Modifier::BOLD))
.widths(&[
(width * 0.18).floor() as u16,
(width * 0.14).floor() as u16,
(width * 0.11).floor() as u16,
(width * 0.11).floor() as u16,
(width * 0.11).floor() as u16,
(width * 0.11).floor() as u16,
(width * 0.11).floor() as u16,
])
.render(&mut f, middle_divided_chunk_2[1]);
}
// Network graph
{
let x_axis : Axis<String> = Axis::default().style(Style::default().fg(GRAPH_COLOUR)).bounds([0.0, 600_000.0]);
let y_axis = Axis::default()
.style(Style::default().fg(GRAPH_COLOUR))
.bounds([-0.5, 1_000_000.5])
.labels(&["0GB", "1GB"]);
Chart::default()
.block(
Block::default()
.title("Network")
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::NETWORK => highlighted_border_style,
_ => border_style,
}),
)
.x_axis(x_axis)
.y_axis(y_axis)
.datasets(&[
Dataset::default()
.name(&(canvas_data.rx_display))
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
.style(Style::default().fg(Color::LightBlue))
.data(&canvas_data.network_data_rx),
Dataset::default()
.name(&(canvas_data.tx_display))
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
.style(Style::default().fg(Color::LightYellow))
.data(&canvas_data.network_data_tx),
])
.render(&mut f, bottom_chunks[0]);
}
// Processes table
{
let width = f64::from(bottom_chunks[1].width);
// Admittedly this is kinda a hack... but we need to:
// * Scroll
// * Show/hide elements based on scroll position
// As such, we use a process_counter to know when we've hit the process we've currently scrolled to. We also need to move the list - we can
// do so by hiding some elements!
let num_rows = i64::from(bottom_chunks[1].height) - 3;
let start_position = get_start_position(
num_rows,
&(app_state.scroll_direction),
&mut app_state.previous_process_position,
&mut app_state.currently_selected_process_position,
);
/*debug!(
"START POSN: {}, PREV POSN: {}, CURRENT SELECTED POSN: {}, NUM ROWS: {}",
start_position, app_state.previous_process_position, app_state.currently_selected_process_position, num_rows
);*/
let sliced_vec : Vec<Vec<String>> = (&canvas_data.process_data[start_position as usize..]).to_vec();
let mut process_counter = 0;
let process_rows = sliced_vec.iter().map(|process| {
Row::StyledData(
process.iter(),
if process_counter == app_state.currently_selected_process_position - start_position {
// TODO: This is what controls the highlighting!
process_counter = -1;
Style::default().fg(Color::Black).bg(Color::Cyan)
}
else {
if process_counter >= 0 {
process_counter += 1;
}
Style::default().fg(TEXT_COLOUR)
},
)
});
// Set up blocks and their components
// CPU usage graph
{ {
use app::data_collection::processes::ProcessSorting; let x_axis : Axis<String> = Axis::default().style(Style::default().fg(GRAPH_COLOUR)).bounds([0.0, 600_000.0]);
let mut pid = "PID".to_string(); let y_axis = Axis::default()
let mut name = "Name".to_string(); .style(Style::default().fg(GRAPH_COLOUR))
let mut cpu = "CPU%".to_string(); .bounds([-0.5, 100.5])
let mut mem = "Mem%".to_string(); .labels(&["0%", "100%"]);
let direction_val = if app_state.process_sorting_reverse { let mut dataset_vector : Vec<Dataset> = Vec::new();
" ⯆".to_string()
for (i, cpu) in canvas_data.cpu_data.iter().enumerate() {
let mut avg_cpu_exist_offset = 0;
if app_state.show_average_cpu {
if i == 0 {
// Skip, we want to render the average cpu last!
continue;
}
else {
avg_cpu_exist_offset = 1;
}
}
dataset_vector.push(
Dataset::default()
.name(&cpu.0)
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
.style(Style::default().fg(COLOUR_LIST[i - avg_cpu_exist_offset % COLOUR_LIST.len()]))
.data(&(cpu.1)),
);
} }
else {
" ⯅".to_string()
};
match app_state.process_sorting_type { if !canvas_data.cpu_data.is_empty() && app_state.show_average_cpu {
ProcessSorting::CPU => cpu += &direction_val, dataset_vector.push(
ProcessSorting::MEM => mem += &direction_val, Dataset::default()
ProcessSorting::PID => pid += &direction_val, .name(&canvas_data.cpu_data[0].0)
ProcessSorting::NAME => name += &direction_val, .marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
}; .style(Style::default().fg(COLOUR_LIST[canvas_data.cpu_data.len() - 1 % COLOUR_LIST.len()]))
.data(&(canvas_data.cpu_data[0].1)),
);
}
Table::new([pid, name, cpu, mem].iter(), process_rows) Chart::default()
.block( .block(
Block::default() Block::default()
.title("Processes") .title("CPU Usage")
.borders(Borders::ALL) .borders(Borders::ALL)
.border_style(match app_state.current_application_position { .border_style(match app_state.current_application_position {
app::ApplicationPosition::PROCESS => highlighted_border_style, app::ApplicationPosition::CPU => highlighted_border_style,
_ => border_style,
}),
)
.x_axis(x_axis)
.y_axis(y_axis)
.datasets(&dataset_vector)
.render(&mut f, vertical_chunks[0]);
}
//Memory usage graph
{
let x_axis : Axis<String> = Axis::default().style(Style::default().fg(GRAPH_COLOUR)).bounds([0.0, 600_000.0]);
let y_axis = Axis::default()
.style(Style::default().fg(GRAPH_COLOUR))
.bounds([-0.5, 100.5]) // Offset as the zero value isn't drawn otherwise...
.labels(&["0%", "100%"]);
let mem_name = "RAM:".to_string()
+ &format!("{:3}%", (canvas_data.mem_data.last().unwrap_or(&(0_f64, 0_f64)).1.round() as u64))
+ &format!(
" {:.1}GB/{:.1}GB",
canvas_data.mem_values[0].0 as f64 / 1024.0,
canvas_data.mem_values[0].1 as f64 / 1024.0
);
let swap_name : String;
let mut mem_canvas_vec : Vec<Dataset> = vec![Dataset::default()
.name(&mem_name)
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
.style(Style::default().fg(Color::LightBlue))
.data(&canvas_data.mem_data)];
if !(&canvas_data.swap_data).is_empty() {
if let Some(last_canvas_result) = (&canvas_data.swap_data).last() {
if last_canvas_result.1 >= 0.0 {
swap_name = "SWP:".to_string()
+ &format!("{:3}%", (canvas_data.swap_data.last().unwrap_or(&(0_f64, 0_f64)).1.round() as u64))
+ &format!(
" {:.1}GB/{:.1}GB",
canvas_data.mem_values[1].0 as f64 / 1024.0,
canvas_data.mem_values[1].1 as f64 / 1024.0
);
mem_canvas_vec.push(
Dataset::default()
.name(&swap_name)
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
.style(Style::default().fg(Color::LightYellow))
.data(&canvas_data.swap_data),
);
}
}
}
Chart::default()
.block(
Block::default()
.title("Memory Usage")
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::MEM => highlighted_border_style,
_ => border_style,
}),
)
.x_axis(x_axis)
.y_axis(y_axis)
.datasets(&mem_canvas_vec)
.render(&mut f, middle_chunks[0]);
}
// Temperature table
{
let num_rows = i64::from(middle_divided_chunk_2[0].height) - 3;
let start_position = get_start_position(
num_rows,
&(app_state.scroll_direction),
&mut app_state.previous_temp_position,
&mut app_state.currently_selected_temperature_position,
);
let sliced_vec : Vec<Vec<String>> = (&canvas_data.temp_sensor_data[start_position as usize..]).to_vec();
let mut disk_counter = 0;
let temperature_rows = sliced_vec.iter().map(|disk| {
Row::StyledData(
disk.iter(),
if disk_counter == app_state.currently_selected_temperature_position - start_position {
disk_counter = -1;
Style::default().fg(Color::Black).bg(Color::Cyan)
}
else {
if disk_counter >= 0 {
disk_counter += 1;
}
Style::default().fg(TEXT_COLOUR)
},
)
});
let width = f64::from(middle_divided_chunk_2[0].width);
Table::new(["Sensor", "Temp"].iter(), temperature_rows)
.block(
Block::default()
.title("Temperatures")
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::TEMP => highlighted_border_style,
_ => border_style, _ => border_style,
}), }),
) )
.header_style(Style::default().fg(Color::LightBlue)) .header_style(Style::default().fg(Color::LightBlue))
.widths(&[(width * 0.2) as u16, (width * 0.35) as u16, (width * 0.2) as u16, (width * 0.2) as u16]) .widths(&[(width * 0.45) as u16, (width * 0.4) as u16])
.render(&mut f, bottom_chunks[1]); .render(&mut f, middle_divided_chunk_2[0]);
}
// Disk usage table
{
let num_rows = i64::from(middle_divided_chunk_2[1].height) - 3;
let start_position = get_start_position(
num_rows,
&(app_state.scroll_direction),
&mut app_state.previous_disk_position,
&mut app_state.currently_selected_disk_position,
);
let sliced_vec : Vec<Vec<String>> = (&canvas_data.disk_data[start_position as usize..]).to_vec();
let mut disk_counter = 0;
let disk_rows = sliced_vec.iter().map(|disk| {
Row::StyledData(
disk.iter(),
if disk_counter == app_state.currently_selected_disk_position - start_position {
disk_counter = -1;
Style::default().fg(Color::Black).bg(Color::Cyan)
}
else {
if disk_counter >= 0 {
disk_counter += 1;
}
Style::default().fg(TEXT_COLOUR)
},
)
});
// TODO: We may have to dynamically remove some of these table elements based on size...
let width = f64::from(middle_divided_chunk_2[1].width);
Table::new(["Disk", "Mount", "Used", "Total", "Free", "R/s", "W/s"].iter(), disk_rows)
.block(
Block::default()
.title("Disk Usage")
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::DISK => highlighted_border_style,
_ => border_style,
}),
)
.header_style(Style::default().fg(Color::LightBlue).modifier(Modifier::BOLD))
.widths(&[
(width * 0.18).floor() as u16,
(width * 0.14).floor() as u16,
(width * 0.11).floor() as u16,
(width * 0.11).floor() as u16,
(width * 0.11).floor() as u16,
(width * 0.11).floor() as u16,
(width * 0.11).floor() as u16,
])
.render(&mut f, middle_divided_chunk_2[1]);
}
// Network graph
{
let x_axis : Axis<String> = Axis::default().style(Style::default().fg(GRAPH_COLOUR)).bounds([0.0, 600_000.0]);
let y_axis = Axis::default()
.style(Style::default().fg(GRAPH_COLOUR))
.bounds([-0.5, 1_000_000.5])
.labels(&["0GB", "1GB"]);
Chart::default()
.block(
Block::default()
.title("Network")
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::NETWORK => highlighted_border_style,
_ => border_style,
}),
)
.x_axis(x_axis)
.y_axis(y_axis)
.datasets(&[
Dataset::default()
.name(&(canvas_data.rx_display))
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
.style(Style::default().fg(Color::LightBlue))
.data(&canvas_data.network_data_rx),
Dataset::default()
.name(&(canvas_data.tx_display))
.marker(if app_state.use_dot { Marker::Dot } else { Marker::Braille })
.style(Style::default().fg(Color::LightYellow))
.data(&canvas_data.network_data_tx),
])
.render(&mut f, bottom_chunks[0]);
}
// Processes table
{
let width = f64::from(bottom_chunks[1].width);
// Admittedly this is kinda a hack... but we need to:
// * Scroll
// * Show/hide elements based on scroll position
// As such, we use a process_counter to know when we've hit the process we've currently scrolled to. We also need to move the list - we can
// do so by hiding some elements!
let num_rows = i64::from(bottom_chunks[1].height) - 3;
let start_position = get_start_position(
num_rows,
&(app_state.scroll_direction),
&mut app_state.previous_process_position,
&mut app_state.currently_selected_process_position,
);
/*debug!(
"START POSN: {}, PREV POSN: {}, CURRENT SELECTED POSN: {}, NUM ROWS: {}",
start_position, app_state.previous_process_position, app_state.currently_selected_process_position, num_rows
);*/
let sliced_vec : Vec<Vec<String>> = (&canvas_data.process_data[start_position as usize..]).to_vec();
let mut process_counter = 0;
let process_rows = sliced_vec.iter().map(|process| {
Row::StyledData(
process.iter(),
if process_counter == app_state.currently_selected_process_position - start_position {
process_counter = -1;
Style::default().fg(Color::Black).bg(Color::Cyan)
}
else {
if process_counter >= 0 {
process_counter += 1;
}
Style::default().fg(TEXT_COLOUR)
},
)
});
{
use app::data_collection::processes::ProcessSorting;
let mut pid = "PID".to_string();
let mut name = "Name".to_string();
let mut cpu = "CPU%".to_string();
let mut mem = "Mem%".to_string();
let direction_val = if app_state.process_sorting_reverse {
" ⯆".to_string()
}
else {
" ⯅".to_string()
};
match app_state.process_sorting_type {
ProcessSorting::CPU => cpu += &direction_val,
ProcessSorting::MEM => mem += &direction_val,
ProcessSorting::PID => pid += &direction_val,
ProcessSorting::NAME => name += &direction_val,
};
Table::new([pid, name, cpu, mem].iter(), process_rows)
.block(
Block::default()
.title("Processes")
.borders(Borders::ALL)
.border_style(match app_state.current_application_position {
app::ApplicationPosition::PROCESS => highlighted_border_style,
_ => border_style,
}),
)
.header_style(Style::default().fg(Color::LightBlue))
.widths(&[(width * 0.2) as u16, (width * 0.35) as u16, (width * 0.2) as u16, (width * 0.2) as u16])
.render(&mut f, bottom_chunks[1]);
}
} }
} }
})?; })?;

2
src/constants.rs
View File

@ -1,5 +1,5 @@
// TODO: Store like three minutes of data, then change how much is shown based on scaling! // TODO: Store like three minutes of data, then change how much is shown based on scaling!
pub const STALE_MAX_MILLISECONDS : u64 = 60 * 1000; // We wish to store at most 60 seconds worth of data. This may change in the future, or be configurable. pub const STALE_MAX_MILLISECONDS : u64 = 60 * 1000; // We wish to store at most 60 seconds worth of data. This may change in the future, or be configurable.
pub const _TIME_STARTS_FROM : u64 = 60 * 1000; pub const _TIME_STARTS_FROM : u64 = 60 * 1000; // TODO: Fix this
pub const TICK_RATE_IN_MILLISECONDS : u64 = 200; // We use this as it's a good value to work with. pub const TICK_RATE_IN_MILLISECONDS : u64 = 200; // We use this as it's a good value to work with.
pub const DEFAULT_REFRESH_RATE_IN_MILLISECONDS : u128 = 1000; pub const DEFAULT_REFRESH_RATE_IN_MILLISECONDS : u128 = 1000;

9
src/main.rs
View File

@ -183,14 +183,16 @@ fn main() -> error::Result<()> {
Event::KeyInput(event) => { Event::KeyInput(event) => {
// debug!("Keyboard event fired!"); // debug!("Keyboard event fired!");
match event { match event {
KeyEvent::Ctrl('c') | KeyEvent::Esc => break, KeyEvent::Ctrl('c') | KeyEvent::Char('q') => break,
KeyEvent::Char('h') | KeyEvent::Left => app.on_left(), KeyEvent::Char('h') | KeyEvent::Left => app.on_left(),
KeyEvent::Char('l') | KeyEvent::Right => app.on_right(), KeyEvent::Char('l') | KeyEvent::Right => app.on_right(),
KeyEvent::Char('k') | KeyEvent::Up => app.on_up(), KeyEvent::Char('k') | KeyEvent::Up => app.on_up(),
KeyEvent::Char('j') | KeyEvent::Down => app.on_down(), KeyEvent::Char('j') | KeyEvent::Down => app.on_down(),
KeyEvent::ShiftUp => app.decrement_position_count(), KeyEvent::ShiftUp => app.decrement_position_count(),
KeyEvent::ShiftDown => app.increment_position_count(), KeyEvent::ShiftDown => app.increment_position_count(),
KeyEvent::Char(c) => app.on_key(c), // TODO: We can remove the 'q' event and just move it to the quit? KeyEvent::Char(c) => app.on_key(c),
KeyEvent::Enter => app.on_enter(),
KeyEvent::Esc => app.on_esc(),
_ => {} _ => {}
} }
@ -248,9 +250,6 @@ fn main() -> error::Result<()> {
debug!("Update event complete."); debug!("Update event complete.");
} }
} }
if app.should_quit {
break;
}
} }
// Draw! // Draw!
if let Err(err) = canvas::draw_data(&mut terminal, &mut app, &canvas_data) { if let Err(err) = canvas::draw_data(&mut terminal, &mut app, &canvas_data) {