watching folders
This commit is contained in:
1 parent
579017d9ec
commit
e11f4deab5
3 files changed
+41
-27
No files matched your search
File renamed without changes.
@@ -1,3 +1,4 @@
|
|||||||
|
from curses.ascii import isdigit
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Iterator, Union, Dict
|
from typing import Any, Iterator, Union, Dict
|
||||||
from ..hass_config.loader import HassConfig
|
from ..hass_config.loader import HassConfig
|
||||||
@@ -61,47 +62,51 @@ def load_automation_path(automation_path: Path) -> Iterator[ExtenededAutomationD
|
|||||||
if not automation_path.exists():
|
if not automation_path.exists():
|
||||||
logger.warning(f"the file {automation_path} does not exists")
|
logger.warning(f"the file {automation_path} does not exists")
|
||||||
return
|
return
|
||||||
try:
|
if automation_path.is_dir():
|
||||||
with automation_path.open("r") as fp:
|
for f in extract_files(automation_path):
|
||||||
automations = load_yaml(fp)
|
yield from load_automation_path(f)
|
||||||
except Exception as err:
|
else:
|
||||||
raise InvalidAutomationFile(
|
|
||||||
when="loading yaml",
|
|
||||||
automation_path=automation_path,
|
|
||||||
error=err,
|
|
||||||
) from err
|
|
||||||
|
|
||||||
if isinstance(automations, dict):
|
|
||||||
try:
|
try:
|
||||||
yield ExtenededAutomationData(
|
with automation_path.open("r") as fp:
|
||||||
**clean_automation(automations),
|
automations = load_yaml(fp)
|
||||||
source_file=str(automation_path),
|
|
||||||
source_file_type="obj",
|
|
||||||
)
|
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
raise InvalidAutomationFile(
|
raise InvalidAutomationFile(
|
||||||
when="reading file contents",
|
when="loading yaml",
|
||||||
automation_path=automation_path,
|
automation_path=automation_path,
|
||||||
error=err,
|
error=err,
|
||||||
) from err
|
) from err
|
||||||
else:
|
|
||||||
if automations is None:
|
if isinstance(automations, dict):
|
||||||
logger.warning(f"the file {automation_path} is empty")
|
|
||||||
return
|
|
||||||
for automation in automations:
|
|
||||||
try:
|
try:
|
||||||
yield ExtenededAutomationData(
|
yield ExtenededAutomationData(
|
||||||
**clean_automation(automation),
|
**clean_automation(automations),
|
||||||
source_file=str(automation_path),
|
source_file=str(automation_path),
|
||||||
source_file_type="list",
|
source_file_type="obj",
|
||||||
)
|
)
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
raise InvalidAutomationFile(
|
raise InvalidAutomationFile(
|
||||||
when="reading file contents",
|
when="reading file contents",
|
||||||
automation_path=automation_path,
|
automation_path=automation_path,
|
||||||
error=err,
|
error=err,
|
||||||
automation=automation,
|
|
||||||
) from err
|
) from err
|
||||||
|
else:
|
||||||
|
if automations is None:
|
||||||
|
logger.warning(f"the file {automation_path} is empty")
|
||||||
|
return
|
||||||
|
for automation in automations:
|
||||||
|
try:
|
||||||
|
yield ExtenededAutomationData(
|
||||||
|
**clean_automation(automation),
|
||||||
|
source_file=str(automation_path),
|
||||||
|
source_file_type="list",
|
||||||
|
)
|
||||||
|
except Exception as err:
|
||||||
|
raise InvalidAutomationFile(
|
||||||
|
when="reading file contents",
|
||||||
|
automation_path=automation_path,
|
||||||
|
error=err,
|
||||||
|
automation=automation,
|
||||||
|
) from err
|
||||||
|
|
||||||
|
|
||||||
def clean_automation(auto_raw: dict):
|
def clean_automation(auto_raw: dict):
|
||||||
|
|||||||
+11
-2
@@ -1,5 +1,5 @@
|
|||||||
from src.automations_v2.watcher import AutomationFileWatcher
|
from src.automations_v2.automation_watcher import AutomationFileWatcher
|
||||||
from tests.utils import create_copy_of_example_config
|
from tests.utils import HA_CONFIG6_EXAMPLE, create_copy_of_example_config
|
||||||
from .utils import TestWithDB
|
from .utils import TestWithDB
|
||||||
|
|
||||||
|
|
||||||
@@ -30,6 +30,15 @@ class watcher_tests(TestWithDB):
|
|||||||
watcher.start()
|
watcher.start()
|
||||||
watcher.wait_until_next_reload(True)
|
watcher.wait_until_next_reload(True)
|
||||||
self.assertEqual(self.db.count_automations(), 0)
|
self.assertEqual(self.db.count_automations(), 0)
|
||||||
|
watcher.join()
|
||||||
|
|
||||||
|
def test_watch_folder(self):
|
||||||
|
example_folder = create_copy_of_example_config(HA_CONFIG6_EXAMPLE)
|
||||||
|
watcher = AutomationFileWatcher(example_folder / "automations", self.db_file)
|
||||||
|
watcher.start()
|
||||||
|
watcher.wait_until_next_reload(True)
|
||||||
|
self.assertEqual(self.db.count_automations(), 12)
|
||||||
|
watcher.join()
|
||||||
|
|
||||||
# def test_valid_changes(self):
|
# def test_valid_changes(self):
|
||||||
# example_folder = create_copy_of_example_config()
|
# example_folder = create_copy_of_example_config()
|
||||||
Reference in new issue
Block a user