Better color scheme + naming

Author: Peixian Wang

src/app.rs

@@ -96,8 +96,6 @@ pub enum SelectedTab {
     #[default]
     #[strum(to_string = "General Information")]
     General,
-    // #[strum(to_string = "Index")]
-    // Index,
     #[strum(to_string = "Process Group Info")]
     ProcessGroup,
     #[strum(to_string = "Process Info")]
@@ -169,11 +167,15 @@ impl Default for App<'_> {
 
 impl App<'_> {
     /// Constructs a new instance of [`App`].
-    pub fn new(filepath: String) -> Self {
+    pub fn new(filepath: String, colors: Option<CommonColors> ) -> Self {
         let now = Instant::now();
         let parser = parser::CDParser::new(&filepath).unwrap();
         let mut ret = Self::default();
+
         ret.filepath = filepath.clone();
+        if let Some(colors) = colors { 
+            ret.colors = colors;
+        }
 
         ret.index_map = parser.build_index().unwrap();
         ret.crash_dump = parser.parse(&ret.index_map).unwrap();
@@ -455,17 +457,17 @@ impl App<'_> {
 
     pub fn get_heap_info(&self, pid: &str) -> io::Result<Text> {
         self.parser
-            .get_heap_info(&self.crash_dump, &self.filepath, pid)
+            .get_heap_info(&self.crash_dump, &self.filepath, pid, &self.colors)
     }
 
     pub fn get_stack_info(&self, pid: &str) -> io::Result<Text> {
         self.parser
-            .get_stack_info(&self.crash_dump, &self.filepath, pid)
+            .get_stack_info(&self.crash_dump, &self.filepath, pid, &self.colors)
     }
 
     pub fn get_message_queue_info(&self, pid: &str) -> io::Result<Text> {
         self.parser
-            .get_message_queue_info(&self.crash_dump, &self.filepath, pid)
+            .get_message_queue_info(&self.crash_dump, &self.filepath, pid, &self.colors)
     }
 }
 
@@ -583,7 +585,7 @@ impl Widget for &mut App<'_> {
                     ),
                 ]))
                 .border_style(Style::default().fg(self.colors.border_color))
-                .style(Style::default().bg(Color::Black));
+                .style(Style::default().bg(self.colors.background_color));
 
             let paragraph = Paragraph::new(help_text)
                 .block(block)
