From 43b23c11c9c06080ad3fa10f022715133dd705c4 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <michael@mmurphy.dev>
Date: Tue, 13 Aug 2024 19:34:35 +0200
Subject: [PATCH] chore: do not log error for unset configs

---
 cosmic-settings/src/pages/desktop/workspaces.rs | 15 ++++++++++++---
 cosmic-settings/src/pages/input/mod.rs          |  5 ++++-
 cosmic-settings/src/pages/time/date.rs          | 15 ++++++++++++---
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/cosmic-settings/src/pages/desktop/workspaces.rs b/cosmic-settings/src/pages/desktop/workspaces.rs
index 5c270a3..5b6a70d 100644
--- a/cosmic-settings/src/pages/desktop/workspaces.rs
+++ b/cosmic-settings/src/pages/desktop/workspaces.rs
@@ -36,16 +36,25 @@ impl Default for Page {
     fn default() -> Self {
         let comp_config = cosmic_config::Config::new("com.system76.CosmicComp", 1).unwrap();
         let comp_workspace_config = comp_config.get("workspaces").unwrap_or_else(|err| {
-            error!(?err, "Failed to read config 'workspaces'");
+            if !matches!(cosmic_config::Error::NoConfigDirectory, err) {
+                error!(?err, "Failed to read config 'workspaces'");
+            }
+
             WorkspaceConfig::default()
         });
         let config = cosmic_config::Config::new("com.system76.CosmicWorkspaces", 1).unwrap();
         let show_workspace_name = config.get("show_workspace_name").unwrap_or_else(|err| {
-            error!(?err, "Failed to read config 'show_workspace_name'");
+            if !matches!(cosmic_config::Error::NoConfigDirectory, err) {
+                error!(?err, "Failed to read config 'show_workspace_name'");
+            }
+
             false
         });
         let show_workspace_number = config.get("show_workspace_number").unwrap_or_else(|err| {
-            error!(?err, "Failed to read config 'show_workspace_number'");
+            if !matches!(cosmic_config::Error::NoConfigDirectory, err) {
+                error!(?err, "Failed to read config 'show_workspace_number'");
+            }
+
             false
         });
         Self {
diff --git a/cosmic-settings/src/pages/input/mod.rs b/cosmic-settings/src/pages/input/mod.rs
index 19931ed..b34239c 100644
--- a/cosmic-settings/src/pages/input/mod.rs
+++ b/cosmic-settings/src/pages/input/mod.rs
@@ -46,7 +46,10 @@ fn get_config<T: Default + serde::de::DeserializeOwned>(
     key: &str,
 ) -> T {
     config.get(key).unwrap_or_else(|why| {
-        error!(?why, "Failed to read config '{}'", key);
+        if !matches!(cosmic_config::Error::NoConfigDirectory, why) {
+            error!(?why, "Failed to read config '{}'", key);
+        }
+
         T::default()
     })
 }
diff --git a/cosmic-settings/src/pages/time/date.rs b/cosmic-settings/src/pages/time/date.rs
index e6377ac..3976ca4 100644
--- a/cosmic-settings/src/pages/time/date.rs
+++ b/cosmic-settings/src/pages/time/date.rs
@@ -56,21 +56,30 @@ impl Default for Page {
         let military_time = cosmic_applet_config
             .get("military_time")
             .unwrap_or_else(|err| {
-                error!(?err, "Failed to read config 'military_time'");
+                if !matches!(cosmic_config::Error::NoConfigDirectory, err) {
+                    error!(?err, "Failed to read config 'military_time'");
+                }
+
                 false
             });
 
         let first_day_of_week = cosmic_applet_config
             .get("first_day_of_week")
             .unwrap_or_else(|err| {
-                error!(?err, "Failed to read config 'first_day_of_week'");
+                if !matches!(cosmic_config::Error::NoConfigDirectory, err) {
+                    error!(?err, "Failed to read config 'first_day_of_week'");
+                }
+
                 6
             });
 
         let show_date_in_top_panel = cosmic_applet_config
             .get("show_date_in_top_panel")
             .unwrap_or_else(|err| {
-                error!(?err, "Failed to read config 'show_date_in_top_panel'");
+                if !matches!(cosmic_config::Error::NoConfigDirectory, err) {
+                    error!(?err, "Failed to read config 'show_date_in_top_panel'");
+                }
+
                 true
             });