From f2f033305c7c031017cf8b8a6b7edf18e3a0ce67 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 21 Nov 2019 10:31:38 -0500 Subject: yaml config, provide default if not read --- src/doc_reform/spine.d | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/doc_reform/spine.d') diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d index 9dae5c4..4476b6d 100755 --- a/src/doc_reform/spine.d +++ b/src/doc_reform/spine.d @@ -537,13 +537,15 @@ void main(string[] args) { ]; auto _manifested = PathMatters!()(_opt_action, _env, ""); auto _manifests = [ _manifested ]; + auto _conf_file_details = ConfigFilePaths!()(_manifested, _env, _opt_action.config_path_set); ConfComposite _make_and_meta_struct; if (_opt_action.config_path_set.empty) { foreach(arg; args[1..$]) { if (!(arg.match(rgx.flag_action))) { /+ cli markup source path +/ // get first input markup source file names for processing _manifested = PathMatters!()(_opt_action, _env, arg); { /+ local site config +/ - auto _config_local_site_struct = readConfigSite!()(_manifested, _env); + _conf_file_details = ConfigFilePaths!()(_manifested, _env, _opt_action.config_path_set); + auto _config_local_site_struct = readConfigSite!()(_conf_file_details); if (_config_local_site_struct.filetype == "yaml") { import doc_reform.meta.conf_make_meta_yaml; _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifested); // - get local site config @@ -554,7 +556,7 @@ void main(string[] args) { } } else { { /+ local site config +/ - auto _config_local_site_struct = readConfigSite!()(_manifested, _env, _opt_action.config_path_set); + auto _config_local_site_struct = readConfigSite!()(_conf_file_details); if (_config_local_site_struct.filetype == "yaml") { import doc_reform.meta.conf_make_meta_yaml; _make_and_meta_struct = _config_local_site_struct.configParseYAMLreturnSpineStruct!()(_make_and_meta_struct, _manifested); // - get local site config -- cgit v1.2.3