@@ -656,29 +658,29 @@ impl SelectedTab {
         let memory_information_header = Line::from(vec![
             Span::styled(
                 "Memory Information:",
-                Style::default().fg(app.colors.header_text),
+                Style::default().fg(app.colors.info_preamble),
             ),
             Span::raw("\n"),
         ]);
 
         let process_count = Line::from(vec![
-            Span::styled("Process Count: ", Style::default().fg(app.colors.info_text)),
+            Span::styled("Process Count: ", Style::default().fg(app.colors.info_preamble)),
             Span::styled(
                 process_count.to_string(),
                 Style::default().fg(app.colors.default_text),
             ),
         ]);
 
         let ets_count = Line::from(vec![
-            Span::styled("ETS Tables: ", Style::default().fg(app.colors.info_text)),
+            Span::styled("ETS Tables: ", Style::default().fg(app.colors.info_preamble)),
             Span::styled(
                 ets_count.to_string(),
                 Style::default().fg(app.colors.default_text),
             ),
         ]);
 
         let fn_count = Line::from(vec![
-            Span::styled("Funs: ", Style::default().fg(app.colors.info_text)),
+            Span::styled("Funs: ", Style::default().fg(app.colors.info_preamble)),
             Span::styled(
                 fn_count.to_string(),
                 Style::default().fg(app.colors.default_text),
@@ -753,7 +755,7 @@ impl SelectedTab {
                     InfoOrIndex::Info(ref proc_info) => {
                         let proc_info: &types::ProcInfo = proc_info;
                         active_proc_info = proc_info.clone();
-                        active_proc_info.format_as_ratatui_text()
+                        active_proc_info.format_as_ratatui_text(&app.colors)
                     }
                     InfoOrIndex::Index(_) => {
                         Text::raw(format!("Index for pid: {:?}", selected_pid).to_string())
@@ -832,7 +834,7 @@ impl SelectedTab {
                     InfoOrIndex::Info(ref proc_info) => {
                         let proc_info: &types::ProcInfo = proc_info;
                         active_proc_info = proc_info.clone();
-                        active_proc_info.format_as_ratatui_text()
+                        active_proc_info.format_as_ratatui_text(&app.colors)
                     }
                     InfoOrIndex::Index(_) => {
                         Text::raw(format!("Index for pid: {:?}", selected_pid).to_string())

src/config.rs

@@ -22,12 +22,16 @@ pub struct CommonColors {
     pub header_text: Color,
     pub header_background: Color,
     pub highlight_background: Color, // e.g., for selected items background
-    pub error_text: Color,
-    pub warning_text: Color,
+    pub info_preamble: Color,
     pub info_text: Color,
-    // Add other commonly used colors if needed
+
     pub border_color: Color,
     pub title_color: Color,
+
+    pub alt_color_1: Color,
+    pub alt_color_2: Color,
+    pub alt_color_3: Color,
+    pub background_color: Color
 }
 
 impl Default for CommonColors {
@@ -39,11 +43,14 @@ impl Default for CommonColors {
             header_text: Color::White,
             header_background: Color::Blue,
             highlight_background: Color::DarkGray,
-            error_text: Color::Red,
-            warning_text: Color::Yellow,
-            info_text: Color::Cyan,
+            info_preamble: Color::Yellow,
+            info_text: Color::White,
             border_color: Color::Gray,
             title_color: Color::White,
+            alt_color_1: Color::Blue,
+            alt_color_2: Color::Magenta,
+            alt_color_3: Color::Red,
+            background_color: Color::Black,
         }
     }
 }

src/main.rs

@@ -21,7 +21,10 @@ use crate::{
     event::{Event, EventHandler},
     handler::handle_key_events,
     tui::Tui,
+    config::CommonColors,
 };
+use ratatui::style::Color;
+
 
 pub mod app;
 pub mod config;
@@ -44,6 +47,10 @@ struct Args {
     /// Path to the crash dump
     #[arg(required = true)]
     filepath: String,
+
+    /// Turns on light mode
+    #[clap(long, short, action)]
+    light_mode: bool,
 }
 
 #[tokio::main]
@@ -52,7 +59,28 @@ async fn main() -> AppResult<()> {
 
     if args.action == "tui" {
         // Create an application.
-        let mut app = App::new(args.filepath);
+
+        let colors = if !args.light_mode {
+            CommonColors::default()
+        } else {
+            CommonColors {
+                default_text: Color::Black,
+                highlight_text: Color::Gray,
+                header_text: Color::Black,
+                header_background: Color::Yellow,
+                highlight_background: Color::DarkGray,
+                info_preamble: Color::Blue,
+                info_text: Color::Cyan,
+                border_color: Color::Gray,
+                title_color: Color::Black,
+                alt_color_1: Color::Blue,
+                alt_color_2: Color::Magenta,
+                alt_color_3: Color::Red,
+                background_color: Color::White,
+            }
+        };
+
+        let mut app = App::new(args.filepath, Some(colors));
 
         // Initialize the terminal user interface.
         let backend = CrosstermBackend::new(io::stdout());

src/parser/parser.rs

@@ -17,6 +17,7 @@
 //! information from the crash dump.
 
 use crate::parser::*;
+use crate::config::CommonColors;
 use dashmap::DashMap;
 use grep::{
     regex::RegexMatcher,
@@ -222,14 +223,13 @@ impl CDParser {
         crash_dump: &'a CrashDump,
         filepath: &String,
         id: &str,
+        colors: &CommonColors,
     ) -> io::Result<Text<'a>> {
         // seeks to the file using the byteoffsets in the dict and just retrives the raw data
-        //println!("{:?}", filepath);
-        // println!("{:?}, {:#?}", id, crash_dump.processes_heap.get(id));
         if let Some(process_heap_ref) = crash_dump.processes_heap.get(id) {
             if let InfoOrIndex::Index(ref heap_index) = *process_heap_ref.value() {
                 let file = OpenOptions::new().read(true).open(filepath)?;
-                return crash_dump.load_proc_heap(heap_index, &file);
+                return crash_dump.load_proc_heap(heap_index, &file, colors);
             }
         }
         Ok(Text::from(""))
@@ -240,12 +240,13 @@ impl CDParser {
         crash_dump: &'a CrashDump,
         filepath: &String,
         id: &str,
+        colors: &CommonColors,
     ) -> io::Result<Text<'a>> {
         if let Some(stack_info_ref) = crash_dump.processes_stack.get(id) {
             if let InfoOrIndex::Index(ref stack_index) = *stack_info_ref.value() {
                 let file = OpenOptions::new().read(true).open(filepath)?;
 
-                return crash_dump.load_proc_stack(stack_index, &file);
+                return crash_dump.load_proc_stack(stack_index, &file, colors);
             }
         }
         Ok(Text::from(""))
@@ -256,12 +257,13 @@ impl CDParser {
         crash_dump: &'a CrashDump,
         filepath: &String,
         id: &str,
+        colors: &CommonColors,
     ) -> io::Result<Text<'a>> {
         if let Some(mq_index_ref) = crash_dump.processes_messages.get(id) {
             if let InfoOrIndex::Index(ref mq_index) = *mq_index_ref.value() {
                 let file = OpenOptions::new().read(true).open(filepath)?;
 
-                return crash_dump.load_proc_message_queue(mq_index, &file);
+                return crash_dump.load_proc_message_queue(mq_index, &file, colors);
             }
         }