sv/tsun-gen3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Stefan Allius
2024-04-06 20:20:42 +02:00
parent 156eb06b6a
commit 2153d7c15c
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/infos.py
View File

@@ -100,7 +100,7 @@ class ClrAtMidnight:
db = {} db = {}
@classmethod @classmethod
def add(cls, keys, prfx: str, reg: Register): def add(cls, keys: list, prfx: str, reg: Register) -> None:
if reg not in cls.__clr_at_midnight: if reg not in cls.__clr_at_midnight:
return return
@@ -117,7 +117,7 @@ class ClrAtMidnight:
dict[keys[-1]] = 0 dict[keys[-1]] = 0
@classmethod @classmethod
def elm(cls) -> Generator: def elm(cls) -> Generator[tuple[str, dict], None, None]:
for reg, name in cls.db.items(): for reg, name in cls.db.items():
yield reg, name yield reg, name
cls.db = {} cls.db = {}
@@ -273,24 +273,14 @@ class Infos:
@property @property
def info_defs(self) -> dict: def info_defs(self) -> dict:
return self.__info_defs return self.__info_defs
'''
if __name__ == "app.src.messages":
@info_defs.setter
def info_defs(self, value: dict) -> None:
self.__info_defs = value
@info_devs.setter
def info_devs(self, value: dict) -> None:
self.__info_devs = value
'''
def dev_value(self, idx: str | int) -> str | int | float | None: def dev_value(self, idx: str | int) -> str | int | float | None:
'''returns the stored device value from our database '''returns the stored device value from our database
idx:int ==> lookup the value in the database and return it as str, idx:int ==> lookup the value in the database and return it as str,
int or flout. If the value is not available return 'None' int or float. If the value is not available return 'None'
idx:str ==> returns the string as a fixed value without a idx:str ==> returns the string as a fixed value without a
database loopup database lookup
''' '''
if type(idx) is str: if type(idx) is str:
return idx # return idx as a fixed value return idx # return idx as a fixed value
@@ -340,7 +330,8 @@ class Infos:
if res: if res:
yield res yield res
def ha_conf(self, key, ha_prfx, node_id, snr, singleton: bool, sug_area: str = '') -> tuple[str, str, str, str]: # noqa: E501 def ha_conf(self, key, ha_prfx, node_id, snr, singleton: bool,
sug_area: str = '') -> tuple[str, str, str, str] | None:
if key not in self.info_defs: if key not in self.info_defs:
return None return None
row = self.info_defs[key] row = self.info_defs[key]
@@ -444,7 +435,7 @@ class Infos:
return json.dumps(attr), component, node_id, attr['uniq_id'] return json.dumps(attr), component, node_id, attr['uniq_id']
return None return None
def _key_obj(self, id) -> list: def _key_obj(self, id: Register) -> list:
d = self.info_defs.get(id, {'name': None, 'level': logging.DEBUG, d = self.info_defs.get(id, {'name': None, 'level': logging.DEBUG,
'unit': ''}) 'unit': ''})
if 'ha' in d and 'must_incr' in d['ha']: if 'ha' in d and 'must_incr' in d['ha']:
@@ -454,7 +445,7 @@ class Infos:
return d['name'], d['level'], d['unit'], must_incr return d['name'], d['level'], d['unit'], must_incr
def update_db(self, keys, must_incr, result): def update_db(self, keys: list, must_incr: bool, result):
name = '' name = ''
dict = self.db dict = self.db
for key in keys[:-1]: for key in keys[:-1]:
@@ -474,14 +465,20 @@ class Infos:
name += keys[-1] name += keys[-1]
return name, update return name, update
def set_db_def_value(self, id, value): def set_db_def_value(self, id: Register, value) -> None:
'''set default value''' '''set default value'''
row = self.info_defs[id] row = self.info_defs[id]
if isinstance(row, dict): if isinstance(row, dict):
keys = row['name'] keys = row['name']
self.update_db(keys, False, value) self.update_db(keys, False, value)
def reg_clr_at_midnight(self, prfx: str): def reg_clr_at_midnight(self, prfx: str) -> None:
'''register all registers for the 'ClrAtMidnight' class and
check if device of every register is available otherwise ignore
the register.
prfx:str ==> prefix for the home assistant 'stat_t string''
'''
for id, row in self.info_defs.items(): for id, row in self.info_defs.items():
if 'ha' in row: if 'ha' in row:
ha = row['ha'] ha = row['ha']
@@ -493,23 +490,21 @@ class Infos:
keys = row['name'] keys = row['name']
ClrAtMidnight.add(keys, prfx, id) ClrAtMidnight.add(keys, prfx, id)
def get_db_value(self, id, not_found_result=None): def get_db_value(self, id: Register, not_found_result: any = None):
'''get database value''' '''get database value'''
row = self.info_defs[id] row = self.info_defs[id]
if isinstance(row, dict): if isinstance(row, dict):
keys = row['name'] keys = row['name']
elm = self.db elm = self.db
for key in keys[:-1]: for key in keys:
if key not in elm: if key not in elm:
return not_found_result return not_found_result
elm = elm[key] elm = elm[key]
return elm
if keys[-1] in elm:
return elm[keys[-1]]
return not_found_result return not_found_result
def ignore_this_device(self, dep: dict) -> bool: def ignore_this_device(self, dep: dict) -> bool:
'''Checks the equation in the dep dict '''Checks the equation in the dep(endency) dict
returns 'False' only if the equation is valid; returns 'False' only if the equation is valid;
'True' in any other case''' 'True' in any other case'''