Merge pull request pierrechevalier83#30 from MaxVerevkin/main

better logging of errors
chovanecadam · Feb 20, 2022 · 5db330c · 5db330c
2 parents 3be1c4f + 81cfa0b
commit 5db330c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -148,16 +148,19 @@ fn main() -> Result<()> {
                 }
                 Err(error) => {
                     error!("{error}");
+                    error.chain().skip(1).for_each(|e| error!("because: {e}"));
                     error!("Failed to connect to WM. Will try again in 1 second");
                     sleep(Duration::from_secs(1));
                 }
             }
         };
 
         if let Err(error) = process_events(wm) {
-            error!("Error: {error}");
+            error!("{error}");
+            error.chain().skip(1).for_each(|e| error!("because: {e}"));
             error!("Couldn't process WM events. The WM might have been terminated");
-            info!("Attempting to reconnect to the WM");
+            info!("Attempting to reconnect to the WM in 1 second");
+            sleep(Duration::from_secs(1));
         }
     }
 }
diff --git a/src/window_manager.rs b/src/window_manager.rs
@@ -14,7 +14,8 @@ trait NodeExt {
 
 impl NodeExt for Node {
     fn is_workspace(&self) -> bool {
-        self.node_type == NodeType::Workspace
+        // `__i3_scratch` is a special workspace that connot be renamed, so we just skip it
+        self.name.as_deref() != Some("__i3_scratch") && self.node_type == NodeType::Workspace
     }
     fn is_window(&self) -> bool {
         matches!(self.node_type, NodeType::Con | NodeType::FloatingCon)
@@ -117,17 +118,8 @@ pub struct WindowManager {
 impl WindowManager {
     pub fn connect() -> Result<Self> {
         Ok(Self {
-            connection: Connection::new()
-                .map_err(|e| {
-                    log::error!("{e}");
-                    e
-                })
-                .context("Couldn't connect to WM")?,
+            connection: Connection::new().context("Couldn't connect to WM")?,
             events: Connection::new()
-                .map_err(|e| {
-                    log::error!("{e}");
-                    e
-                })
                 .context("Couldn't connect to WM")?
                 .subscribe(&[EventType::Window])
                 .context("Couldn't subscribe to events of type Window")?,
@@ -137,22 +129,18 @@ impl WindowManager {
     pub fn get_windows_in_each_workspace(&mut self) -> Result<BTreeMap<String, Vec<Window>>> {
         self.connection
             .get_tree()
-            .map_err(|e| {
-                log::error!("{e}");
-                e
-            })
             .context("get_tree() failed")?
             .workspaces_in_node()
     }
 
     pub fn rename_workspace(&mut self, old: &str, new: &str) -> Result<()> {
-        self.connection
+        for result in self
+            .connection
             .run_command(&format!("rename workspace \"{old}\" to \"{new}\"",))
-            .map_err(|e| {
-                log::error!("{e}");
-                e
-            })
-            .context("Failed to rename the workspace")?;
+            .context("Failed to rename the workspace")?
+        {
+            result.context("Failed to rename the workspace")?;
+        }
         Ok(())
     }