This commit is contained in:
John Lancaster
2023-11-25 01:34:28 -06:00
parent 570fc40946
commit f4364764a1

View File

@@ -1,4 +1,3 @@
import json
from copy import deepcopy from copy import deepcopy
from datetime import time, timedelta from datetime import time, timedelta
from typing import List from typing import List
@@ -27,47 +26,25 @@ class RoomController(Hass, Mqtt):
self.log(f'Setting up input button: {self.friendly_name(ha_button)}') self.log(f'Setting up input button: {self.friendly_name(ha_button)}')
self.listen_state(callback=self.activate_any_on, entity_id=ha_button) self.listen_state(callback=self.activate_any_on, entity_id=ha_button)
# @property def refresh_state_times(self, *args, **kwargs):
# def entity(self) -> str: """Resets the `self.states` attribute to a newly parsed version of the states.
# return self.args['entity']
# @property Parsed states have an absolute time for a certain day.
# def entity_state(self) -> bool: """
# return self.get_state(self.entity) == 'on' # re-parse the state strings into times for the current day
self.states = self.parse_states()
# @entity_state.setter # schedule the transitions
# def entity_state(self, new): for state in self.states:
# if isinstance(new, str): dt = str(state['time'])[:8]
# if new == 'on': self.log(f'Scheduling transition at: {dt}')
# self.turn_on(self.entity) try:
# elif new == 'off': self.run_at(callback=self.activate_any_on, start=dt)
# self.turn_on(self.entity) except ValueError:
# else: # happens when the callback time is in the past
# raise ValueError(f'Invalid value for entity state: {new}') pass
# elif isinstance(new, bool): except Exception as e:
# if new: self.log(f'Failed with {type(e)}: {e}')
# self.turn_on(self.entity)
# self.log(f'Turned on {self.friendly_name(self.entity)}')
# else:
# self.turn_off(self.entity)
# self.log(f'Turned off {self.friendly_name(self.entity)}')
# elif isinstance(new, dict):
# if any(isinstance(val, dict) for val in new.values()):
# # self.log(f'Setting scene with nested dict: {new}')
# for entity, state in new.items():
# if state.pop('state', 'on') == 'on':
# # self.log(f'Setting {entity} state with: {state}')
# self.turn_on(entity_id=entity, **state)
# else:
# self.turn_off(entity)
# else:
# if new.pop('state', 'on') == 'on':
# self.turn_on(self.entity, **new)
# else:
# self.turn_off(self.entity)
# else:
# raise TypeError(f'Invalid type: {type(new)}: {new}')
def parse_states(self): def parse_states(self):
def gen(): def gen():
@@ -107,6 +84,7 @@ class RoomController(Hass, Mqtt):
time = time or self.get_now().time() time = time or self.get_now().time()
for state in self.states[::-1]: for state in self.states[::-1]:
if state['time'] <= time: if state['time'] <= time:
self.log(f'Selected state from {state["time"]}')
return state return state
else: else:
return self.states[-1] return self.states[-1]
@@ -237,22 +215,3 @@ class RoomController(Hass, Mqtt):
self.turn_off(entity) self.turn_off(entity)
self.log(f'Turned off {entity}') self.log(f'Turned off {entity}')
def refresh_state_times(self, *args, **kwargs):
"""Resets the `self.states` attribute to a newly parsed version of the states.
Parsed states have an absolute time for a certain day.
"""
# re-parse the state strings into times for the current day
self.states = self.parse_states()
# schedule the transitions
for state in self.states:
dt = str(state['time'])[:8]
self.log(f'Scheduling transition at: {dt}')
try:
self.run_at(callback=self.activate_any_on, start=dt)
except ValueError:
# happens when the callback time is in the past
pass
except Exception as e:
self.log(f'Failed with {type(e)}: {e}')