Working out macro add/edit prompt, and a macro format

Author: nullstalgia

Cargo.lock

@@ -15,6 +15,7 @@ ansi-to-tui = { git = "https://github.com/nullstalgia/ansi-to-tui", branch = "lo
 arboard = "3.4.1"
 arc-swap = "1.7.1"
 better-panic = "0.3.0"
+bstr = "1.12.0"
 chrono = "0.4.39"
 color-eyre = "0.6.3"
 compact_str = "0.9.0"
@@ -25,6 +26,7 @@ enum-rotate = "0.1.1"
 # enum_rotate = { path = "../enum-rotate" }
 espflash = { version = "3.3.0", optional = true, features = ["serialport"] }
 fs-err = "3.1.0"
+hex = "0.4.3"
 human-panic = "2.0.2"
 # int-enum = { git = "https://github.com/nullstalgia/int-enum-rs", branch = "feat/colors-and-discriminators" }
 int-enum = "1.2.0"

Cargo.toml

@@ -0,0 +1,8 @@
+// pub struct LoggingHandle {
+//     tx,
+// }
+
+// struct LoggingWorker {
+//     rx,
+//     path: PathBuf,
+// }

src/app.rs

@@ -1,4 +1,5 @@
 use std::{
+    borrow::Cow,
     collections::{BTreeSet, HashMap},
     fmt,
 };
@@ -19,15 +20,14 @@ mod macro_ref;
 mod tui;
 
 pub use macro_ref::MacroRef;
-pub use tui::MacroEditing;
+pub use tui::{MacroEditSelected, MacroEditing};
 
 #[derive(Debug)]
 #[repr(u8)]
 pub enum MacrosPrompt {
     None,
-    AddEdit(MacroEditing),
     Delete,
-    Keybind,
+    AddEdit(MacroEditing),
 }
 
 pub enum MacroCategorySelection<'a> {
@@ -256,7 +256,7 @@ impl Macros {
     // }
 }
 
-#[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Macro {
     pub title: CompactString,
     pub category: Option<CompactString>,
@@ -265,6 +265,26 @@ pub struct Macro {
     // preview_hidden: bool,
 }
 
+impl Macro {
+    pub fn as_str(&self) -> Option<Cow<'_, str>> {
+        match &self.content {
+            MacroContent::Empty => None,
+            MacroContent::Text(text) => Some(Cow::Borrowed(text.as_str())),
+            MacroContent::Bytes { content, .. } => match std::str::from_utf8(content) {
+                Ok(s) => Some(Cow::Borrowed(s)),
+                Err(_) => None,
+            },
+        }
+    }
+    pub fn as_bytes(&self) -> Option<&[u8]> {
+        match &self.content {
+            MacroContent::Empty => None,
+            MacroContent::Bytes { content, .. } => Some(&content),
+            MacroContent::Text(text) => Some(text.as_bytes()),
+        }
+    }
+}
+
 impl fmt::Display for Macro {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match &self.category {
@@ -301,7 +321,7 @@ impl fmt::Display for Macro {
 //     }
 // }
 
-#[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum MacroContent {
     #[default]
     Empty,
@@ -316,9 +336,9 @@ impl MacroContent {
     fn new_bytes(content: Vec<u8>) -> Self {
         let hex_string = content
             .iter()
-            .map(|b| format!("0x{:02X}", b))
+            .map(|b| format!("\\x{:02X}", b))
             .collect::<Vec<_>>()
-            .join(" ");
+            .join("");
         Self::Bytes {
             content,
             preview: hex_string,