Merge pull request #444 from Nukesor/comfy-table-update

Comfy table update

.github/workflows/coverage.yml

@@ -11,6 +11,9 @@ on:
       - "**/Cargo.toml"
       - "**/Cargo.lock"
   pull_request:
+    branches:
+      - main
+      - development
     paths:
       - ".github/**/*"
       - "**.rs"
@@ -26,12 +29,9 @@ jobs:
       matrix:
         target:
           - x86_64-unknown-linux-gnu
-          - x86_64-apple-darwin
         include:
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-          - os: macos-latest
-            target: x86_64-apple-darwin
 
     steps:
       - name: Checkout code

.github/workflows/lint.yml

@@ -11,6 +11,9 @@ on:
       - "**/Cargo.toml"
       - "**/Cargo.lock"
   pull_request:
+    branches:
+      - main
+      - development
     paths:
       - ".github/**/*"
       - "**.rs"

.github/workflows/test.yml

@@ -11,6 +11,9 @@ on:
       - "**/Cargo.toml"
       - "**/Cargo.lock"
   pull_request:
+    branches:
+      - main
+      - development
     paths:
       - ".github/**/*"
       - "**.rs"

pueue/Cargo.toml

@@ -21,7 +21,7 @@ anyhow = "1.0"
 chrono-english = "0.1"
 clap = { version = "4.3", features = ["derive", "cargo", "help"] }
 clap_complete = "4.3"
-comfy-table = "6.2"
+comfy-table = "7"
 crossterm = { version = "0.26", default-features = false }
 ctrlc = { version = "3", features = ["termination"] }
 handlebars = "4.3"

pueue/src/client/display/group.rs

