Save Philips Hue effect state

Author: duvholt

crates/hue/src/api/light.rs

@@ -224,6 +224,20 @@ impl AddAssign<&LightUpdate> for Light {
                 grad.points.clone_from(&grupd.points);
             }
         }
+
+        if let Some(upd) = &upd.effects_v2 {
+            if let Some(effects) = &mut self.effects_v2 {
+                *effects += upd;
+            }
+            if let Some(effects) = &mut self.effects {
+                let light_effect = upd
+                    .action
+                    .as_ref()
+                    .and_then(|a| a.effect)
+                    .unwrap_or(LightEffect::NoEffect);
+                effects.status = light_effect;
+            }
+        }
     }
 }
 
@@ -537,7 +551,7 @@ impl LightEffects {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
 pub struct LightEffectsV2 {
     pub action: LightEffectValues,
     pub status: LightEffectStatus,
@@ -575,6 +589,19 @@ pub struct LightEffectsV2Update {
     pub status: Option<Value>,
 }
 
+impl AddAssign<&LightEffectsV2Update> for LightEffectsV2 {
+    fn add_assign(&mut self, upd: &LightEffectsV2Update) {
+        let light_effect = upd
+            .action
+            .as_ref()
+            .and_then(|a| a.effect)
+            .unwrap_or(LightEffect::NoEffect);
+
+        self.status.effect = light_effect;
+        self.status.parameters = upd.action.as_ref().map(|a| a.parameters.clone());
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(deny_unknown_fields)]
 pub struct LightEffectActionUpdate {
@@ -583,12 +610,12 @@ pub struct LightEffectActionUpdate {
     pub parameters: LightEffectParameters,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
 #[serde(deny_unknown_fields)]
 pub struct LightEffectParameters {
-    #[serde(default)]
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub color: Option<ColorUpdate>,
-    #[serde(default)]
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub color_temperature: Option<ColorTemperatureUpdate>,
     pub speed: Option<f32>,
 }
@@ -598,12 +625,12 @@ pub struct LightEffectValues {
     pub effect_values: Vec<LightEffect>,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
 pub struct LightEffectStatus {
     pub effect: LightEffect,
     pub effect_values: Vec<LightEffect>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub parameters: Option<Value>,
+    pub parameters: Option<LightEffectParameters>,
 }
 
 #[derive(Debug, Default, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]

crates/hue/src/api/mod.rs

@@ -38,11 +38,11 @@ pub use light::{
     DimmingDeltaAction, DimmingDeltaUpdate, DimmingUpdate, GamutType, Light, LightAlert,
     LightColor, LightDynamics, LightDynamicsStatus, LightDynamicsUpdate, LightEffect,
     LightEffectActionUpdate, LightEffectParameters, LightEffectStatus, LightEffectValues,
-    LightEffects, LightEffectsV2, LightEffectsV2Update, LightFunction, LightGradient,
-    LightGradientMode, LightGradientPoint, LightGradientUpdate, LightMetadata, LightMode,
-    LightPowerup, LightPowerupColor, LightPowerupDimming, LightPowerupOn, LightPowerupPreset,
-    LightProductData, LightSignal, LightSignaling, LightTimedEffect, LightTimedEffects,
-    LightTimedEffectsUpdate, LightUpdate, MirekSchema, On,
+    LightEffects, LightEffectsUpdate, LightEffectsV2, LightEffectsV2Update, LightFunction,
+    LightGradient, LightGradientMode, LightGradientPoint, LightGradientUpdate, LightMetadata,
+    LightMode, LightPowerup, LightPowerupColor, LightPowerupDimming, LightPowerupOn,
+    LightPowerupPreset, LightProductData, LightSignal, LightSignaling, LightTimedEffect,
+    LightTimedEffects, LightTimedEffectsUpdate, LightUpdate, MirekSchema, On,
 };
 pub use resource::{RType, ResourceLink, ResourceRecord};
 pub use room::{Room, RoomArchetype, RoomMetadata, RoomMetadataUpdate, RoomUpdate};

src/backend/z2m/backend_event.rs

@@ -10,9 +10,10 @@ use uuid::Uuid;
 use bifrost_api::backend::BackendRequest;
 use hue::api::{
     BridgeHome, ColorTemperatureUpdate, DimmingDeltaAction, Entertainment,
-    EntertainmentConfiguration, GroupedLight, GroupedLightUpdate, Light, LightEffectsV2Update,
-    LightGradientMode, LightUpdate, RType, Resource, ResourceLink, Room, RoomUpdate, Scene,
-    SceneActive, SceneStatus, SceneStatusEnum, SceneUpdate, ZigbeeDeviceDiscoveryUpdate,
+    EntertainmentConfiguration, GroupedLight, GroupedLightUpdate, Light, LightEffect,
+    LightEffectsV2Update, LightGradientMode, LightUpdate, RType, Resource, ResourceLink, Room,
+    RoomUpdate, Scene, SceneActive, SceneStatus, SceneStatusEnum, SceneUpdate,
+    ZigbeeDeviceDiscoveryUpdate,
 };
 use hue::error::HueError;
 use hue::stream::HueStreamLightsV2;
@@ -116,6 +117,22 @@ impl Z2mBackend {
                 }
             })?;
         }
+        // Effect state is currently not retrieved from backend updates either
+        if let Some(upd) = upd.effects_v2.as_ref() {
+            lock.update::<Light>(&link.rid, |light| {
+                if let Some(effects_v2) = &mut light.effects_v2 {
+                    *effects_v2 += upd;
+                }
+                if let Some(effects) = &mut light.effects {
+                    let light_effect = upd
+                        .action
+                        .as_ref()
+                        .and_then(|a| a.effect)
+                        .unwrap_or(LightEffect::NoEffect);
+                    effects.status = light_effect;
+                }
+            })?;
+        }
         let hue_effects = lock.get::<Light>(link)?.effects.is_some();
         drop(lock);