From 99de6c56f71bcc0588aa1d888a5278aba15ec237 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 8 Dec 2019 19:26:13 -0500 Subject: yaml doc headers, protect harvest - protect harvest from missing doc header metadata - title & author required - removed crude rgx yaml check (rely on yaml parser) --- org/in_source_files.org | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'org/in_source_files.org') diff --git a/org/in_source_files.org b/org/in_source_files.org index 907820c..20d8d0a 100644 --- a/org/in_source_files.org +++ b/org/in_source_files.org @@ -166,7 +166,7 @@ static template readConfigDoc() { string[] possible_config_path_locations = _conf_file_details.possible_config_path_locations.dr_document_make; foreach(conf_fn; [_conf_file_details.config_filename_document]) { foreach(pth; possible_config_path_locations) { - auto conf_file = ((chainPath(pth.to!string, conf_fn)).asNormalizedPath).array; + char[] conf_file = ((chainPath(pth.to!string, conf_fn)).asNormalizedPath).array; conf_filename = conf_fn; if (config_file_str.length > 0) { break; @@ -316,17 +316,13 @@ static template spineRawMarkupContent() { images_list = tu[2].dup; } string header_type = ""; - if (header_raw.match(rgx.yaml_config)) { - header_type = "yaml"; - } t = tuple( header_raw, sourcefile_body_content, - header_type, insert_file_list, images_list ); - static assert(t.length==5); + static assert(t.length==4); return t; } } @@ -376,7 +372,7 @@ static template spineRawMarkupContent() { #+BEGIN_SRC d final private string readInMarkupSource(in char[] fn_src) { enforce( - exists(fn_src)!=0, + exists(fn_src) != 0, "file not found: «" ~ fn_src ~ "»" ); @@ -468,14 +464,9 @@ auto markupSourceHeaderContentRawLineTupleArray(in string source_txt_str) @safe char[] header = hc[0]; char[] source_txt = hc[1]; auto source_line_arr = markupSourceLineArray(source_txt); - string header_type = ""; - if (header.match(rgx.yaml_config)) { - header_type = "yaml"; - } auto t = tuple( header, source_line_arr, - header_type, file_insert_list, images_list ); -- cgit v1.2.3