added initial support for fetching GPU information

macchina.toml

@@ -1,20 +1,16 @@
 # Disables color.
-# Conflicts with: color, separator_color
 no_color = false 
 
 # Hides the separator.
-# Conflicts with: separator_color
 no_separator = false 
 
 # Hides bar delimiters
 no_bar_delimiter = true 
 
 # Hides the title of the box surrounding system information
-# Conflicts with: box_title
 no_title = false 
 
 # Disables the box surrounding system information.
-# Conflicts with: box_title
 no_box = false 
 
 # Disables ASCII art
@@ -27,7 +23,6 @@ palette = true
 bar = true
 
 # Prefer small ASCII variant.
-# Conflicts with: no_ascii
 small_ascii = false 
 
 # Randomizes the color of the keys each time your run the program 
@@ -37,7 +32,6 @@ random_color = false
 random_sep_color = false
 
 # Specify a color for the keys.
-# Conflicts with: no_color
 # Accepted values (case-sensitive):
 #   - White
 #   - Black
@@ -50,7 +44,6 @@ random_sep_color = false
 color = "Blue"
 
 # Specify a color for the separator.
-# Conflicts with: no_color
 # Accepted values (case-sensitive):
 #   - White
 #   - Black
@@ -69,15 +62,12 @@ short_uptime = true
 long_shell = false 
 
 # Specify the title of the box
-# Conflicts with: no_title.
 box_title = " Macchina "
 
 # Specify the horizontal inner margin value of the box surrounding system information.
-# Conflicts with: no_box
 box_inner_margin_x = 1
 
 # Specify the vertical inner margin value of the box surrounding system information.
-# Conflicts with: no_box
 box_inner_margin_y = 0
 
 # Specify the theme to use
@@ -111,8 +101,9 @@ theme = "Beryllium"
 #   - Terminal
 #   - Shell
 #   - Uptime
-#   - Processor
-#   - ProcessorUsage
+#   - CPU
+#   - GPU
+#   - CPULoad
 #   - Memory
 #   - Battery
 # Example:
@@ -134,8 +125,9 @@ hide = []
 #   - Terminal
 #   - Shell
 #   - Uptime
-#   - Processor
-#   - ProcessorUsage
+#   - CPU
+#   - GPU
+#   - CPULoad
 #   - Memory
 #   - Battery
 # Example:

src/cli.rs

@@ -260,28 +260,22 @@ impl Default for Opt {
             no_box: false,
 
             color: None,
-            bar: false,
-
             separator_color: None,
             random_color: false,
             random_sep_color: false,
 
+            custom_ascii: None,
+            custom_ascii_color: None,
+            small_ascii: false,
+
+            bar: false,
             hide: None,
             show_only: None,
-
             doctor: false,
-
             short_uptime: false,
             long_shell: false,
-
             theme: None,
-
             box_title: None,
-
-            custom_ascii: None,
-            custom_ascii_color: None,
-            small_ascii: false,
-
             box_inner_margin_x: 1,
             box_inner_margin_y: 0,
             export_config: false,

src/config.rs

@@ -124,22 +124,6 @@ impl Opt {
             conflicts.push("hide and show_only");
         }
 
-        if self.separator_color.is_some() && self.no_separator {
-            conflicts.push("separator_color and no_separator");
-        }
-
-        if self.color.is_some() && self.no_color {
-            conflicts.push("color and no_color");
-        }
-
-        if self.separator_color.is_some() && self.no_color {
-            conflicts.push("separator_color and no_color");
-        }
-
-        if self.box_title.is_some() && self.no_title {
-            conflicts.push("box_title and no_title");
-        }
-
         conflicts
     }
 }

src/data/mod.rs

@@ -26,8 +26,9 @@ arg_enum! {
         Shell,
         Terminal,
         Uptime,
-        Processor,
-        ProcessorUsage,
+        CPU,
+        GPU,
+        CPULoad,
         Memory,
         Battery,
         LocalIP,
@@ -257,40 +258,47 @@ pub fn get_all_readouts<'a>(
         }
     }
 
