ClementTsang · ClementTsang · Sep 10, 2020 · Sep 8, 2020 · Sep 8, 2020 · Sep 9, 2020
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -38,6 +38,7 @@
         "choco",
         "cmdline",
         "commandline",
+        "concat",
         "crossterm",
         "curr",
         "czvf",

diff --git a/clippy.toml b/clippy.toml
@@ -1 +1,2 @@
-cognitive-complexity-threshold = 100
+cognitive-complexity-threshold = 100
+type-complexity-threshold = 500
diff --git a/src/app.rs b/src/app.rs
@@ -298,6 +298,7 @@ impl App {
                                 .columns
                                 .toggle(&processes::ProcessSorting::Pid);
 
+                            proc_widget_state.requires_redraw = true;
                             self.proc_state.force_update = Some(self.current_widget.widget_id);
                         }
                     }
@@ -502,6 +503,7 @@ impl App {
             }
 
             self.proc_state.force_update = Some(self.current_widget.widget_id);
+            proc_widget_state.requires_redraw = true;
         }
     }
 
@@ -1176,7 +1178,7 @@ impl App {
                             }
                             _ => {}
                         }
-
+                        proc_widget_state.requires_redraw = true;
                         self.proc_state.force_update = Some(self.current_widget.widget_id);
                     }
                 }

