multilingual pods, zipped source

3 files changed, 126 insertions, 75 deletions

diff --git a/src/doc_reform/doc_reform.d b/src/doc_reform/doc_reform.d
index 40f1a05..e6a9b59 100755
--- a/src/doc_reform/doc_reform.d
+++ b/src/doc_reform/doc_reform.d
@@ -240,7 +240,7 @@ void main(string[] args) {
   if (helpInfo.helpWanted) {
     defaultGetoptPrinter("Some information about the program.", helpInfo.options);
   }
-  enum outTask { pod, source, sqlite, sqlite_multi, latex, odt, epub, html_scroll, html_seg, html_stuff }
+  enum outTask { source_or_pod, sqlite, sqlite_multi, latex, odt, epub, html_scroll, html_seg, html_stuff }
   struct OptActions {
     bool assertions() {
       return opts["assertions"];
@@ -359,6 +359,9 @@ void main(string[] args) {
     bool source() {
       return opts["source"];
     }
+    bool source_or_pod() {
+      return (opts["pod"] || opts["source"]) ? true : false;
+    }
     bool sqlite_discrete() {
       return opts["sqlite-discrete"];
     }
@@ -463,8 +466,7 @@ void main(string[] args) {
         || odt
         || latex
         || manifest
-        || pod
-        || source
+        || source_or_pod
         || sqlite_discrete
       ) {
         _is = true;
@@ -476,11 +478,8 @@ void main(string[] args) {
     }
     auto output_task_scheduler() {
       int[] schedule;
-      if (pod) {
-        schedule ~= outTask.pod;
-      }
-      if (source) {
-        schedule ~= outTask.source;
+      if (source_or_pod) {
+        schedule ~= outTask.source_or_pod;
       }
       if (sqlite_discrete) {
         schedule ~= outTask.sqlite;
@@ -509,8 +508,7 @@ void main(string[] args) {
       bool _is;
       if (opts["abstraction"]
         || concordance
-        || source
-        || pod
+        || source_or_pod
         || harvest
         || html
         || epub
diff --git a/src/doc_reform/output/hub.d b/src/doc_reform/output/hub.d
index a4a402b..227cd3b 100644
--- a/src/doc_reform/output/hub.d
+++ b/src/doc_reform/output/hub.d
@@ -15,24 +15,22 @@ template outputHub() {
     mixin Msg;
     auto msg = Msg!()(doc_matters);
     static auto rgx = Rgx();
-    enum outTask { pod, source, sqlite, sqlite_multi, latex, odt, epub, html_scroll, html_seg, html_stuff }
+    enum outTask { source_or_pod, sqlite, sqlite_multi, latex, odt, epub, html_scroll, html_seg, html_stuff }
     void Scheduled(D,I)(int sched, D doc_abstraction, I doc_matters) {
       auto msg = Msg!()(doc_matters);
-      if (sched == outTask.source
-        || sched == outTask.pod
-      ) {
-        if (sched == outTask.source) {
+      if (sched == outTask.source_or_pod) {
+        if (doc_matters.opt.action.source) {
           msg.v("doc reform source processing... ");
         }
-        if (sched == outTask.pod) {
+        if (doc_matters.opt.action.pod) {
           msg.v("doc reform source pod processing... ");
         }
         import doc_reform.output.source_pod;
         DocReformPod!()(doc_matters);
-        if (sched == outTask.source) {
+        if (doc_matters.opt.action.source) {
           msg.vv("doc reform source done");
         }
-        if (sched == outTask.pod) {
+        if (doc_matters.opt.action.pod) {
           msg.vv("doc reform source pod done");
         }
       }
diff --git a/src/doc_reform/output/source_pod.d b/src/doc_reform/output/source_pod.d
index bf07715..3b1261b 100644
--- a/src/doc_reform/output/source_pod.d
+++ b/src/doc_reform/output/source_pod.d
@@ -23,6 +23,31 @@ template DocReformPod() {
     auto lang = Lang();
     static auto rgx = Rgx();
     assert (doc_matters.src.filename.match(rgx.src_fn));
+    auto pod_archive(Z)(
+      string _source_type,
+      string _data_in,
+      string _pth_out,
+      Z zip
+    ) {
+      auto zip_arc_member_file = new ArchiveMember();
+      zip_arc_member_file.name = _pth_out;
+      auto zip_data = new OutBuffer();
+      switch (_source_type) {
+      case "file_path_bin":
+        zip_data.write(cast(char[]) ((_data_in).read));
+        goto default;
+      case "file_path_text":
+        zip_data.write((_data_in).readText);
+        goto default;
+      case "string":
+        zip_data.write(_data_in);
+        goto default;
+      default:
+        zip_arc_member_file.expandedData = zip_data.toBytes();
+        zip.addMember(zip_arc_member_file);
+      }
+      return zip;
+    }
     try {
       /+ create directory structure +/
       if (!exists(pths_pod.pod_dir_())) {
@@ -83,12 +108,7 @@ template DocReformPod() {
               fn_src_in.copy(fn_src_out_filesystem);
             }
             if (doc_matters.opt.action.pod) {
-              auto zip_arc_member_file = new ArchiveMember();
-              zip_arc_member_file.name = fn_src_out_pod_zip_base;
-              auto zip_data = new OutBuffer();
-              zip_data.write(cast(char[]) ((fn_src_in).read));
-              zip_arc_member_file.expandedData = zip_data.toBytes();
-              zip.addMember(zip_arc_member_file);
+              zip = pod_archive("file_path_bin", fn_src_in, fn_src_out_pod_zip_base, zip);
             }
           } else {
             if (doc_matters.opt.action.debug_do
@@ -115,12 +135,7 @@ template DocReformPod() {
             fn_src_in.copy(fn_src_out_filesystem);
           }
           if (doc_matters.opt.action.pod) {
-            auto zip_arc_member_file = new ArchiveMember();
-            zip_arc_member_file.name = fn_src_out_pod_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);
+            zip = pod_archive("file_path_text", fn_src_in, fn_src_out_pod_zip_base, zip);
           }
         } else {
           if (doc_matters.opt.action.debug_do
@@ -164,17 +179,12 @@ template DocReformPod() {
               pod_filelist_yaml_string.writeln(_pm);
             }
             if (doc_matters.opt.action.pod) {
-              auto zip_arc_member_file = new ArchiveMember();
-              zip_arc_member_file.name = fn_src_out_pod_zip_base;
-              auto zip_data = new OutBuffer();
-              zip_data.write(_pm);
-              zip_arc_member_file.expandedData = zip_data.toBytes();
-              zip.addMember(zip_arc_member_file);
+              zip = pod_archive("string", _pm, fn_src_out_pod_zip_base, zip);
             }
           }
         }
       } { /+ bundle primary file (.ssm/.sst) +/
-        auto fn_src_in = doc_matters.src.file_with_absolute_path.to!string;
+        auto fn_src_in = doc_matters.src.file_with_absolute_path.to!string; // original source file, inlcudes language code
         auto fn_src_out_pod_zip_base
           = pths_pod.fn_doc(doc_matters.src.filename, doc_matters.src.language).zpod.to!string;
         auto fn_src_out_filesystem
@@ -189,13 +199,28 @@ template DocReformPod() {
           }
           filelist_src_out_pod_arr ~= fn_src_out_pod_zip_base;
           filelist_src_zpod_arr ~= fn_src_out_inside_pod;
+          string _pod_to_markup_file = doc_matters.src.pod_name ~ "/" ~ "media/text/" ~ doc_matters.src.language ~ "/" ~ doc_matters.src.filename;
+          if (doc_matters.opt.action.source) {
+            fn_src_in.copy(fn_src_out_filesystem);
+          }
           if (doc_matters.opt.action.pod) {
-            auto zip_arc_member_file = new ArchiveMember();
-            zip_arc_member_file.name = fn_src_out_pod_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);
+            auto _rgx = regex(r"(?P<path_to_pod>\S+?)(?P<podname>[a-z_-]+)/(?P<from_root>media/text/)(?P<language>\S+?)/(?P<filename>\S+?\.ss[mt])");
+            if (auto _x = fn_src_in.match(_rgx)){
+              if (doc_matters.src.lng == doc_matters.pod.manifest_list_of_languages[$-1]) {
+                string _path_to_pod = _x.captures["path_to_pod"];
+                string _podname = _x.captures["podname"];
+                string _root_to_lang = _x.captures["from_root"];
+                string _language = _x.captures["language"];
+                string _filename = _x.captures["filename"];
+                foreach (_lang; doc_matters.pod.manifest_list_of_languages) {
+                  string _pth_mkup_src_in = _path_to_pod ~ _podname ~ "/" ~ _root_to_lang ~ _lang ~ "/" ~ _filename;
+                  string _pth_mkup_src_out = "pod/" ~ _root_to_lang ~ _lang ~ "/" ~ _filename;
+                  zip = pod_archive("file_path_text", _pth_mkup_src_in, _pth_mkup_src_out, zip);
+                }
+              }
+            } else {
+              zip = pod_archive("file_path_text", fn_src_in, fn_src_out_pod_zip_base, zip);
+            }
           }
         } else {
           if (doc_matters.opt.action.debug_do
@@ -205,6 +230,7 @@ template DocReformPod() {
         }
       } { /+ bundle insert files (.ssi) +/
         if (doc_matters.srcs.file_insert_list.length > 0) {
+          auto _rgx = regex(r"(?P<path_to_pod>\S+?)(?P<podname>[a-z_-]+)/(?P<from_root>media/text/)(?P<language>\S+?)/(?P<filename>\S+?\.ss[i])");
           foreach (insert_file; doc_matters.srcs.file_insert_list) {
             debug(pod) {
               writeln(
@@ -216,39 +242,66 @@ template DocReformPod() {
                 ).zpod
               );
             }
-            auto fn_src_in = insert_file;
-            auto fn_src_out_pod_zip_base
-              = pths_pod.fn_doc_insert(
-                doc_matters.src.filename,
-                insert_file,
-                doc_matters.src.language,
-              ).zpod.to!string;
-            auto fn_src_out_filesystem
-              = pths_pod.fn_doc_insert(
-                doc_matters.src.filename,
-                insert_file,
-                doc_matters.src.language,
-              ).filesystem_open_zpod.to!string;
-            if (exists(fn_src_in)) {
-              debug(io) {
-                writeln("(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.pod) {
-                auto zip_arc_member_file = new ArchiveMember();
-                zip_arc_member_file.name = fn_src_out_pod_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);
-                createZipFile!()(fn_pod, zip.build());
+            if (auto _x = insert_file.match(_rgx)){
+              if (doc_matters.src.lng == doc_matters.pod.manifest_list_of_languages[$-1]) {
+                string _path_to_pod = _x.captures["path_to_pod"];
+                string _podname = _x.captures["podname"];
+                string _root_to_lang = _x.captures["from_root"];
+                string _language = _x.captures["language"];
+                string _filename = _x.captures["filename"];
+                foreach (_lang; doc_matters.pod.manifest_list_of_languages) {
+                  string _pth_mkup_src_in = _path_to_pod ~ _podname ~ "/" ~ _root_to_lang ~ _lang ~ "/" ~ _filename;
+                  string _pth_mkup_src_out = "pod/" ~ _root_to_lang ~ _lang ~ "/" ~ _filename;
+                  if (exists(_pth_mkup_src_in)) {
+                    if (doc_matters.opt.action.source) {
+                      auto fn_src_out_filesystem // you need to change language sources
+                        = pths_pod.fn_doc_insert(
+                          doc_matters.src.filename, // doc_matters.src.filename
+                          _pth_mkup_src_in, // insert_file
+                          _lang,
+                        ).filesystem_open_zpod.to!string;
+                      _pth_mkup_src_in.copy(fn_src_out_filesystem); // check why here, thought dealt with elsewhere
+                    }
+                    if (doc_matters.opt.action.pod) {
+                       zip = pod_archive("file_path_text", _pth_mkup_src_in, _pth_mkup_src_out, zip);
+                    }
+                  } else {
+                    if (doc_matters.opt.action.debug_do
+                    && doc_matters.opt.action.verbose) {
+                      writeln("WARNING (io) src out NOT found (insert file): ", _pth_mkup_src_in);
+                    }
+                  }
+                }
               }
             } else {
-              if (doc_matters.opt.action.debug_do
-              && doc_matters.opt.action.verbose) {
-                writeln("WARNING (io) src out NOT found (insert file): ", fn_src_in);
+              auto fn_src_in = insert_file;
+              auto fn_src_out_pod_zip_base
+                = pths_pod.fn_doc_insert(
+                  doc_matters.src.filename,
+                  insert_file,
+                  doc_matters.src.language,
+                ).zpod.to!string;
+              auto fn_src_out_filesystem
+                = pths_pod.fn_doc_insert(
+                  doc_matters.src.filename,
+                  insert_file,
+                  doc_matters.src.language,
+                ).filesystem_open_zpod.to!string;
+              if (exists(fn_src_in)) {
+                debug(io) {
+                  writeln("(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.pod) {
+                  zip = pod_archive("file_path_text", fn_src_in, fn_src_out_pod_zip_base, zip);
+                }
+              } else {
+                if (doc_matters.opt.action.debug_do
+                && doc_matters.opt.action.verbose) {
+                  writeln("WARNING (io) src out NOT found (insert file): ", fn_src_in);
+                }
               }
             }
           }
@@ -274,7 +327,9 @@ template DocReformPod() {
             if (doc_matters.opt.action.verbose) {
               writeln(" ", doc_matters.src.filename, " > ");
             }
-            writefln(" %s\n  %-(%02x%)", fn_pod, data.sha256Of);
+            if (doc_matters.opt.action.pod) {
+              writefln("  %s\n  %s %-(%02x%)", fn_pod, "sha256", data.sha256Of);
+            }
           }
           debug(pod) {
             try {