Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Refactored light.hue integration so EntityUpdateEvents won't be triggered on every call to _get_lights

Browse source
This commit is contained in:
Fabio Manganiello 2023-01-21 14:48:33 +01:00
parent dfb13127ee
commit 247912799f
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
platypush/plugins/light/hue/__init__.py
View file

@ -102,7 +102,7 @@ class LightHuePlugin(RunnablePlugin, LightPlugin):
def _expand_groups(self, groups: Iterable[str]) -> Set[str]: def _expand_groups(self, groups: Iterable[str]) -> Set[str]:
lights = set() lights = set()
light_id_to_name = { light_id_to_name = {
light_id: light['name'] for light_id, light in self._get_lights().items() light_id: light['name'] for light_id, light in (self._get_lights().items())
} }
groups_ = [g for g in self._get_groups().values() if g.get('name') in groups] groups_ = [g for g in self._get_groups().values() if g.get('name') in groups]
@ -245,7 +245,7 @@ class LightHuePlugin(RunnablePlugin, LightPlugin):
'id': id, 'id': id,
**light, **light,
} }
for id, light in self._get_lights().items() for id, light in self._get_lights(publish_entities=True).items()
} }
@action @action
@ -389,7 +389,7 @@ class LightHuePlugin(RunnablePlugin, LightPlugin):
self.bridge = None self.bridge = None
raise e raise e
return self._get_lights() return self._get_lights(publish_entities=True)
@action @action
def set_lights(self, lights, **kwargs): def set_lights(self, lights, **kwargs):
@ -435,7 +435,7 @@ class LightHuePlugin(RunnablePlugin, LightPlugin):
args += [arg, value] args += [arg, value]
self.bridge.set_light(lights, *args) self.bridge.set_light(lights, *args)
return self._get_lights() return self._get_lights(publish_entities=True)
@action @action
def set_group(self, group, **kwargs): def set_group(self, group, **kwargs):
@ -1151,11 +1151,12 @@ class LightHuePlugin(RunnablePlugin, LightPlugin):
return super().transform_entities(new_entities) # type: ignore return super().transform_entities(new_entities) # type: ignore
def _get_lights(self) -> dict: def _get_lights(self, publish_entities=False) -> dict:
assert self.bridge, self._UNINITIALIZED_BRIDGE_ERR assert self.bridge, self._UNINITIALIZED_BRIDGE_ERR
lights = self.bridge.get_light() lights = self.bridge.get_light()
lights = {id: light for id, light in lights.items() if not light.get('recycle')} lights = {id: light for id, light in lights.items() if not light.get('recycle')}
self._cached_lights = lights self._cached_lights = lights
if publish_entities:
self.publish_entities(lights) # type: ignore self.publish_entities(lights) # type: ignore
return lights return lights
@ -1171,7 +1172,7 @@ class LightHuePlugin(RunnablePlugin, LightPlugin):
@action @action
def status(self) -> Iterable[LightEntity]: def status(self) -> Iterable[LightEntity]:
lights = self.transform_entities(self._get_lights()) lights = self.transform_entities(self._get_lights(publish_entities=True))
for light in lights: for light in lights:
light.id = light.external_id light.id = light.external_id
for attr, value in (light.data or {}).items(): for attr, value in (light.data or {}).items():
@ -1185,7 +1186,7 @@ class LightHuePlugin(RunnablePlugin, LightPlugin):
return lights return lights
def main(self): def main(self):
lights_prev = self._get_lights() # Initialize the lights lights_prev = self._get_lights(publish_entities=True) # Initialize the lights
while not self.should_stop(): while not self.should_stop():
try: try: