feat: print config errors for users

dj95 · May 25, 2024 · 4c7d7a3 · 4c7d7a3
1 parent 63b13dd
commit 4c7d7a3
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/plugin-dev-workspace.kdl b/plugin-dev-workspace.kdl
@@ -9,7 +9,7 @@ layout {
             format_center     "{command_0} {command_1} {command_git_branch} {command_3}"
             format_right      "{notifications}{swap_layout}{datetime}"
             format_space      "#[bg=#181825]"
-            format_precedence "lcq"
+            format_precedence "lcr"
 
             notification_format_unread "#[fg=#89B4FA,bg=#181825,blink]  #[fg=#89B4FA,bg=#181825] {message} "
             notification_format_no_notifications "#[fg=#89B4FA,bg=#181825,dim]   "

diff --git a/src/bin/zjstatus.rs b/src/bin/zjstatus.rs
@@ -27,6 +27,7 @@ struct State {
     userspace_configuration: BTreeMap<String, String>,
     module_config: config::ModuleConfig,
     widget_map: BTreeMap<String, Arc<dyn Widget>>,
+    err: Option<anyhow::Error>,
 }
 
 #[cfg(not(test))]
@@ -73,7 +74,13 @@ impl ZellijPlugin for State {
             EventType::RunCommandResult,
         ]);
 
-        self.module_config = ModuleConfig::new(&configuration);
+        self.module_config = match ModuleConfig::new(&configuration) {
+            Ok(mc) => mc,
+            Err(e) => {
+                self.err = Some(e);
+                return;
+            }
+        };
         self.widget_map = register_widgets(&configuration);
         self.userspace_configuration = configuration;
         self.pending_events = Vec::new();
@@ -147,6 +154,12 @@ impl ZellijPlugin for State {
             return;
         }
 
+        if let Some(err) = &self.err {
+            println!("Error: {:?}", err);
+
+            return;
+        }
+
         self.state.cols = cols;
 
         tracing::debug!("{:?}", self.state.mode.session_name);

diff --git a/src/config.rs b/src/config.rs
@@ -82,7 +82,7 @@ pub struct ModuleConfig {
 }
 
 impl ModuleConfig {
-    pub fn new(config: &BTreeMap<String, String>) -> Self {
+    pub fn new(config: &BTreeMap<String, String>) -> anyhow::Result<Self> {
         let format_space_config = match config.get("format_space") {
             Some(space_config) => space_config,
             None => "",
@@ -109,10 +109,19 @@ impl ModuleConfig {
         };
 
         let format_precedence = match config.get("format_precedence") {
-            Some(conf) => conf
-                .chars()
-                .map(|c| Part::from_str(&c.to_string()).expect("Invalid part"))
-                .collect(),
+            Some(conf) => {
+                let prec = conf
+                    .chars()
+                    .map(|c| Part::from_str(&c.to_string()))
+                    .collect();
+
+                match prec {
+                    Ok(prec) => prec,
+                    Err(e) => {
+                        anyhow::bail!("Invalid format_precedence: {}", e);
+                    }
+                }
+            }
             None => vec![Part::Left, Part::Center, Part::Right],
         };
 
@@ -121,7 +130,7 @@ impl ModuleConfig {
             None => BorderConfig::default(),
         };
 
-        Self {
+        Ok(Self {
             left_parts_config: left_parts_config.to_owned(),
             left_parts: parts_from_config(Some(&left_parts_config.to_owned())),
             center_parts_config: center_parts_config.to_owned(),
@@ -132,7 +141,7 @@ impl ModuleConfig {
             hide_frame_for_single_pane,
             border: border_config,
             format_precedence,
-        }
+        })
     }
 
     pub fn handle_mouse_action(