time: Simplify strftime config

Author: joshuamegnauth54

cosmic-applet-time/src/window.rs

@@ -159,15 +159,12 @@ impl Window {
     }
 
     fn vertical_layout(&self) -> Element<'_, Message> {
-        let elements: Vec<Element<'_, Message>> = if let Some(formatted) = self
-            .config
-            .format_strftime
-            .as_deref()
-            .map(|format| self.now.format(format).to_string())
-        {
+        let elements: Vec<Element<'_, Message>> = if !self.config.format_strftime.is_empty() {
             // strftime formatter may override locale specific elements so it stands alone rather
             // than using ICU to determine a format.
-            formatted
+            self.now
+                .format(&self.config.format_strftime)
+                .to_string()
                 .split_whitespace()
                 .map(|piece| self.core.applet.text(piece.to_owned()).into())
                 .collect()
@@ -232,13 +229,8 @@ impl Window {
     }
 
     fn horizontal_layout(&self) -> Element<'_, Message> {
-        let formatted_date = if let Some(formatted) = self
-            .config
-            .format_strftime
-            .as_deref()
-            .map(|format| self.now.format(format).to_string())
-        {
-            formatted
+        let formatted_date = if !self.config.format_strftime.is_empty() {
+            self.now.format(&self.config.format_strftime).to_string()
         } else {
             let datetime = self.create_datetime(&self.now);
             let mut prefs = DateTimeFormatterPreferences::from(self.locale.clone());

cosmic-applets-config/src/time.rs

@@ -11,8 +11,8 @@ pub struct TimeAppletConfig {
     pub first_day_of_week: u8,
     pub show_date_in_top_panel: bool,
     pub show_weekday: bool,
-    #[serde(default, deserialize_with = "strftime_opt_de")]
-    pub format_strftime: Option<String>,
+    #[serde(default, skip_serializing_if = "str::is_empty")]
+    pub format_strftime: String,
 }
 
 impl Default for TimeAppletConfig {
@@ -23,21 +23,7 @@ impl Default for TimeAppletConfig {
             first_day_of_week: 6,
             show_date_in_top_panel: true,
             show_weekday: false,
-            format_strftime: None,
+            format_strftime: Default::default(),
         }
     }
 }
-
-/// Deserialize optional String but only if it is non-empty.
-fn strftime_opt_de<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    serde::Deserialize::deserialize(deserializer).map(|strftime: Option<String>| {
-        if strftime.as_deref().is_none_or(str::is_empty) {
-            None
-        } else {
-            strftime
-        }
-    })
-}