fix: Parse profiles without LedMode without failing

AaronErhardt · Apr 8, 2024 · d2e938e · d2e938e
1 parent 236f428
commit d2e938e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/tailor_api/src/led.rs b/tailor_api/src/led.rs
@@ -1,6 +1,9 @@
-#[derive(Debug, Copy, Clone, serde::Serialize, serde::Deserialize, PartialEq, Eq, Hash)]
+#[derive(
+    Default, Debug, Copy, Clone, serde::Serialize, serde::Deserialize, PartialEq, Eq, Hash,
+)]
 #[non_exhaustive]
 pub enum LedControllerMode {
+    #[default]
     Rgb,
     Monochrome,
 }

diff --git a/tailor_api/src/profile.rs b/tailor_api/src/profile.rs
@@ -22,5 +22,6 @@ pub struct LedProfile {
     pub device_name: String,
     pub function: String,
     pub profile: String,
+    #[serde(default)]
     pub mode: LedControllerMode,
 }
diff --git a/tailord/src/led/mod.rs b/tailord/src/led/mod.rs
@@ -32,7 +32,7 @@ impl LedRuntime {
                 info: LedDeviceInfo {
                     device_name: data.controller.device_name.clone(),
                     function: data.controller.function.clone(),
-                    mode: data.controller.mode().clone(),
+                    mode: data.controller.mode(),
                 },
                 profile_sender,
                 color_sender,

diff --git a/tailord/src/util.rs b/tailord/src/util.rs
@@ -1,5 +1,4 @@
 use serde::{de::DeserializeOwned, Serialize};
-use std::ffi::OsString;
 use zbus::fdo;
 
 pub fn normalize_json_path(base_path: &str, name: &str) -> fdo::Result<String> {
@@ -12,10 +11,6 @@ pub fn normalize_json_path(base_path: &str, name: &str) -> fdo::Result<String> {
         Err(fdo::Error::InvalidArgs(format!(
             "Can't use '.' in profile names: `{name}`"
         )))
-    } else if let Err(err) = OsString::try_from(name) {
-        Err(fdo::Error::InvalidArgs(format!(
-            "Can't convert `{name}` to OS string: `{err}`"
-        )))
     } else if base_path.is_empty() {
         Ok(format!("{name}.json"))
     } else {