From 1c73ddf3894085c646b55d63e61a2483e03a3b4d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 9 Feb 2018 22:03:10 -0500
Subject: 0.24.0 toml or sdlang for configuration

---
 src/sdp/output/source_sisupod.d | 58 +++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

(limited to 'src/sdp/output/source_sisupod.d')

diff --git a/src/sdp/output/source_sisupod.d b/src/sdp/output/source_sisupod.d
index 4e3bfc1..3f95b62 100644
--- a/src/sdp/output/source_sisupod.d
+++ b/src/sdp/output/source_sisupod.d
@@ -97,34 +97,36 @@ template SiSUpod() {
           }
         }
       } { /+ bundle sisu_document_make +/
-        auto fn_src_in = ((doc_matters.src.is_pod)
-          ? doc_matters.src.conf_dir_path
-          : pth_sisudoc_src.conf_root).to!string
-          ~ "/" ~ "sisu_document_make";
-        auto fn_src_out_sisupod_zip_base
-          = pths_sisupod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "sisu_document_make";
-        auto fn_src_out_filesystem
-          = pths_sisupod.conf_root(doc_matters.src.filename).filesystem_open_zpod.to!string
-          ~ "/" ~ "sisu_document_make"; // TODO
-        if (exists(fn_src_in)) {
-          debug(io) {
-            writeln("WARNING (io debug) src out found: ", fn_src_in);
-          }
-          if (doc_matters.opt.action.source) {
-            fn_src_in.copy(fn_src_out_filesystem);
-          }
-          if (doc_matters.opt.action.sisupod) {
-            auto zip_arc_member_file = new ArchiveMember();
-            zip_arc_member_file.name = fn_src_out_sisupod_zip_base;
-            auto zip_data = new OutBuffer();
-            zip_data.write((fn_src_in).readText);
-            zip_arc_member_file.expandedData = zip_data.toBytes();
-            zip.addMember(zip_arc_member_file);
-          }
-        } else {
-          if (doc_matters.opt.action.verbose
-          || doc_matters.opt.action.debug_do) {
-            writeln("WARNING (io) src out NOT found (document make): ", fn_src_in);
+        foreach (extension; [".sdl", ".toml"]) {
+          auto fn_src_in = ((doc_matters.src.is_pod)
+            ? doc_matters.src.conf_dir_path
+            : pth_sisudoc_src.conf_root).to!string
+            ~ "/" ~ "sisu_document_make" ~ extension;
+          auto fn_src_out_sisupod_zip_base
+            = pths_sisupod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "sisu_document_make";
+          auto fn_src_out_filesystem
+            = pths_sisupod.conf_root(doc_matters.src.filename).filesystem_open_zpod.to!string
+            ~ "/" ~ "sisu_document_make" ~ extension; // TODO
+          if (exists(fn_src_in)) {
+            debug(io) {
+              writeln("WARNING (io debug) src out found: ", fn_src_in);
+            }
+            if (doc_matters.opt.action.source) {
+              fn_src_in.copy(fn_src_out_filesystem);
+            }
+            if (doc_matters.opt.action.sisupod) {
+              auto zip_arc_member_file = new ArchiveMember();
+              zip_arc_member_file.name = fn_src_out_sisupod_zip_base;
+              auto zip_data = new OutBuffer();
+              zip_data.write((fn_src_in).readText);
+              zip_arc_member_file.expandedData = zip_data.toBytes();
+              zip.addMember(zip_arc_member_file);
+            }
+          } else {
+            if (doc_matters.opt.action.verbose
+            || doc_matters.opt.action.debug_do) {
+              writeln("WARNING (io) src out NOT found (document make): ", fn_src_in);
+            }
           }
         }
       } { /+ TODO bundle primary file +/
-- 
cgit v1.2.3