Implement transition support for legacy v1 api

Author: duvholt

crates/hue/src/api/grouped_light.rs

@@ -47,12 +47,27 @@ impl GroupedLight {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Default, Serialize, Deserialize, Clone)]
 pub struct GroupedLightDynamicsUpdate {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub duration: Option<u32>,
 }
 
+impl GroupedLightDynamicsUpdate {
+    #[must_use]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    #[must_use]
+    pub fn with_duration(self, duration: Option<impl Into<u32>>) -> Self {
+        Self {
+            duration: duration.map(Into::into),
+            ..self
+        }
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub struct GroupedLightUpdate {
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -111,6 +126,11 @@ impl GroupedLightUpdate {
             ..self
         }
     }
+
+    #[must_use]
+    pub const fn with_dynamics(self, dynamics: Option<GroupedLightDynamicsUpdate>) -> Self {
+        Self { dynamics, ..self }
+    }
 }
 
 /* conversion from v1 api */
@@ -121,5 +141,9 @@ impl From<&ApiLightStateUpdate> for GroupedLightUpdate {
             .with_brightness(upd.bri.map(|b| f64::from(b) / 2.54))
             .with_color_xy(upd.xy.map(XY::from))
             .with_color_temperature(upd.ct)
+            .with_dynamics(
+                upd.transitiontime
+                    .map(|t| GroupedLightDynamicsUpdate::new().with_duration(Some(t * 100))),
+            )
     }
 }

crates/hue/src/api/light.rs

@@ -449,14 +449,29 @@ pub struct LightDynamics {
     pub speed_valid: bool,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub struct LightDynamicsUpdate {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub speed: Option<f64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub duration: Option<u32>,
 }
 
+impl LightDynamicsUpdate {
+    #[must_use]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    #[must_use]
+    pub fn with_duration(self, duration: Option<impl Into<u32>>) -> Self {
+        Self {
+            duration: duration.map(Into::into),
+            ..self
+        }
+    }
+}
+
 impl Default for LightDynamics {
     fn default() -> Self {
         Self {
@@ -684,6 +699,11 @@ impl LightUpdate {
     pub fn with_gradient(self, gradient: Option<LightGradientUpdate>) -> Self {
         Self { gradient, ..self }
     }
+
+    #[must_use]
+    pub fn with_dynamics(self, dynamics: Option<LightDynamicsUpdate>) -> Self {
+        Self { dynamics, ..self }
+    }
 }
 
 impl From<&ApiLightStateUpdate> for LightUpdate {
@@ -694,6 +714,10 @@ impl From<&ApiLightStateUpdate> for LightUpdate {
             .with_color_temperature(upd.ct)
             .with_color_hs(upd.hs.map(Into::into))
             .with_color_xy(upd.xy.map(Into::into))
+            .with_dynamics(
+                upd.transitiontime
+                    .map(|t| LightDynamicsUpdate::new().with_duration(Some(t * 100))),
+            )
     }
 }
 

crates/hue/src/api/mod.rs

@@ -382,7 +382,8 @@ impl<'a> V1Reply<'a> {
         self.add_option("on", upd.on)?
             .add_option("bri", upd.bri)?
             .add_option("xy", upd.xy)?
-            .add_option("ct", upd.ct)
+            .add_option("ct", upd.ct)?
+            .add_option("transitiontime", upd.transitiontime)
     }
 
     pub fn add<T: Serialize>(mut self, name: &'a str, value: T) -> HueResult<Self> {

crates/hue/src/legacy_api.rs

@@ -484,6 +484,8 @@ pub struct ApiLightStateUpdate {
     pub ct: Option<u16>,
     #[serde(skip_serializing_if = "Option::is_none", flatten)]
     pub hs: Option<RawHS>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub transitiontime: Option<u16>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -519,6 +521,7 @@ impl From<api::SceneAction> for ApiLightStateUpdate {
             xy: action.color.map(|col| col.xy.into()),
             ct: action.color_temperature.and_then(|ct| ct.mirek),
             hs: None,
+            transitiontime: None,
         }
     }
 }