Skeleton of Macro editor, tweaks to notifications

Author: nullstalgia

Cargo.lock

@@ -46,6 +46,7 @@ strum = { version = "0.27", features = ["derive"] }
 takeable = "0.2.2"
 textwrap = "0.16.2"
 thiserror = "2.0.12"
+tinyvec = { version = "1.9.0", features = ["std"] }
 toml = "0.8.21"
 tracing = { version = "0.1.41", features = ["log"] }
 tracing-appender = "0.2.3"

Cargo.toml

@@ -1,13 +1,14 @@
 use std::fmt;
 
+use compact_str::{CompactString, ToCompactString, format_compact};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 use super::Macro;
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct MacroRef {
-    pub category: Option<String>,
-    pub title: String,
+    pub category: Option<CompactString>,
+    pub title: CompactString,
 }
 
 impl From<&Macro> for MacroRef {
@@ -63,11 +64,11 @@ impl<'de> Deserialize<'de> for MacroRef {
 
         let (category, title) = match parts.len() {
             2 => (
-                Some(parts[0].trim().to_string()),
-                parts[1].trim().to_string(),
+                Some(parts[0].trim().to_compact_string()),
+                parts[1].trim().to_compact_string(),
             ),
-            1 => (None, parts[0].trim().to_string()),
-            _ => (None, String::new()),
+            1 => (None, parts[0].trim().to_compact_string()),
+            _ => return Err(serde::de::Error::custom("invalid format for MacroRef")),
         };
 
         Ok(MacroRef { category, title })
@@ -80,7 +81,7 @@ impl Serialize for MacroRef {
         S: Serializer,
     {
         let s = if let Some(ref cat) = self.category {
-            format!("{}|{}", cat, self.title)
+            format_compact!("{}|{}", cat, self.title)
         } else {
             self.title.clone()
         };

src/app.rs

@@ -3,6 +3,7 @@ use std::{
     fmt,
 };
 
+use compact_str::CompactString;
 use crokey::KeyCombination;
 use ratatui::{
     layout::Constraint,
@@ -15,13 +16,16 @@ use tui_input::Input;
 use crate::{keybinds::Keybinds, tui::single_line_selector::SingleLineSelectorState};
 
 mod macro_ref;
+mod tui;
+
 pub use macro_ref::MacroRef;
+pub use tui::MacroEditing;
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug)]
 #[repr(u8)]
 pub enum MacrosPrompt {
     None,
-    Create,
+    AddEdit(MacroEditing),
     Delete,
     Keybind,
 }
@@ -34,14 +38,17 @@ pub enum MacroCategorySelection<'a> {
     Category(&'a str),
 }
 
+// TODO search when typing
+
 pub struct Macros {
     pub all: BTreeSet<Macro>,
 
     pub ui_state: MacrosPrompt,
     // ["All Bytes", "All Strings", "All Macros", "OpenShock"]
     //     Start here, at user's first category.  ^
     pub categories_selector: SingleLineSelectorState,
-    pub input: Input,
+    // TODO search
+    pub search_input: Input,
     // pub scrollbar_state: ScrollbarState,
     // // maybe just take from macros
     // pub categories: BTreeSet<String>,
@@ -84,7 +91,7 @@ impl Macros {
             all: test_macros,
             // tx_queue: Vec::new(),
             ui_state: MacrosPrompt::None,
-            input: Input::default(),
+            search_input: Input::default(),
             categories_selector: SingleLineSelectorState::new().with_selected(2),
             // categories: BTreeSet::new(),
         }
@@ -240,12 +247,19 @@ impl Macros {
         // let macro_binding = self.all.iter().find(|d| macro_ref.eq_macro(d)).unwrap();
         // self.all.remove(macro_binding);
     }
+    // pub fn begin_editing(&mut self, macro_ref: &MacroRef) {
+    //     self.ui_state = MacrosPrompt::AddEdit(MacroEditing {
+    //         inner_ref: Some(macro_ref.clone()),
+    //         ..Default::default()
+    //     });
+
+    // }
 }
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Macro {
-    pub title: String,
-    pub category: Option<String>,
+    pub title: CompactString,
+    pub category: Option<CompactString>,
     // pub keybinding: Option<KeyCombination>,
     pub content: MacroContent,
     // preview_hidden: bool,
@@ -287,11 +301,15 @@ impl fmt::Display for Macro {
 //     }
 // }
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
 pub enum MacroContent {
+    #[default]
     Empty,
     Text(String),
-    Bytes { content: Vec<u8>, preview: String },
+    Bytes {
+        content: Vec<u8>,
+        preview: String,
+    },
 }
 
 impl MacroContent {