fix: update the config handler (#56)

- there was an error when the theme was not provided - the toolkit was using the font family of the user theme - other update
fodydev · Apr 14, 2024 · f416f0f · f416f0f
1 parent 02bc169
commit f416f0f
Show file tree

Hide file tree

Showing 4 changed files with 152 additions and 112 deletions.
diff --git a/data/full_sample.toml b/data/full_sample.toml
@@ -0,0 +1,19 @@
+[info]
+name = "Sample config"
+maintainors = ["test"]
+input_method = "test"
+homepage = "example.com"
+
+[core]
+buffer_size = 20
+page_size = 10
+auto_commit = false
+
+[theme]
+header.background = "#252320"
+header.foreground = "#dedddd"
+header.font = { family = "Charis-SIL", size = 12, weight = "bold" }
+body.background = "#dedddd"
+body.foreground = "#252320"
+body.font = { family = "Charis-SIL", size = 10, weight = "bold" }
+
diff --git a/data/sample.toml b/data/sample.toml
@@ -2,17 +2,4 @@
 name = "Sample config"
 maintainors = ["test"]
 input_method = "test"
-
-[core]
-buffer_size = 20
-page_size = 10
-auto_commit = false
-
-[theme]
-header.background = "#252320"
-header.foreground = "#dedddd"
-header.font = { family = "Charis-SIL", size = 12, weight = "bold" }
-body.background = "#dedddd"
-body.foreground = "#252320"
-body.font = { family = "Charis-SIL", size = 10, weight = "bold" }
-
+homepage = "example.com"
diff --git a/src/config.rs b/src/config.rs
@@ -5,7 +5,7 @@ use toml::{self};
 #[derive(Clone, Deserialize, Debug)]
 pub struct Config {
     pub theme: Option<Theme>,
-    pub core: Core,
+    pub core: Option<Core>,
     pub info: Info,
 }
 
@@ -20,7 +20,7 @@ pub struct Info {
     pub name: String,
     pub maintainors: Vec<String>,
     pub input_method: String,
-    pub homepage: Option<String>,
+    pub homepage: String,
 }
 
 #[derive(Clone, Deserialize, Debug)]
@@ -43,6 +43,37 @@ pub struct ThemeFont {
     pub weight: String,
 }
 
+impl Default for &Core {
+    fn default() -> Self {
+        &Core {
+            buffer_size: 64,
+            auto_commit: false,
+        }
+    }
+}
+
+impl Default for Theme {
+    fn default() -> Self {
+        let font = ThemeFont {
+            family: "Charis-SIL".to_owned(),
+            size: 10,
+            weight: "bold".to_owned(),
+        };
+        let header = SectionTheme {
+            background: "#252320".to_owned(),
+            foreground: "#dedddd".to_owned(),
+            font: font.clone(),
+        };
+        let body = SectionTheme {
+            background: "#dedddd".to_owned(),
+            foreground: "#252320".to_owned(),
+            font,
+        };
+
+        Self { header, body }
+    }
+}
+
 impl Config {
     pub fn from_file(filepath: &Path) -> Result<Self, Box<dyn error::Error>> {
         let content = fs::read_to_string(filepath)?;
@@ -62,6 +93,9 @@ mod tests {
         let config = Config::from_file(Path::new("./data/sample.toml"));
         assert!(config.is_ok());
 
+        let config = Config::from_file(Path::new("./data/full_sample.toml"));
+        assert!(config.is_ok());
+
         let config = Config::from_file(Path::new("./data/blank_sample.toml"));
         assert!(config.is_err());
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -38,101 +38,101 @@ impl Wish {
 
         let mut themes = HashMap::new();
 
-        if let Some(theme_config) = config.theme.clone() {
-            // Predicates
-            let style = Style {
-                name: "header.predicates.TLabel",
-                background: theme_config.header.background,
-                foreground: theme_config.header.foreground,
-                font_size: theme_config.header.font.size,
-                font_family: theme_config.header.font.family,
-                font_weight: theme_config.header.font.weight,
-            };
-            style.update();
-            themes.insert("PHLabel", style);
-
-            let style = Style {
-                name: "body.predicates.TLabel",
-                background: theme_config.body.background,
-                foreground: theme_config.body.foreground,
-                font_size: theme_config.body.font.size,
-                font_family: theme_config.body.font.family.to_owned(),
-                font_weight: theme_config.body.font.weight.to_owned(),
-            };
-            style.update();
-            themes.insert("PBLabel", style);
-
-            // Toolkit
-            let style = Style {
-                name: "toolkit.TFrame",
-                background: "#1e1e1e".to_owned(),
-                ..Default::default()
-            };
-            style.update();
-            themes.insert("TFrame", style);
-
-            let style = Style {
-                name: "label.toolkit.TLabel",
-                background: "#1e1e1e".to_owned(),
-                foreground: "#ffffff".to_owned(),
-                font_size: (12.0 * GUI_RATIO) as u64,
-                font_family: theme_config.body.font.family.to_owned(),
-                ..Default::default()
-            };
-            style.update();
-            themes.insert("TLabel", style);
-
-            let style = Style {
-                name: "button.toolkit.TButton",
-                background: "#ffffff".to_owned(),
-                foreground: "#1e1e1e".to_owned(),
-                font_size: (12.0 * GUI_RATIO) as u64,
-                font_family: theme_config.body.font.family.to_owned(),
-                ..Default::default()
-            };
-            style.update();
-            themes.insert("TButton", style);
-
-            let style = Style {
-                name: "exit.toolkit.TButton",
-                background: "#e03131".to_owned(),
-                foreground: "#1e1e1e".to_owned(),
-                font_size: (12.0 * GUI_RATIO) as u64,
-                font_family: theme_config.body.font.family.to_owned(),
-                font_weight: "bold".to_owned(),
-            };
-            style.update();
-            themes.insert("TEButton", style);
-
-            let style = Style {
-                name: "iconify.toolkit.TButton",
-                background: "#1971c2".to_owned(),
-                foreground: "#1e1e1e".to_owned(),
-                font_size: (12.0 * GUI_RATIO) as u64,
-                font_family: theme_config.body.font.family.to_owned(),
-                font_weight: "bold".to_owned(),
-            };
-            style.update();
-            themes.insert("TIButton", style);
+        let theme_config = config.theme.clone().unwrap_or_default();
+        // Predicates
+        let style = Style {
+            name: "header.predicates.TLabel",
+            background: theme_config.header.background,
+            foreground: theme_config.header.foreground,
+            font_size: theme_config.header.font.size,
+            font_family: theme_config.header.font.family,
+            font_weight: theme_config.header.font.weight,
+        };
+        style.update();
+        themes.insert("PHLabel", style);
+
+        let style = Style {
+            name: "body.predicates.TLabel",
+            background: theme_config.body.background,
+            foreground: theme_config.body.foreground,
+            font_size: theme_config.body.font.size,
+            font_family: theme_config.body.font.family.to_owned(),
+            font_weight: theme_config.body.font.weight.to_owned(),
+        };
+        style.update();
+        themes.insert("PBLabel", style);
+
+        // Toolkit
+        let font_family = "Charis-SIL";
+        let style = Style {
+            name: "toolkit.TFrame",
+            background: "#1e1e1e".to_owned(),
+            ..Default::default()
+        };
+        style.update();
+        themes.insert("TFrame", style);
+
+        let style = Style {
+            name: "label.toolkit.TLabel",
+            background: "#1e1e1e".to_owned(),
+            foreground: "#ffffff".to_owned(),
+            font_size: (12.0 * GUI_RATIO) as u64,
+            font_family: font_family.to_string(),
+            ..Default::default()
+        };
+        style.update();
+        themes.insert("TLabel", style);
+
+        let style = Style {
+            name: "button.toolkit.TButton",
+            background: "#ffffff".to_owned(),
+            foreground: "#1e1e1e".to_owned(),
+            font_size: (12.0 * GUI_RATIO) as u64,
+            font_family: font_family.to_string(),
+            ..Default::default()
+        };
+        style.update();
+        themes.insert("TButton", style);
+
+        let style = Style {
+            name: "exit.toolkit.TButton",
+            background: "#e03131".to_owned(),
+            foreground: "#1e1e1e".to_owned(),
+            font_size: (12.0 * GUI_RATIO) as u64,
+            font_family: font_family.to_string(),
+            font_weight: "bold".to_owned(),
+        };
+        style.update();
+        themes.insert("TEButton", style);
+
+        let style = Style {
+            name: "iconify.toolkit.TButton",
+            background: "#1971c2".to_owned(),
+            foreground: "#1e1e1e".to_owned(),
+            font_size: (12.0 * GUI_RATIO) as u64,
+            font_family: font_family.to_string(),
+            font_weight: "bold".to_owned(),
+        };
+        style.update();
+        themes.insert("TIButton", style);
 
-            let style = Style {
-                name: "toolkit.TNotebook",
-                background: "#1e1e1e".to_owned(),
-                ..Default::default()
-            };
-            style.update();
-            themes.insert("TNotebook", style);
-
-            Style {
-                name: "toolkit.TNotebook.Tab",
-                background: "#ffffff".to_owned(),
-                foreground: "#1e1e1e".to_owned(),
-                font_size: (12.0 * GUI_RATIO) as u64,
-                font_family: theme_config.body.font.family.to_owned(),
-                ..Default::default()
-            }
-            .update();
+        let style = Style {
+            name: "toolkit.TNotebook",
+            background: "#1e1e1e".to_owned(),
+            ..Default::default()
         };
+        style.update();
+        themes.insert("TNotebook", style);
+
+        Style {
+            name: "toolkit.TNotebook.Tab",
+            background: "#ffffff".to_owned(),
+            foreground: "#1e1e1e".to_owned(),
+            font_size: (12.0 * GUI_RATIO) as u64,
+            font_family: font_family.to_string(),
+            ..Default::default()
+        }
+        .update();
 
         Wish {
             predicates_widget: rstk::make_label(&wish),
@@ -290,7 +290,7 @@ impl Wish {
                 let window = self.window.clone();
                 let config_name = self.config.info.name.to_owned();
                 let config_maintainors = self.config.info.maintainors.join(", ");
-                let config_homepage = self.config.info.homepage.clone().unwrap_or_default();
+                let config_homepage = self.config.info.homepage.clone();
                 move || {
                     rstk::message_box()
                         .parent(&window)
@@ -305,8 +305,8 @@ impl Wish {
                         .show();
                 }
             }
-            "Auto Commit:" => &self.config.core.auto_commit.to_string() => || ()
-            "Buffer Size:" => &self.config.core.buffer_size.to_string() => || ()
+            "Auto Commit:" => &self.config.core.as_ref().unwrap_or_default().auto_commit.to_string() => || ()
+            "Buffer Size:" => &self.config.core.as_ref().unwrap_or_default().buffer_size.to_string() => || ()
         );
 
         // Help page