feat: add rich text to handle invisible character and ANSI color codes

matheuswhite · Feb 16, 2024 · 65cea97 · 65cea97
1 parent 50baaad
commit 65cea97
Show file tree

Hide file tree

Showing 6 changed files with 408 additions and 196 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -23,6 +23,7 @@ mod messages;
 mod plugin;
 mod plugin_installer;
 mod plugin_manager;
+mod rich_string;
 mod serial;
 mod text;
 

diff --git a/src/messages.rs b/src/messages.rs
@@ -1,3 +1,4 @@
+use crate::rich_string::RichText;
 use crate::text::ViewData;
 use chrono::{DateTime, Local};
 use tui::style::Color;
@@ -24,7 +25,7 @@ pub enum UserTxData {
 pub enum SerialRxData {
     RxData {
         timestamp: DateTime<Local>,
-        content: String,
+        content: Vec<u8>,
     },
     TxData {
         timestamp: DateTime<Local>,
@@ -67,22 +68,28 @@ impl Into<ViewData> for SerialRxData {
     fn into(self) -> ViewData {
         match self {
             SerialRxData::RxData { timestamp, content } => {
-                ViewData::new(timestamp, content, Color::Reset, Color::Reset)
+                RichText::new(content, Color::Reset, Color::Reset)
+                    .decode_ansi_color()
+                    .highlight_invisible()
+                    .into_view_data(timestamp)
             }
             SerialRxData::TxData {
                 timestamp,
                 content,
                 is_successful,
             } => {
                 if is_successful {
-                    ViewData::new(timestamp, content, Color::Black, Color::LightCyan)
+                    RichText::from_string(content, Color::Black, Color::LightCyan)
+                        .highlight_invisible()
+                        .into_view_data(timestamp)
                 } else {
-                    ViewData::new(
-                        timestamp,
+                    RichText::from_string(
                         format!("Cannot send \"{}\"", content),
                         Color::White,
                         Color::LightRed,
                     )
+                    .highlight_invisible()
+                    .into_view_data(timestamp)
                 }
             }
             SerialRxData::Command {
@@ -92,19 +99,21 @@ impl Into<ViewData> for SerialRxData {
                 is_successful,
             } => {
                 if is_successful {
-                    ViewData::new(
-                        timestamp,
+                    RichText::from_string(
                         format!("</{}> {}", command_name, content),
                         Color::Black,
                         Color::LightGreen,
                     )
+                    .highlight_invisible()
+                    .into_view_data(timestamp)
                 } else {
-                    ViewData::new(
-                        timestamp,
+                    RichText::from_string(
                         format!("Cannot send </{}>", command_name),
                         Color::White,
                         Color::LightRed,
                     )
+                    .highlight_invisible()
+                    .into_view_data(timestamp)
                 }
             }
             SerialRxData::HexString {
@@ -113,19 +122,17 @@ impl Into<ViewData> for SerialRxData {
                 is_successful,
             } => {
                 if is_successful {
-                    ViewData::new(
-                        timestamp,
-                        format!("{:02x?}", &content),
-                        Color::Black,
-                        Color::Yellow,
-                    )
+                    RichText::from_string(format!("{:02x?}", &content), Color::Black, Color::Yellow)
+                        .highlight_invisible()
+                        .into_view_data(timestamp)
                 } else {
-                    ViewData::new(
-                        timestamp,
+                    RichText::from_string(
                         format!("Cannot send {:02x?}", &content),
                         Color::White,
                         Color::LightRed,
                     )
+                    .highlight_invisible()
+                    .into_view_data(timestamp)
                 }
             }
             SerialRxData::Plugin {
@@ -135,19 +142,21 @@ impl Into<ViewData> for SerialRxData {
                 is_successful,
             } => {
                 if is_successful {
-                    ViewData::new(
-                        timestamp,
+                    RichText::from_string(
                         format!(" [{plugin_name}] {content} "),
                         Color::Black,
                         Color::White,
                     )
+                    .highlight_invisible()
+                    .into_view_data(timestamp)
                 } else {
-                    ViewData::new(
-                        timestamp,
+                    RichText::from_string(
                         format!(" [{plugin_name}] {content} "),
                         Color::White,
                         Color::Red,
                     )
+                    .highlight_invisible()
+                    .into_view_data(timestamp)
                 }
             }
             SerialRxData::PluginSerialTx {
@@ -157,19 +166,21 @@ impl Into<ViewData> for SerialRxData {
                 is_successful,
             } => {
                 if is_successful {
-                    ViewData::new(
-                        timestamp,
+                    RichText::from_string(
                         format!(" [{plugin_name}] => {:02x?} ", content),
                         Color::Black,
                         Color::White,
                     )
+                    .highlight_invisible()
+                    .into_view_data(timestamp)
                 } else {
-                    ViewData::new(
-                        timestamp,
+                    RichText::from_string(
                         format!(" [{plugin_name}] => Fail to send {:02x?} ", content),
                         Color::White,
                         Color::Red,
                     )
+                    .highlight_invisible()
+                    .into_view_data(timestamp)
                 }
             }
         }

diff --git a/src/plugin_manager.rs b/src/plugin_manager.rs
@@ -164,7 +164,7 @@ impl PluginManager {
                 continue;
             };
 
-            let serial_rx_call = plugin.serial_rx_call(line.as_bytes().to_vec());
+            let serial_rx_call = plugin.serial_rx_call(line.clone());
             let plugin_name = plugin.name().to_string();
             self.serial_rx_tx
                 .send((plugin_name, serial_rx_call))