diff --git a/src/app/data_farmer.rs b/src/app/data_farmer.rs
@@ -188,6 +188,7 @@ impl DataCollection {
     }
 
     fn eat_network(&mut self, network: &network::NetworkHarvest, new_entry: &mut TimedData) {
+        // FIXME [NETWORKING; CONFIG]: The ability to config this?
         // FIXME [NETWORKING]: Support bits, support switching between decimal and binary units (move the log part to conversion and switch on the fly)
         // RX
         new_entry.rx_data = if network.rx > 0 {

diff --git a/src/app/data_harvester/cpu.rs b/src/app/data_harvester/cpu.rs
@@ -2,7 +2,8 @@ use sysinfo::{ProcessorExt, System, SystemExt};
 
 #[derive(Default, Debug, Clone)]
 pub struct CpuData {
-    pub cpu_name: String,
+    pub cpu_prefix: String,
+    pub cpu_count: Option<usize>,
     pub cpu_usage: f64,
 }
 
@@ -15,14 +16,16 @@ pub fn get_cpu_data_list(sys: &System, show_average_cpu: bool) -> CpuHarvest {
 
     if show_average_cpu {
         cpu_vec.push(CpuData {
-            cpu_name: "AVG".to_string(),
+            cpu_prefix: "AVG".to_string(),
+            cpu_count: None,
             cpu_usage: avg_cpu_usage as f64,
         });
     }
 
     for (itx, cpu) in cpu_data.iter().enumerate() {
         cpu_vec.push(CpuData {
-            cpu_name: format!("CPU{}", itx),
+            cpu_prefix: "CPU".to_string(),
+            cpu_count: Some(itx),
             cpu_usage: f64::from(cpu.get_cpu_usage()),
         });
     }

diff --git a/src/app/data_harvester/disks.rs b/src/app/data_harvester/disks.rs
@@ -24,6 +24,8 @@ pub async fn get_sysinfo_io_usage_list(
         std::collections::HashMap::new();
     Ok(Some(io_hash))
 
+    // TODO: Rename these functions to be like "get_arm_io_usage_list"
+
     // TODO: Sysinfo disk I/O usage.
     // ...sadly, this cannot be done as of now (other than me writing my own), it requires further
     // work.  See https://github.com/GuillaumeGomez/sysinfo/issues/304.

diff --git a/src/app/states.rs b/src/app/states.rs
@@ -109,6 +109,13 @@ impl AppSearchState {
     }
 }
 
+/// Meant for canvas operations involving table column widths.
+#[derive(Default)]
+pub struct CanvasTableWidthState {
+    pub desired_column_widths: Vec<u16>,
+    pub calculated_column_widths: Vec<u16>,
+}
+
 /// ProcessSearchState only deals with process' search's current settings and state.
 pub struct ProcessSearchState {
     pub search_state: AppSearchState,
@@ -321,6 +328,9 @@ impl ProcColumn {
     pub fn get_column_headers(
         &self, proc_sorting_type: &ProcessSorting, sort_reverse: bool,
     ) -> Vec<String> {
+        const DOWN_ARROW: char = '▼';
+        const UP_ARROW: char = '▲';
+
         // TODO: Gonna have to figure out how to do left/right GUI notation if we add it.
         self.ordered_columns
             .iter()
@@ -332,13 +342,20 @@ impl ProcColumn {
                 }
 
                 if mapping.enabled {
-                    Some(if proc_sorting_type == column_type {
-                        column_type.to_string()
-                            + command_str.as_str()
-                            + if sort_reverse { "▼" } else { "▲" }
-                    } else {
-                        column_type.to_string() + command_str.as_str()
-                    })
+                    Some(format!(
+                        "{}{}{}",
+                        column_type.to_string(),
+                        command_str.as_str(),
+                        if proc_sorting_type == column_type {
+                            if sort_reverse {
+                                DOWN_ARROW
+                            } else {
+                                UP_ARROW
+                            }
+                        } else {
+                            ' '
+                        }
+                    ))
                 } else {
                     None
                 }
@@ -358,6 +375,8 @@ pub struct ProcWidgetState {
     pub is_sort_open: bool,
     pub columns: ProcColumn,
     pub is_tree_mode: bool,
+    pub table_width_state: CanvasTableWidthState,
+    pub requires_redraw: bool,
 }
 
 impl ProcWidgetState {
@@ -397,6 +416,8 @@ impl ProcWidgetState {
             is_sort_open: false,
             columns,
             is_tree_mode: false,
+            table_width_state: CanvasTableWidthState::default(),
+            requires_redraw: false,
         }
     }
 
@@ -595,6 +616,7 @@ pub struct CpuWidgetState {
     pub autohide_timer: Option<Instant>,
     pub scroll_state: AppScrollWidgetState,
     pub is_multi_graph_mode: bool,
+    pub table_width_state: CanvasTableWidthState,
 }
 
 impl CpuWidgetState {
@@ -605,6 +627,7 @@ impl CpuWidgetState {
             autohide_timer,
             scroll_state: AppScrollWidgetState::default(),
             is_multi_graph_mode: false,
+            table_width_state: CanvasTableWidthState::default(),
         }
     }
 }
@@ -668,12 +691,14 @@ impl MemState {
 
 pub struct TempWidgetState {
     pub scroll_state: AppScrollWidgetState,
+    pub table_width_state: CanvasTableWidthState,
 }
 
 impl TempWidgetState {
     pub fn init() -> Self {
         TempWidgetState {
             scroll_state: AppScrollWidgetState::default(),
+            table_width_state: CanvasTableWidthState::default(),
         }
     }
 }
@@ -698,12 +723,14 @@ impl TempState {
 
 pub struct DiskWidgetState {
     pub scroll_state: AppScrollWidgetState,
+    pub table_width_state: CanvasTableWidthState,
 }
 
 impl DiskWidgetState {
     pub fn init() -> Self {
         DiskWidgetState {
             scroll_state: AppScrollWidgetState::default(),
+            table_width_state: CanvasTableWidthState::default(),
         }
     }
 }

diff --git a/src/bin/main.rs b/src/bin/main.rs
@@ -106,6 +106,7 @@ fn main() -> Result<()> {
         termination_hook();
     })
     .unwrap();
+    let mut first_run = true;
 
     while !is_terminated.load(Ordering::SeqCst) {
         if let Ok(recv) = receiver.recv_timeout(Duration::from_millis(TICK_RATE_IN_MILLISECONDS)) {
@@ -123,6 +124,13 @@ fn main() -> Result<()> {
                 BottomEvent::Update(data) => {
                     app.data_collection.eat_data(&data);
 
+                    // This thing is required as otherwise, some widgets can't draw correctly w/o
+                    // some data (or they need to be re-drawn).
+                    if first_run {
+                        first_run = false;
+                        app.is_force_redraw = true;
+                    }
+
                     if !app.is_frozen {
                         // Convert all data into tui-compliant components
 

diff --git a/src/canvas.rs b/src/canvas.rs
@@ -43,6 +43,7 @@ pub struct DisplayableData {
     pub temp_sensor_data: Vec<Vec<String>>,
     pub single_process_data: Vec<ConvertedProcessData>, // Contains single process data
     pub finalized_process_data_map: HashMap<u64, Vec<ConvertedProcessData>>, // What's actually displayed
+    pub stringified_process_data_map: HashMap<u64, Vec<(Vec<(String, Option<String>)>, bool)>>, // Represents the row and whether it is disabled
     pub mem_label_percent: String,
     pub swap_label_percent: String,
     pub mem_label_frac: String,
@@ -67,7 +68,6 @@ pub struct Painter {
     widget_layout: BottomLayout,
     derived_widget_draw_locs: Vec<Vec<Vec<Vec<Rect>>>>,
     table_height_offset: u16,
-    requires_boundary_recalculation: bool,
 }
 
 impl Painter {
@@ -152,7 +152,6 @@ impl Painter {
             widget_layout,
             derived_widget_draw_locs: Vec::default(),
             table_height_offset: if is_basic_mode { 2 } else { 4 } + table_gap,
-            requires_boundary_recalculation: true,
         }
     }
 
@@ -401,25 +400,18 @@ impl Painter {
                 // Basic mode.  This basically removes all graphs but otherwise
                 // the same info.
 
-                let cpu_height = (app_state.canvas_data.cpu_data.len() / 4) as u16
-                    + (if app_state.canvas_data.cpu_data.len() % 4 == 0 {
-                        0
-                    } else {
-                        1
-                    });
-
-                // A little hack to force the widget boundary recalculation.  This is required here
-                // as basic mode has a height of 0 initially, which breaks things.
-                if self.requires_boundary_recalculation {
-                    app_state.is_determining_widget_boundary = true;
-                }
-                self.requires_boundary_recalculation = cpu_height == 0;
-
                 let vertical_chunks = Layout::default()
                     .direction(Direction::Vertical)
                     .constraints(
                         [
-                            Constraint::Length(cpu_height),
+                            Constraint::Length(
+                                (app_state.canvas_data.cpu_data.len() / 4) as u16
+                                    + (if app_state.canvas_data.cpu_data.len() % 4 == 0 {
+                                        0
+                                    } else {
+                                        1
+                                    }),
+                            ),
                             Constraint::Length(1),
                             Constraint::Length(2),
                             Constraint::Length(2),
@@ -486,7 +478,7 @@ impl Painter {
                     self.draw_basic_table_arrows(&mut f, app_state, vertical_chunks[3], widget_id);
                 }
             } else {
-                // Draws using the passed in (or default) layout.  NOT basic so far.
+                // Draws using the passed in (or default) layout.
                 if self.derived_widget_draw_locs.is_empty() || app_state.is_force_redraw {
                     let row_draw_locs = Layout::default()
                         .margin(0)