From ec7c28adbae0657ca961e9cf0949bb49b3c4164a Mon Sep 17 00:00:00 2001 From: Ari Date: Sat, 25 Jun 2022 23:04:03 -0400 Subject: [PATCH] using automation id instead of idx for tags --- api/src/automations/errors.py | 5 ++++- api/src/automations/manager.py | 17 ++++++++++------- api/src/automations/tags.py | 2 +- api/src/yaml_serializer/loader.py | 6 ------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/api/src/automations/errors.py b/api/src/automations/errors.py index c688b48..002c7d7 100644 --- a/api/src/automations/errors.py +++ b/api/src/automations/errors.py @@ -1,5 +1,8 @@ class AutomationLoaderException(Exception): - pass + def __init__(self, *args: object, **kwargs) -> None: + super().__init__( + "".join(args) + ",".join((f"{k}={v}" for k, v in kwargs.items())), + ) class InvalidAutomationFile(AutomationLoaderException): diff --git a/api/src/automations/manager.py b/api/src/automations/manager.py index 707da9d..a360a7c 100644 --- a/api/src/automations/manager.py +++ b/api/src/automations/manager.py @@ -1,6 +1,6 @@ from typing import Iterator, List, Optional -from src.automations.errors import FailedDeletion +from src.automations.errors import FailedDeletion, InvalidAutomationFile from src.automations.types import AutomationData, ExtenededAutomationData from src.hass_config.loader import HassConfig @@ -22,29 +22,32 @@ class AutomationManager: continue if i >= offset + limit: break - yield from load_automation(auto, tags.get(i, {})) + yield from load_automation(auto, tags.get(auto.get("id", ""), {})) def get(self, index: int) -> Optional[AutomationData]: tags = self.hass_config.automation_tags if index >= 0: for i, auto in enumerate(self.hass_config.automations): + if not isinstance(auto, dict): + raise InvalidAutomationFile(automation_index=i) if i == index: - return next(load_automation(auto, tags.get(i, {}))) + return next(load_automation(auto, tags.get(auto.get("id", ""), {}))) return None def update(self, index: int, automation: ExtenededAutomationData): tags = self.hass_config.automation_tags automations: List[dict] = [] - updated = False + updated_index: Optional[int] = None for i, orig_auto in enumerate(self.hass_config.automations): if i == index: automations.append(automation.to_primitive()) - updated = True + updated_index = i else: automations.append(orig_auto) - if not updated: + if updated_index is None: automations.append(automation.to_primitive()) - tags[index] = automation.tags + updated_index = len(automations) - 1 + tags[updated_index] = automation.tags self.hass_config.save_automations(automations) self.hass_config.save_tags(tags) diff --git a/api/src/automations/tags.py b/api/src/automations/tags.py index 5bc33a1..c71d53d 100644 --- a/api/src/automations/tags.py +++ b/api/src/automations/tags.py @@ -4,7 +4,7 @@ from typing import Dict from src.yaml_serializer import dump_yaml, load_yaml -class TagManager(Dict[int, Dict[str, str]]): +class TagManager(Dict[str, Dict[str, str]]): def save(self, path: Path): path.write_text(dump_yaml(dict(self))) diff --git a/api/src/yaml_serializer/loader.py b/api/src/yaml_serializer/loader.py index ea989c2..986c15e 100644 --- a/api/src/yaml_serializer/loader.py +++ b/api/src/yaml_serializer/loader.py @@ -9,12 +9,6 @@ from src.yaml_serializer.types import ( class YamlSafeLoader(yaml.SafeLoader): pass - # def compose_node(self, parent: yaml.nodes.Node, index: int) -> yaml.nodes.Node: # type: ignore[override] - # """Annotate a node with the first line it was seen.""" - # last_line: int = self.line - # node: yaml.nodes.Node = super().compose_node(parent, index) # type: ignore[assignment] - # node.__line__ = last_line + 1 # type: ignore[attr-defined] - # return node YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)