refactor code, fix config checker and new files for pyssg.xyz

1 files changed, 12 insertions, 19 deletions

diff --git a/src/pyssg/yaml_parser.py b/src/pyssg/yaml_parser.py
index f9303d6..3109cbc 100644
--- a/src/pyssg/yaml_parser.py
+++ b/src/pyssg/yaml_parser.py
@@ -12,30 +12,23 @@ log: Logger = getLogger(__name__)
 def __join_constructor(loader: SafeLoader, node: SequenceNode) -> str:
     seq = loader.construct_sequence(node)
     return ''.join([str(i) for i in seq])
-SafeLoader.add_constructor('!join', __join_constructor)
 
 
-# "file" is either a path or the yaml content itself
-def __read_raw_yaml(file: TextIOWrapper) -> list[dict]:
+def __read_raw_yaml(path: str) -> list[dict]:
     all_docs: list[dict] = []
-    all_docs_gen = yaml.safe_load_all(file)
-    for doc in all_docs_gen:
-        all_docs.append(doc)
-
+    with open(path, 'r') as f:
+        for doc in yaml.safe_load_all(f):
+            all_docs.append(doc)
     return all_docs
 
 
 def get_parsed_yaml(resource: str, package: str='') -> list[dict]:
-    all_yaml_docs: list[dict] = []
     if package == '':
-        log.debug('no package specified, reading file "%s"', resource)
-        with open(resource, 'r') as f:
-            all_yaml_docs = __read_raw_yaml(f)
-    else:
-        log.debug('package "%s" specified, reading resource "%s"',
-            package, resource)
-        with rpath(package, resource) as p:
-            with open(p, 'r') as f:
-                all_yaml_docs = __read_raw_yaml(f)
-
-    return all_yaml_docs
+        log.debug('parsing yaml; reading "%s"', resource)
+        return __read_raw_yaml(resource)
+    log.debug('parsing yaml; reading "%s.%s"', package, resource)
+    with rpath(package, resource) as p:
+        return __read_raw_yaml(str(p))
+
+
+SafeLoader.add_constructor('!join', __join_constructor)