fix: fixes plugin serial tx presentation, richtext highlight backgrou…

…nd and the presentation of user data and command
matheuswhite · Feb 21, 2024 · d4add34 · d4add34
1 parent 65cea97
commit d4add34
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 27 deletions.
diff --git a/src/messages.rs b/src/messages.rs
@@ -167,15 +167,18 @@ impl Into<ViewData> for SerialRxData {
             } => {
                 if is_successful {
                     RichText::from_string(
-                        format!(" [{plugin_name}] => {:02x?} ", content),
+                        format!(" [{plugin_name}] => {} ", String::from_utf8_lossy(&content)),
                         Color::Black,
                         Color::White,
                     )
                     .highlight_invisible()
                     .into_view_data(timestamp)
                 } else {
                     RichText::from_string(
-                        format!(" [{plugin_name}] => Fail to send {:02x?} ", content),
+                        format!(
+                            " [{plugin_name}] => Fail to send {} ",
+                            String::from_utf8_lossy(&content)
+                        ),
                         Color::White,
                         Color::Red,
                     )

diff --git a/src/rich_string.rs b/src/rich_string.rs
@@ -72,7 +72,7 @@ impl RichTextWithInvisible {
         }
 
         let (fg, bg) = (rich_text.fg, rich_text.bg);
-        let (hl_fg, hl_bg) = Self::get_colors(rich_text.fg, rich_text.fg, true);
+        let (hl_fg, hl_bg) = Self::get_colors(rich_text.fg, rich_text.bg, true);
 
         let (buffer, state, acc) = rich_text.content.into_iter().fold(
             (vec![], State::None, vec![]),
@@ -93,7 +93,7 @@ impl RichTextWithInvisible {
                         )
                     } else {
                         (
-                            vec![],
+                            vec![byte],
                             State::Invisible,
                             acc.into_iter()
                                 .chain([RichText::new(buffer, rich_text.fg, rich_text.bg)])
@@ -104,7 +104,7 @@ impl RichTextWithInvisible {
                 State::Invisible => {
                     if Self::is_visible(byte) {
                         (
-                            vec![],
+                            vec![byte],
                             State::Visible,
                             acc.into_iter()
                                 .chain([RichText::new(Self::bytes_to_rich(buffer), hl_fg, hl_bg)])

diff --git a/src/serial.rs b/src/serial.rs
@@ -118,7 +118,9 @@ impl SerialIF {
                 match data_to_send {
                     UserTxData::Exit => break 'task,
                     UserTxData::Data { content } => {
-                        match serial.write(format!("{content}\r\n").as_bytes()) {
+                        let content = format!("{content}\r\n");
+
+                        match serial.write(content.as_bytes()) {
                             Ok(_) => {
                                 data_tx
                                     .send(SerialRxData::TxData {
@@ -142,28 +144,32 @@ impl SerialIF {
                     UserTxData::Command {
                         command_name,
                         content,
-                    } => match serial.write(format!("{content}\r\n").as_bytes()) {
-                        Ok(_) => {
-                            data_tx
-                                .send(SerialRxData::Command {
-                                    timestamp: Local::now(),
-                                    command_name,
-                                    content,
-                                    is_successful: true,
-                                })
-                                .expect("Cannot send command confirm");
-                        }
-                        Err(_) => {
-                            data_tx
-                                .send(SerialRxData::Command {
-                                    timestamp: Local::now(),
-                                    command_name,
-                                    content,
-                                    is_successful: false,
-                                })
-                                .expect("Cannot send command fail");
+                    } => {
+                        let content = format!("{content}\r\n");
+
+                        match serial.write(content.as_bytes()) {
+                            Ok(_) => {
+                                data_tx
+                                    .send(SerialRxData::Command {
+                                        timestamp: Local::now(),
+                                        command_name,
+                                        content,
+                                        is_successful: true,
+                                    })
+                                    .expect("Cannot send command confirm");
+                            }
+                            Err(_) => {
+                                data_tx
+                                    .send(SerialRxData::Command {
+                                        timestamp: Local::now(),
+                                        command_name,
+                                        content,
+                                        is_successful: false,
+                                    })
+                                    .expect("Cannot send command fail");
+                            }
                         }
-                    },
+                    }
                     UserTxData::HexString { content } => match serial.write(&content) {
                         Ok(_) => data_tx
                             .send(SerialRxData::HexString {