From d61236952f19c1a1107a11cf11874104c0fe1a9b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 14 Nov 2019 11:16:09 -0500 Subject: 0.8.3 (if exists) get site config & output path - read once & read early: - once per batch processing - early (needed by metadata --harvest) --- src/doc_reform/meta/metadoc.d | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/doc_reform/meta/metadoc.d') diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d index 69f7142..4fb9677 100644 --- a/src/doc_reform/meta/metadoc.d +++ b/src/doc_reform/meta/metadoc.d @@ -30,13 +30,13 @@ template DocReformAbstraction() { enum makeMeta { make, meta } enum docAbst { doc_abstract_obj, doc_has } static auto rgx = Rgx(); - auto DocReformAbstraction(E,P,O,M)( + auto DocReformAbstraction(E,P,O,M,S)( E _env, P program_info, O _opt_action, - M _manifest + M _manifest, + S _make_and_meta_struct ){ - ConfCompositePlus _make_and_meta_struct; { /+ document config/make file +/ auto _config_document_struct = readConfigDoc!()(_manifest, _env); if (_config_document_struct.filetype == "yaml") { @@ -44,13 +44,6 @@ template DocReformAbstraction() { _make_and_meta_struct = _config_document_struct.configParseYAMLreturnDocReformStruct!()(_make_and_meta_struct, _manifest); } } - { /+ local site config +/ - auto _config_local_site_struct = readConfigSite!()(_manifest, _env); - if (_config_local_site_struct.filetype == "yaml") { - import doc_reform.meta.conf_make_meta_yaml; - _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnDocReformStruct!()(_make_and_meta_struct, _manifest); - } - } /+ ↓ read file (filename with path) +/ /+ ↓ file tuple of header and content +/ if ((_opt_action.debug_do) -- cgit v1.2.3