From d34bf71b27fd2f7adaa04c69e94194ee093db107 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Sat, 4 May 2024 21:44:37 -0500
Subject: [PATCH] improved generators

---
 directory_monitor.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/directory_monitor.py b/directory_monitor.py
index 029da2f..889468e 100644
--- a/directory_monitor.py
+++ b/directory_monitor.py
@@ -1,4 +1,5 @@
 import asyncio
+from io import StringIO
 import logging
 from dataclasses import dataclass, field
 from datetime import datetime
@@ -174,14 +175,23 @@ class AppLoader:
             }
             logger.debug(app_configs)
 
-    async def gen_raw_app_configs(self, configs_to_load: Iterable[Path]):
-        for config_file in configs_to_load:
+    async def gen_raw_config_text(self, configs_to_load: Iterable[Path]):
+        for file in configs_to_load:
             try:
-                with Path(config_file).open('r') as f:
-                    yield yaml.safe_load(f)
+                text = await file.read_text()
             except Exception as e:
-                logger.exception(e)
-                logger.error(f'Error reading from {config_file}')
+                # logger.exception(e)
+                logger.error(f'Error reading {file}')
+            else:
+                yield file, text
+
+    async def gen_raw_app_configs(self, configs_to_load: Iterable[Path]):
+        async for file, text in self.gen_raw_config_text(configs_to_load):
+            try:
+                yield yaml.safe_load(StringIO(text))
+            except Exception as e:
+                # logger.exception(e)
+                logger.error(f'Error parsing YAML from {file}')
 
     async def gen_valid_app_configs(self, configs_to_load: Iterable[Path]):
         async for raw_full_cfg in self.gen_raw_app_configs(configs_to_load):