@@ -1,4 +1,4 @@
-use comfy_table::{Attribute, Color};
+use crossterm::style::{Attribute, Color};
 
 use pueue_lib::{
     network::message::GroupResponseMessage,

pueue/src/client/display/log/local.rs

@@ -1,7 +1,7 @@
 use std::fs::File;
 use std::io::{self, Stdout};
 
-use comfy_table::*;
+use crossterm::style::{Attribute, Color};
 
 use pueue_lib::log::{get_log_file_handle, seek_to_last_lines};
 use pueue_lib::settings::Settings;

pueue/src/client/display/log/mod.rs

@@ -1,6 +1,7 @@
 use std::collections::BTreeMap;
 
-use comfy_table::*;
+use comfy_table::{Attribute as ComfyAttribute, Cell, CellAlignment, Table};
+use crossterm::style::Color;
 
 use pueue_lib::network::message::TaskLogMessage;
 use pueue_lib::settings::Settings;
@@ -129,7 +130,11 @@ fn print_log(
 /// Print some information about a task, which is displayed on top of the task's log output.
 fn print_task_info(task: &Task, style: &OutputStyle) {
     // Print task id and exit code.
-    let task_cell = style.styled_cell(format!("Task {}: ", task.id), None, Some(Attribute::Bold));
+    let task_cell = style.styled_cell(
+        format!("Task {}: ", task.id),
+        None,
+        Some(ComfyAttribute::Bold),
+    );
 
     let (exit_status, color) = match &task.status {
         TaskStatus::Paused => ("paused".into(), Color::White),
@@ -167,30 +172,30 @@ fn print_task_info(task: &Task, style: &OutputStyle) {
 
     // Command and path
     table.add_row(vec![
-        style.styled_cell("Command:", None, Some(Attribute::Bold)),
+        style.styled_cell("Command:", None, Some(ComfyAttribute::Bold)),
         Cell::new(&task.command),
     ]);
     table.add_row(vec![
-        style.styled_cell("Path:", None, Some(Attribute::Bold)),
+        style.styled_cell("Path:", None, Some(ComfyAttribute::Bold)),
         Cell::new(task.path.to_string_lossy()),
     ]);
     if let Some(label) = &task.label {
         table.add_row(vec![
-            style.styled_cell("Label:", None, Some(Attribute::Bold)),
+            style.styled_cell("Label:", None, Some(ComfyAttribute::Bold)),
             Cell::new(label),
         ]);
     }
 
     // Start and end time
     if let Some(start) = task.start {
         table.add_row(vec![
-            style.styled_cell("Start:", None, Some(Attribute::Bold)),
+            style.styled_cell("Start:", None, Some(ComfyAttribute::Bold)),
             Cell::new(start.to_rfc2822()),
         ]);
     }
     if let Some(end) = task.end {
         table.add_row(vec![
-            style.styled_cell("End:", None, Some(Attribute::Bold)),
+            style.styled_cell("End:", None, Some(ComfyAttribute::Bold)),
             Cell::new(end.to_rfc2822()),
         ]);
     }

pueue/src/client/display/log/remote.rs

@@ -1,7 +1,7 @@
 use std::io;
 
 use anyhow::Result;
-use comfy_table::*;
+use crossterm::style::{Attribute, Color};
 use snap::read::FrameDecoder;
 
 use pueue_lib::network::message::TaskLogMessage;

pueue/src/client/display/style.rs

@@ -1,49 +1,58 @@
 use pueue_lib::settings::Settings;
 
-use comfy_table::Cell;
+use comfy_table::{Attribute as ComfyAttribute, Cell, Color as ComfyColor};
 use crossterm::style::{style, Attribute, Color, Stylize};
 
 /// OutputStyle wrapper for actual colors depending on settings
 /// - Enables styles if color mode is 'always', or if color mode is 'auto' and output is a tty.
 /// - Using dark colors if dark_mode is enabled
 #[derive(Debug, Clone)]
 pub struct OutputStyle {
-    /// whether or not ANSI styling is enabled
+    /// Whether or not ANSI styling is enabled
     pub enabled: bool,
-    /// red color
-    red: Color,
-    /// green color
-    green: Color,
-    /// yellow color
-    yellow: Color,
+    /// Whether dark mode is enabled.
+    pub dark_mode: bool,
 }
 
 impl OutputStyle {
     /// init color-scheme depending on settings
     pub const fn new(settings: &Settings, enabled: bool) -> Self {
-        if settings.client.dark_mode {
-            Self {
-                enabled,
-                green: Color::DarkGreen,
-                red: Color::DarkRed,
-                yellow: Color::DarkYellow,
+        Self {
+            enabled,
+            dark_mode: settings.client.dark_mode,
+        }
+    }
+
+    /// Return the desired crossterm color depending on whether we're in dark mode or not.
+    fn map_color(&self, color: Color) -> Color {
+        if self.dark_mode {
+            match color {
+                Color::Green => Color::DarkGreen,
+                Color::Red => Color::DarkRed,
+                Color::Yellow => Color::DarkYellow,
+                _ => color,
             }
         } else {
-            Self {
-                enabled,
-                green: Color::Green,
-                red: Color::Red,
-                yellow: Color::Yellow,
-            }
+            color
         }
     }
 
-    fn map_color(&self, color: Color) -> Color {
+    /// Return the desired comfy_table color depending on whether we're in dark mode or not.
+    fn map_comfy_color(&self, color: Color) -> ComfyColor {
+        if self.dark_mode {
+            return match color {
+                Color::Green => ComfyColor::DarkGreen,
+                Color::Red => ComfyColor::DarkRed,
+                Color::Yellow => ComfyColor::DarkYellow,
+                _ => ComfyColor::White,
+            };
+        }
+
         match color {
-            Color::Green => self.green,
-            Color::Red => self.red,
-            Color::Yellow => self.yellow,
-            _ => color,
+            Color::Green => ComfyColor::Green,
+            Color::Red => ComfyColor::Red,
+            Color::Yellow => ComfyColor::Yellow,
+            _ => ComfyColor::White,
         }
     }
 
@@ -80,7 +89,7 @@ impl OutputStyle {
         &self,
         text: T,
         color: Option<Color>,
-        attribute: Option<Attribute>,
+        attribute: Option<ComfyAttribute>,
     ) -> Cell {
         let mut cell = Cell::new(text.to_string());
         // Styling disabled
@@ -89,7 +98,7 @@ impl OutputStyle {
         }
 
         if let Some(color) = color {
-            cell = cell.fg(self.map_color(color));
+            cell = cell.fg(self.map_comfy_color(color));
         }
         if let Some(attribute) = attribute {
             cell = cell.add_attribute(attribute);

pueue/src/client/display/table_builder.rs

@@ -1,6 +1,7 @@
 use chrono::Duration;
 use comfy_table::presets::UTF8_HORIZONTAL_ONLY;
-use comfy_table::*;
+use comfy_table::{Cell, ContentArrangement, Row, Table};
+use crossterm::style::Color;
 
 use pueue_lib::settings::Settings;
 use pueue_lib::task::{Task, TaskResult, TaskStatus};