-    if should_display.contains(&ReadoutKey::Processor) {
+    if should_display.contains(&ReadoutKey::CPU) {
         match (
             general_readout.cpu_model_name(),
             general_readout.cpu_cores(),
         ) {
-            (Ok(m), Ok(c)) => {
-                readout_values.push(Readout::new(ReadoutKey::Processor, format_cpu(&m, c)))
-            }
-            (Ok(m), _) => {
-                readout_values.push(Readout::new(ReadoutKey::Processor, format_cpu_only(&m)))
+            (Ok(m), Ok(c)) => readout_values.push(Readout::new(ReadoutKey::CPU, format_cpu(&m, c))),
+            (Ok(m), _) => readout_values.push(Readout::new(ReadoutKey::CPU, format_cpu_only(&m))),
+            (Err(e), _) => readout_values.push(Readout::new_err(ReadoutKey::CPU, e)),
+        }
+    }
+
+    if should_display.contains(&ReadoutKey::GPU) {
+        match general_readout.gpus() {
+            Ok(gpus) => {
+                for g in gpus {
+                    readout_values.push(Readout::new(ReadoutKey::GPU, g));
+                }
             }
-            (Err(e), _) => readout_values.push(Readout::new_err(ReadoutKey::Processor, e)),
+
+            Err(e) => readout_values.push(Readout::new_err(ReadoutKey::Uptime, e)),
         }
     }
 
-    if should_display.contains(&ReadoutKey::ProcessorUsage) {
+    if should_display.contains(&ReadoutKey::CPULoad) {
         match (general_readout.cpu_usage(), opt.bar, tts) {
             (Ok(u), true, false) => {
                 if u > 100 {
                     readout_values.push(Readout::new(
-                        ReadoutKey::ProcessorUsage,
+                        ReadoutKey::CPULoad,
                         create_bar(theme, crate::bars::num_to_blocks(100_u8)),
                     ))
                 }
                 readout_values.push(Readout::new(
-                    ReadoutKey::ProcessorUsage,
+                    ReadoutKey::CPULoad,
                     create_bar(theme, crate::bars::num_to_blocks(u as u8)),
                 ))
             }
-            (Ok(u), _, _) => readout_values.push(Readout::new(
-                ReadoutKey::ProcessorUsage,
-                format_cpu_usage(u),
-            )),
-            (Err(e), _, _) => readout_values.push(Readout::new_err(ReadoutKey::ProcessorUsage, e)),
+            (Ok(u), _, _) => {
+                readout_values.push(Readout::new(ReadoutKey::CPULoad, format_cpu_usage(u)))
+            }
+            (Err(e), _, _) => readout_values.push(Readout::new_err(ReadoutKey::CPULoad, e)),
         }
     }
 

src/main.rs

@@ -33,7 +33,7 @@ use tui::buffer::{Buffer, Cell};
 use tui::layout::{Margin, Rect};
 use tui::style::Color;
 use tui::text::Text;
-use tui::widgets::{Block, BorderType, Borders, Paragraph, Widget};
+use tui::widgets::{Block, BorderType, Borders, Paragraph, Widget, Wrap};
 use unicode_width::UnicodeWidthStr;
 
 fn create_backend() -> CrosstermBackend<Stdout> {
@@ -64,7 +64,9 @@ fn draw_ascii(ascii: Text<'static>, tmp_buffer: &mut Buffer) -> Rect {
         height: ascii.height() as u16,
     };
 
-    Paragraph::new(ascii).render(ascii_rect, tmp_buffer);
+    Paragraph::new(ascii)
+        .wrap(Wrap { trim: false })
+        .render(ascii_rect, tmp_buffer);
     ascii_rect
 }
 

src/theme.rs

@@ -77,12 +77,17 @@ impl ReadoutKey {
                 values.insert(&AbbreviationType::Alternative, "Upt");
                 values.insert(&AbbreviationType::Long, "Uptime");
             }
-            ReadoutKey::Processor => {
+            ReadoutKey::CPU => {
                 values.insert(&AbbreviationType::Classic, "CPU");
                 values.insert(&AbbreviationType::Alternative, "Cpu");
                 values.insert(&AbbreviationType::Long, "Processor");
             }
-            ReadoutKey::ProcessorUsage => {
+            ReadoutKey::GPU => {
+                values.insert(&AbbreviationType::Classic, "GPU");
+                values.insert(&AbbreviationType::Alternative, "Gpu");
+                values.insert(&AbbreviationType::Long, "Graphics Processor");
+            }
+            ReadoutKey::CPULoad => {
                 values.insert(&AbbreviationType::Classic, "CPU%");
                 values.insert(&AbbreviationType::Alternative, "Cp%");
                 values.insert(&AbbreviationType::Long, "Processor Usage");