aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sdp/meta/metadoc.d
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2018-02-27 15:40:05 -0500
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:14 -0400
commitcf2fd4660ed50da2fbccec7912e429f1d5e37377 (patch)
treef573231485287877c84f4dfb1f0af5275c35b353 /src/sdp/meta/metadoc.d
parentplaying with header/make substitutions (diff)
0.25.0 remove sdlang (headers, conf, make doc)
Diffstat (limited to 'src/sdp/meta/metadoc.d')
-rw-r--r--src/sdp/meta/metadoc.d35
1 files changed, 8 insertions, 27 deletions
diff --git a/src/sdp/meta/metadoc.d b/src/sdp/meta/metadoc.d
index 8223029..37545f0 100644
--- a/src/sdp/meta/metadoc.d
+++ b/src/sdp/meta/metadoc.d
@@ -10,7 +10,6 @@ template SiSUabstraction() {
sdp.meta.metadoc_summary,
sdp.meta.metadoc_from_src,
sdp.meta.conf_make_meta_structs,
- sdp.meta.conf_make_meta_sdlang,
sdp.meta.conf_make_meta_toml,
sdp.meta.conf_make_meta_json,
sdp.meta.defaults,
@@ -21,8 +20,6 @@ template SiSUabstraction() {
sdp.output.hub,
sdp.output.paths_source;
mixin SiSUrgxInit;
- mixin SiSUmakeMetaStructsSDLang;
- mixin SiSUextractSDLang;
mixin contentJSONtoSiSUstruct;
mixin SiSUnode;
mixin SiSUbiblio;
@@ -37,22 +34,11 @@ template SiSUabstraction() {
O _opt_action,
M _manifest,
){
- auto _config_document_struct = readConfigDoc!()(_manifest, _env); // document config file
+ auto _config_document_struct = readConfigDoc!()(_manifest, _env); // document config file
auto _config_local_site_struct = readConfigSite!()(_manifest, _env); // local site config
ConfCompositePlus _make_and_meta_struct;
- switch (_config_local_site_struct.filetype) {
- case "toml" :
- _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_document_struct);
- _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_local_site_struct);
- break;
- case "sdl" :
- auto sdl_root_config_document = parseSDLangConfig!()(_config_document_struct.content, _config_document_struct.filename);
- auto sdl_root_config_local_site = parseSDLangConfig!()(_config_local_site_struct.content, _config_local_site_struct.filename);
- _make_and_meta_struct = confFilesSDLtoStruct!()(sdl_root_config_document, sdl_root_config_local_site);
- break;
- default :
- break;
- }
+ _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_document_struct);
+ _make_and_meta_struct = configParseTOMLreturnSiSUstruct!()(_make_and_meta_struct, _config_local_site_struct);
/+ ↓ read file (filename with path) +/
/+ ↓ file tuple of header and content +/
debug(steps) {
@@ -73,18 +59,13 @@ template SiSUabstraction() {
}
/+ ↓ split header into make and meta +/
debug(steps) {
- writeln("step2 commence → (read document header - toml or sdlang, return struct)");
+ writeln("step2 commence → (read document header - toml, return struct)");
}
_make_and_meta_struct =
- ((_header_body_insertfilelist_imagelist[headBody.header]).match(rgx.toml_header_meta_title))
- ? docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct!()(
- _make_and_meta_struct,
- _header_body_insertfilelist_imagelist[headBody.header]
- )
- : docHeaderMakeAndMetaTupSDLangExtractAndConvertToStruct!()(
- _make_and_meta_struct,
- _header_body_insertfilelist_imagelist[headBody.header]
- );
+ docHeaderMakeAndMetaTupTomlExtractAndConvertToStruct!()(
+ _make_and_meta_struct,
+ _header_body_insertfilelist_imagelist[headBody.header]
+ );
debug(steps) {
writeln("- step2 complete");
}