Add support for separator

Author: roosta

README.md

@@ -65,6 +65,9 @@ MyNiceProgram = "😛"
 [aliases]
 TelegramDesktop = "Telegram"
 "Org.gnome.Nautilus" = "Nautilus"
+
+[general]
+seperator = ""
 ```
 
 For an overview of available options

assets/example_config.toml

@@ -10,3 +10,6 @@ MyNiceProgram = "😛"
 [aliases]
 TelegramDesktop = "Telegram"
 "Org.gnome.Nautilus" = "Nautilus"
+
+[general]
+separator = ""

src/config.rs

@@ -5,21 +5,23 @@ use serde::Deserialize;
 use failure::Error;
 
 lazy_static! {
-    pub static ref EMPTY_ALIASES_MAP: Map<String, String> = Map::new();
+    pub static ref EMPTY_MAP: Map<String, String> = Map::new();
 }
 
 #[serde(default)]
 #[derive(Deserialize)]
 pub struct Config {
     pub icons: Map<String, char>,
     pub aliases: Map<String, String>,
+    pub general: Map<String, String>
 }
 
 impl Default for Config {
     fn default() -> Self {
         Config {
             icons: super::icons::NONE.clone(),
-            aliases: EMPTY_ALIASES_MAP.clone(),
+            aliases: EMPTY_MAP.clone(),
+            general: EMPTY_MAP.clone()
         }
     }
 }

src/lib.rs

@@ -31,15 +31,17 @@ pub mod config;
 pub struct Options {
     pub icons: Map<String, char>,
     pub aliases: Map<String, String>,
-    pub names: bool,
+    pub general: Map<String, String>,
+    pub names: bool
 }
 
 impl Default for Options {
     fn default() -> Self {
         Options {
             icons: icons::NONE.clone(),
-            aliases: config::EMPTY_ALIASES_MAP.clone(),
-            names: true,
+            aliases: config::EMPTY_MAP.clone(),
+            general: config::EMPTY_MAP.clone(),
+            names: true
         }
     }
 }
@@ -180,7 +182,13 @@ fn get_classes(workspace: &Node, x_conn: &xcb::Connection, options: &Options) ->
 pub fn update_tree(x_conn: &xcb::Connection, i3_conn: &mut I3Connection, options: &Options) -> Result<(), Error> {
     let tree = i3_conn.get_tree()?;
     for workspace in get_workspaces(tree) {
-        let classes = get_classes(&workspace, &x_conn, options)?.join("|");
+
+        let separator = match options.general.get("separator") {
+            Some(s) => s,
+            None => "|"
+        };
+
+        let classes = get_classes(&workspace, &x_conn, options)?.join(separator);
 
         let old: String = workspace
             .name

src/main.rs

@@ -42,14 +42,16 @@ fn main() -> Result<(), ExitFailure> {
             i3wsr::Options {
                 icons: file_config.icons.into_iter().chain(i3wsr::icons::get_icons(&icons)).collect(),
                 aliases: file_config.aliases,
-                names: !no_names,
+                general: file_config.general,
+                names: !no_names
             }
         },
         None => {
             i3wsr::Options {
                 icons: i3wsr::icons::get_icons(&icons),
-                aliases: i3wsr::config::EMPTY_ALIASES_MAP.clone(),
-                names: !no_names,
+                aliases: i3wsr::config::EMPTY_MAP.clone(),
+                general: i3wsr::config::EMPTY_MAP.clone(),
+                names: !no_names
             }
         }
     };