From f536156e7e959fc043dcd972162411bc34b6bc89 Mon Sep 17 00:00:00 2001 From: Alex Pasmantier <47638216+alexpasmantier@users.noreply.github.com> Date: Sun, 26 Jan 2025 22:02:44 +0100 Subject: [PATCH] fix(config): add serde default for shell integration configuration (#319) Fixes #318 --- television/config/mod.rs | 4 ++-- television/config/shell_integration.rs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/television/config/mod.rs b/television/config/mod.rs index 1dd71d1..39d553f 100644 --- a/television/config/mod.rs +++ b/television/config/mod.rs @@ -99,9 +99,9 @@ impl Config { let path = config_dir.join(CONFIG_FILE_NAME); let contents = std::fs::read_to_string(&path)?; - let cfg: Config = toml::from_str(&contents).unwrap_or_else(|_| { + let cfg: Config = toml::from_str(&contents).unwrap_or_else(|e| { warn!( - "Error parsing config file, using default configuration" + "Error parsing config file, using default configuration: {}" , e ); default_config.clone() }); diff --git a/television/config/shell_integration.rs b/television/config/shell_integration.rs index b68c24e..e5d4ad6 100644 --- a/television/config/shell_integration.rs +++ b/television/config/shell_integration.rs @@ -4,6 +4,7 @@ use rustc_hash::FxHashMap; use serde::Deserialize; #[derive(Clone, Debug, Deserialize, Default)] +#[serde(default)] pub struct ShellIntegrationConfig { pub commands: FxHashMap, pub keybindings: FxHashMap,