Refactor Main function

default-config.toml

@@ -51,7 +51,7 @@ underline_character = '―'
 segment_top = "{color-white}[======------{color-brightmagenta} {name} {color-white}------======]"
 
 # Whether to supress any errors that come or not
-suppress_errors = false
+suppress_errors = true
 
 
 [ascii]

src/battery.rs

@@ -25,7 +25,7 @@ impl Module for BatteryInfo {
         }
     }
 
-    fn style(&self, config: &Configuration, max_title_length: u64) -> String {
+    fn style(&self, config: &Configuration, max_title_size: u64) -> String {
         let mut title_color: &CrabFetchColor = &config.title_color;
         if (&config.battery.title_color).is_some() {
             title_color = &config.battery.title_color.as_ref().unwrap();
@@ -45,7 +45,32 @@ impl Module for BatteryInfo {
             seperator = config.battery.seperator.as_ref().unwrap();
         }
 
-        self.default_style(config, max_title_length, &config.battery.title, title_color, title_bold, title_italic, &seperator)
+        let mut value: String = self.replace_placeholders(config);
+        value = self.replace_color_placeholders(&value);
+
+        Self::default_style(config, max_title_size, &config.battery.title, title_color, title_bold, title_italic, &seperator, &value)
+    }
+    fn unknown_output(config: &Configuration, max_title_size: u64) -> String { 
+        let mut title_color: &CrabFetchColor = &config.title_color;
+        if (config.battery.title_color).is_some() {
+            title_color = config.battery.title_color.as_ref().unwrap();
+        }
+
+        let mut title_bold: bool = config.title_bold;
+        if config.battery.title_bold.is_some() {
+            title_bold = config.battery.title_bold.unwrap();
+        }
+        let mut title_italic: bool = config.title_italic;
+        if config.battery.title_italic.is_some() {
+            title_italic = config.battery.title_italic.unwrap();
+        }
+
+        let mut seperator: &str = config.seperator.as_str();
+        if config.battery.seperator.is_some() {
+            seperator = config.battery.seperator.as_ref().unwrap();
+        }
+
+        Self::default_style(config, max_title_size, &config.battery.title, title_color, title_bold, title_italic, &seperator, "Unknown")
     }
 
     fn replace_placeholders(&self, config: &Configuration) -> String {

src/config_manager.rs

@@ -214,7 +214,7 @@ pub fn parse(location_override: &Option<String>, module_override: &Option<String
     builder = builder.set_default("inline_values", false).unwrap();
     builder = builder.set_default("underline_character", "―").unwrap();
     builder = builder.set_default("segment_top", "{color-white}[======------{color-brightmagenta} {name} {color-white}------======]").unwrap();
-    builder = builder.set_default("suppress_errors", false).unwrap();
+    builder = builder.set_default("suppress_errors", true).unwrap();
 
     // ASCII
     builder = builder.set_default("ascii.display", true).unwrap();
@@ -444,7 +444,7 @@ underline_character = '-'
 segment_top = "{color-white}[======------{color-brightmagenta} {name} {color-white}------======]"
 
 # Whether to supress any errors that come or not
-suppress_errors = false
+suppress_errors = true
 
 
 [ascii]

src/cpu.rs

@@ -54,7 +54,32 @@ impl Module for CPUInfo {
             seperator = config.cpu.seperator.as_ref().unwrap();
         }
 
-        self.default_style(config, max_title_size, &config.cpu.title, title_color, title_bold, title_italic, &seperator)
+        let mut value: String = self.replace_placeholders(config);
+        value = self.replace_color_placeholders(&value);
+
+        Self::default_style(config, max_title_size, &config.cpu.title, title_color, title_bold, title_italic, &seperator, &value)
+    }
+    fn unknown_output(config: &Configuration, max_title_size: u64) -> String { 
+        let mut title_color: &CrabFetchColor = &config.title_color;
+        if (config.cpu.title_color).is_some() {
+            title_color = config.cpu.title_color.as_ref().unwrap();
+        }
+
+        let mut title_bold: bool = config.title_bold;
+        if config.cpu.title_bold.is_some() {
+            title_bold = config.cpu.title_bold.unwrap();
+        }
+        let mut title_italic: bool = config.title_italic;
+        if config.cpu.title_italic.is_some() {
+            title_italic = config.cpu.title_italic.unwrap();
+        }
+
+        let mut seperator: &str = config.seperator.as_str();
+        if config.cpu.seperator.is_some() {
+            seperator = config.cpu.seperator.as_ref().unwrap();
+        }
+
+        Self::default_style(config, max_title_size, &config.cpu.title, title_color, title_bold, title_italic, &seperator, "Unknown")
     }
 
     fn replace_placeholders(&self, config: &Configuration) -> String {

src/desktop.rs

@@ -25,7 +25,7 @@ impl Module for DesktopInfo {
         }
     }
 
-    fn style(&self, config: &Configuration, max_title_length: u64) -> String {
+    fn style(&self, config: &Configuration, max_title_size: u64) -> String {
         let mut title_color: &CrabFetchColor = &config.title_color;
         if (&config.desktop.title_color).is_some() {
             title_color = &config.desktop.title_color.as_ref().unwrap();
@@ -45,7 +45,32 @@ impl Module for DesktopInfo {
             seperator = config.desktop.seperator.as_ref().unwrap();
         }
 
-        self.default_style(config, max_title_length, &config.desktop.title, title_color, title_bold, title_italic, &seperator)
+        let mut value: String = self.replace_placeholders(config);
+        value = self.replace_color_placeholders(&value);
+
+        Self::default_style(config, max_title_size, &config.desktop.title, title_color, title_bold, title_italic, &seperator, &value)
+    }
+    fn unknown_output(config: &Configuration, max_title_size: u64) -> String { 
+        let mut title_color: &CrabFetchColor = &config.title_color;
+        if (config.desktop.title_color).is_some() {
+            title_color = config.desktop.title_color.as_ref().unwrap();
+        }
+
+        let mut title_bold: bool = config.title_bold;
+        if config.desktop.title_bold.is_some() {
+            title_bold = config.desktop.title_bold.unwrap();
+        }
+        let mut title_italic: bool = config.title_italic;
+        if config.desktop.title_italic.is_some() {
+            title_italic = config.desktop.title_italic.unwrap();
+        }
+
+        let mut seperator: &str = config.seperator.as_str();
+        if config.desktop.seperator.is_some() {
+            seperator = config.desktop.seperator.as_ref().unwrap();
+        }
+
+        Self::default_style(config, max_title_size, &config.desktop.title, title_color, title_bold, title_italic, &seperator, "Unknown")
     }
 
     fn replace_placeholders(&self, config: &Configuration) -> String {

src/displays.rs

@@ -105,7 +105,35 @@ impl Module for DisplayInfo {
         let mut title: String = config.displays.title.clone();
         title = title.replace("{name}", &self.name);
 
-        self.default_style(config, max_title_size, &title, title_color, title_bold, title_italic, &seperator)
+        let mut value: String = self.replace_placeholders(config);
+        value = self.replace_color_placeholders(&value);
+
+        Self::default_style(config, max_title_size, &title, title_color, title_bold, title_italic, &seperator, &value)
+    }
+    fn unknown_output(config: &Configuration, max_title_size: u64) -> String { 
+        let mut title_color: &CrabFetchColor = &config.title_color;
+        if (config.displays.title_color).is_some() {
+            title_color = config.displays.title_color.as_ref().unwrap();
+        }
+
+        let mut title_bold: bool = config.title_bold;
+        if config.displays.title_bold.is_some() {
+            title_bold = config.displays.title_bold.unwrap();
+        }
+        let mut title_italic: bool = config.title_italic;
+        if config.displays.title_italic.is_some() {
+            title_italic = config.displays.title_italic.unwrap();
+        }
+
+        let mut seperator: &str = config.seperator.as_str();
+        if config.displays.seperator.is_some() {
+            seperator = config.displays.seperator.as_ref().unwrap();
+        }
+
+        let mut title: String = config.displays.title.clone();
+        title = title.replace("{name}", "Unknown");
+
+        Self::default_style(config, max_title_size, &title, title_color, title_bold, title_italic, &seperator, "Unknown")
     }
 
     fn replace_placeholders(&self, config: &Configuration) -> String {

src/editor.rs

@@ -26,7 +26,7 @@ impl Module for EditorInfo {
         }
     }
 
-    fn style(&self, config: &Configuration, max_title_length: u64) -> String {
+    fn style(&self, config: &Configuration, max_title_size: u64) -> String {
         let mut title_color: &CrabFetchColor = &config.title_color;
         if (&config.editor.title_color).is_some() {
             title_color = &config.editor.title_color.as_ref().unwrap();
@@ -46,7 +46,32 @@ impl Module for EditorInfo {
             seperator = config.editor.seperator.as_ref().unwrap();
         }
 
-        self.default_style(config, max_title_length, &config.editor.title, title_color, title_bold, title_italic, &seperator)
+        let mut value: String = self.replace_placeholders(config);
+        value = self.replace_color_placeholders(&value);
+
+        Self::default_style(config, max_title_size, &config.editor.title, title_color, title_bold, title_italic, &seperator, &value)
+    }
+    fn unknown_output(config: &Configuration, max_title_size: u64) -> String { 
+        let mut title_color: &CrabFetchColor = &config.title_color;
+        if (config.editor.title_color).is_some() {
+            title_color = config.editor.title_color.as_ref().unwrap();
+        }
+
+        let mut title_bold: bool = config.title_bold;
+        if config.editor.title_bold.is_some() {
+            title_bold = config.editor.title_bold.unwrap();
+        }
+        let mut title_italic: bool = config.title_italic;
+        if config.editor.title_italic.is_some() {
+            title_italic = config.editor.title_italic.unwrap();
+        }
+
+        let mut seperator: &str = config.seperator.as_str();
+        if config.editor.seperator.is_some() {
+            seperator = config.editor.seperator.as_ref().unwrap();
+        }
+
+        Self::default_style(config, max_title_size, &config.editor.title, title_color, title_bold, title_italic, &seperator, "Unknown")
     }
 
     fn replace_placeholders(&self, config: &Configuration) -> String {

src/gpu.rs

@@ -45,7 +45,7 @@ impl Module for GPUInfo {
         }
     }
 
-    fn style(&self, config: &Configuration, max_title_length: u64) -> String {
+    fn style(&self, config: &Configuration, max_title_size: u64) -> String {
         let mut title_color: &CrabFetchColor = &config.title_color;
         if (config.gpu.title_color).is_some() {
             title_color = config.gpu.title_color.as_ref().unwrap();
@@ -65,7 +65,33 @@ impl Module for GPUInfo {
             seperator = config.gpu.seperator.as_ref().unwrap();
         }
 
-        self.default_style(config, max_title_length, &config.gpu.title, title_color, title_bold, title_italic, &seperator)
+        let mut value: String = self.replace_placeholders(config);
+        value = self.replace_color_placeholders(&value);
+
+        Self::default_style(config, max_title_size, &config.gpu.title, title_color, title_bold, title_italic, &seperator, &value)
+    }
+
+    fn unknown_output(config: &Configuration, max_title_size: u64) -> String { 
+        let mut title_color: &CrabFetchColor = &config.title_color;
+        if (config.gpu.title_color).is_some() {
+            title_color = config.gpu.title_color.as_ref().unwrap();
+        }
+
+        let mut title_bold: bool = config.title_bold;
+        if config.gpu.title_bold.is_some() {
+            title_bold = config.gpu.title_bold.unwrap();
+        }
+        let mut title_italic: bool = config.title_italic;
+        if config.gpu.title_italic.is_some() {
+            title_italic = config.gpu.title_italic.unwrap();
+        }
+
+        let mut seperator: &str = config.seperator.as_str();
+        if config.gpu.seperator.is_some() {
+            seperator = config.gpu.seperator.as_ref().unwrap();
+        }
+
+        Self::default_style(config, max_title_size, &config.gpu.title, title_color, title_bold, title_italic, &seperator, "Unknown")
     }
 
     fn replace_placeholders(&self, config: &Configuration) -> String {

src/host.rs

@@ -24,7 +24,7 @@ impl Module for HostInfo {
         }
     }
 
-    fn style(&self, config: &Configuration, max_title_length: u64) -> String {
+    fn style(&self, config: &Configuration, max_title_size: u64) -> String {
         let mut title_color: &CrabFetchColor = &config.title_color;
         if (&config.host.title_color).is_some() {
             title_color = &config.host.title_color.as_ref().unwrap();
@@ -44,7 +44,32 @@ impl Module for HostInfo {
             seperator = config.host.seperator.as_ref().unwrap();
         }
 
-        self.default_style(config, max_title_length, &config.host.title, title_color, title_bold, title_italic, &seperator)
+        let mut value: String = self.replace_placeholders(config);
+        value = self.replace_color_placeholders(&value);
+
+        Self::default_style(config, max_title_size, &config.host.title, title_color, title_bold, title_italic, &seperator, &value)
+    }
+    fn unknown_output(config: &Configuration, max_title_size: u64) -> String { 
+        let mut title_color: &CrabFetchColor = &config.title_color;
+        if (config.host.title_color).is_some() {
+            title_color = config.host.title_color.as_ref().unwrap();
+        }
+
+        let mut title_bold: bool = config.title_bold;
+        if config.host.title_bold.is_some() {
+            title_bold = config.host.title_bold.unwrap();
+        }
+        let mut title_italic: bool = config.title_italic;
+        if config.host.title_italic.is_some() {
+            title_italic = config.host.title_italic.unwrap();
+        }
+
+        let mut seperator: &str = config.seperator.as_str();
+        if config.host.seperator.is_some() {
+            seperator = config.host.seperator.as_ref().unwrap();
+        }
+
+        Self::default_style(config, max_title_size, &config.host.title, title_color, title_bold, title_italic, &seperator, "Unknown")
     }
 
     fn replace_placeholders(&self, config: &Configuration) -> String {

src/hostname.rs

@@ -25,7 +25,7 @@ impl Module for HostnameInfo {
             hostname: "".to_string(),
         }
     }
-    fn style(&self, config: &Configuration, max_title_length: u64) -> String {
+    fn style(&self, config: &Configuration, max_title_size: u64) -> String {
         let mut title_color: &CrabFetchColor = &config.title_color;
         if (config.hostname.title_color).is_some() {
             title_color = config.hostname.title_color.as_ref().unwrap();
@@ -45,8 +45,34 @@ impl Module for HostnameInfo {
             seperator = config.hostname.seperator.as_ref().unwrap();
         }
 
-        self.default_style(config, max_title_length, &config.hostname.title, title_color, title_bold, title_italic, &seperator)
+        let mut value: String = self.replace_placeholders(config);
+        value = self.replace_color_placeholders(&value);
+
+        Self::default_style(config, max_title_size, &config.hostname.title, title_color, title_bold, title_italic, &seperator, &value)
+    }
+    fn unknown_output(config: &Configuration, max_title_size: u64) -> String { 
+        let mut title_color: &CrabFetchColor = &config.title_color;
+        if (config.hostname.title_color).is_some() {
+            title_color = config.hostname.title_color.as_ref().unwrap();
+        }
+
+        let mut title_bold: bool = config.title_bold;
+        if config.hostname.title_bold.is_some() {
+            title_bold = config.hostname.title_bold.unwrap();
+        }
+        let mut title_italic: bool = config.title_italic;
+        if config.hostname.title_italic.is_some() {
+            title_italic = config.hostname.title_italic.unwrap();
+        }
+
+        let mut seperator: &str = config.seperator.as_str();
+        if config.hostname.seperator.is_some() {
+            seperator = config.hostname.seperator.as_ref().unwrap();
+        }
+
+        Self::default_style(config, max_title_size, &config.hostname.title, title_color, title_bold, title_italic, &seperator, "Unknown")
     }
+
     fn replace_placeholders(&self, config: &Configuration) -> String {
         config.hostname.format.replace("{username}", &self.username)
             .replace("{hostname}", &self.hostname)