yaml doc headers, protect harvest

- protect harvest from missing doc header metadata
  - title & author required
- removed crude rgx yaml check
  (rely on yaml parser)

1 files changed, 19 insertions, 15 deletions

diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index 8f1f885..5576b1c 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -794,14 +794,17 @@ static template configParseYAMLreturnSpineStruct() {
     CCm     _make_and_meta_struct,
     M       _manifested
   ){
-    Node yaml_root;
-    try {
-      yaml_root = Loader.fromString(_document_struct.content).load();
-      _make_and_meta_struct
-        = contentYAMLtoSpineStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml
-    } catch {
-      import std.stdio;
-      writeln("ERROR failed to read content, not parsed as yaml");
+    Node _yaml;
+    if (_document_struct.content.length > 0) {
+      try {
+        _yaml = Loader.fromString(_document_struct.content).load();
+        _make_and_meta_struct
+          = contentYAMLtoSpineStruct!()(_make_and_meta_struct, _yaml, _manifested, _document_struct.filename); // struct from yaml
+      } catch {
+        import std.stdio;
+        writeln("ERROR failed to parse content as yaml: ", _document_struct.filename);
+        // writeln(_document_struct.content);
+      }
     }
     return _make_and_meta_struct;
   }
@@ -829,16 +832,17 @@ static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
     CCm     _make_and_meta_struct,
     M       _manifested,
   ) {
-    Node _yaml_root;
+    Node _yaml;
     try {
-      _yaml_root = Loader.fromString(header_src).load();
+      _yaml = Loader.fromString(header_src).load();
+      if (("title" in _yaml) && ("creator" in _yaml)) {} else { // need test for _yaml content (does not work)
+        writeln("ERROR failed to read document header, yaml header does not contain essential information related to title and author");
+      }
+      return contentYAMLtoSpineStruct!()(_make_and_meta_struct, _yaml, _manifested, "header");
     } catch {
       import std.stdio;
-      writeln("ERROR failed to read document header, not parsed as yaml");
+      writeln("ERROR failed to read document header, header not parsed as yaml: ", _manifested.src.filename);
+      return _make_and_meta_struct;
     }
-    // need test for _yaml_root content
-    auto _header_and_make_and_meta_struct
-      = contentYAMLtoSpineStruct!()(_make_and_meta_struct, _yaml_root, _manifested, "header");
-    return _header_and_make_and_meta_struct;
   }
 }