messages & remove outputs not generated

1 files changed, 34 insertions, 121 deletions

diff --git a/org/output_hub.org b/org/output_hub.org
index 2f905e1..89be2ca 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -29,36 +29,9 @@ template outputHub() {
   <<output_imports>>
   void outputHub(D,I)(D doc_abstraction, I doc_matters) {
     mixin SiSUoutputRgxInit;
+    mixin Msg;
+    auto msg = Msg!()(doc_matters);
     static auto rgx = Rgx();
-    debug (substitutions) {
-      enum Substitute { match, markup, html, }
-      writeln(__LINE__, ":", __FILE__, ": DEBUG substitutions:");
-      writeln("Doc Title:            ", doc_matters.conf_make_meta.meta.title_full);
-      if (doc_matters.conf_make_meta.make.bold) {
-        writeln("regex to match:       ", doc_matters.conf_make_meta.make.bold[Substitute.match]);
-        writeln("substitution to make: ", doc_matters.conf_make_meta.make.bold[Substitute.html]);
-
-        auto _w = "1. Debian test string. Debian again. (the problem) do not use initialized only not repopulated"
-          .replaceAll(
-            regex(doc_matters.conf_make_meta.make.bold[Substitute.match]),
-            doc_matters.conf_make_meta.make.bold[Substitute.html]
-          );
-        writeln(_w);
-
-        writeln("2a. Debian test string. Debian again. (the problem) do not use initialized only not repopulated"
-          .replaceAll(
-            regex(doc_matters.conf_make_meta.make.bold[Substitute.match]),
-            doc_matters.conf_make_meta.make.bold[Substitute.html]
-          ));
-
-        auto _v = regex(doc_matters.conf_make_meta.make.bold[Substitute.match]);
-        writeln("2b. Debian test string. Debian again. (the problem) do not use initialized only not repopulated"
-          .replaceAll(
-            _v,
-            doc_matters.conf_make_meta.make.bold[Substitute.html]
-          ));
-      }
-    }
     <<output_options>>
   }
 }
@@ -103,37 +76,18 @@ if (doc_matters.opt.action.verbose) {
 #+BEGIN_SRC d
 if ((doc_matters.opt.action.source)
 || (doc_matters.opt.action.sisupod)) {
-  if ((doc_matters.opt.action.verbose)
-  && (doc_matters.opt.action.source)) {
-    writeln("sisu source processing... ");
+  if (doc_matters.opt.action.source) {
+    msg.v("sisu source processing...");
   }
-  if ((doc_matters.opt.action.verbose)
-  && (doc_matters.opt.action.sisupod)) {
-    writeln("sisupod source processing... ");
+  if (doc_matters.opt.action.sisupod) {
+    msg.v("sisupod source processing...");
   }
   SiSUpod!()(doc_matters);
-  if ((doc_matters.opt.action.verbose)
-  && (doc_matters.opt.action.debug_do)
-  && (doc_matters.opt.action.source)) {
-    writeln("sisu source done");
+  if (doc_matters.opt.action.source) {
+    msg.vv("sisu source done");
   }
-  if ((doc_matters.opt.action.verbose)
-  && (doc_matters.opt.action.debug_do)
-  && (doc_matters.opt.action.sisupod)) {
-    writeln("sisupod done");
-  }
-}
-#+END_SRC
-
-*** text
-[[./output_text.org][output_text]]
-
-#+name: output_options
-#+BEGIN_SRC d
-if (doc_matters.opt.action.text) {
-  /+ mixin outputText; +/
-  if ((doc_matters.opt.action.verbose)) {
-    writeln("text processing... ");
+  if (doc_matters.opt.action.sisupod) {
+    msg.v("sisupod source done");
   }
 }
 #+END_SRC
@@ -144,28 +98,20 @@ if (doc_matters.opt.action.text) {
 #+name: output_options
 #+BEGIN_SRC d
 if (doc_matters.opt.action.html_seg) {
-  if ((doc_matters.opt.action.verbose)) {
-    writeln("html seg processing... ");
-  }
+  msg.v("html seg source processing...");
   outputHTML!().seg(doc_abstraction, doc_matters);
-  if ((doc_matters.opt.action.verbose)
-  && (doc_matters.opt.action.debug_do)) {
-    writeln("html seg done");
-  }
-  outputHTML!().css(doc_matters);
-  outputHTML!().images_cp(doc_matters);
+  msg.vv("html seg done");
 }
 if (doc_matters.opt.action.html_scroll) {
-  if ((doc_matters.opt.action.verbose)) {
-    writeln("html scroll processing... ");
-  }
+  msg.v("html scroll source processing...");
   outputHTML!().scroll(doc_abstraction, doc_matters);
-  if ((doc_matters.opt.action.verbose)
-  && (doc_matters.opt.action.debug_do)) {
-    writeln("html scroll done");
-  }
+  msg.vv("html scroll done");
+}
+if (doc_matters.opt.action.html_stuff) {
+  msg.v("html copying images & css...");
   outputHTML!().css(doc_matters);
   outputHTML!().images_cp(doc_matters);
+  msg.vv("html css & images done");
 }
 #+END_SRC
 
@@ -175,35 +121,9 @@ if (doc_matters.opt.action.html_scroll) {
 #+name: output_options
 #+BEGIN_SRC d
 if (doc_matters.opt.action.epub) {
-  if ((doc_matters.opt.action.verbose)) {
-    writeln("epub3 processing... ");
-  }
+  msg.v("epub3 source processing...");
   outputEPub3!()(doc_abstraction, doc_matters);
-  // epub.css_write;
-  if ((doc_matters.opt.action.verbose)
-  && (doc_matters.opt.action.debug_do)) {
-     writeln("epub3 done");
-  }
-}
-#+END_SRC
-
-*** pdf
-
-#+name: output_options
-#+BEGIN_SRC d
-if (doc_matters.opt.action.pdf) {
-  /+ mixin outputPDF; +/
-  writeln("pdf processing");
-}
-#+END_SRC
-
-*** odt
-
-#+name: output_options
-#+BEGIN_SRC d
-if (doc_matters.opt.action.odt) {
-  /+ mixin outputODT; +/
-  writeln("odt processing");
+  msg.vv("epub3 done");
 }
 #+END_SRC
 
@@ -215,10 +135,9 @@ if (doc_matters.opt.action.odt) {
 #+name: output_options
 #+BEGIN_SRC d
 if (doc_matters.opt.action.sqlite_discrete) {
-  if ((doc_matters.opt.action.verbose)) {
-    writeln("sqlite processing... ");
-  }
+  msg.v("sqlite processing...");
   SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_abstraction, doc_matters);
+  msg.vv("sqlite done");
 }
 #+END_SRC
 
@@ -230,15 +149,13 @@ if (doc_matters.opt.action.sqlite_discrete) {
 if (doc_matters.opt.action.sqlite_insert
   || doc_matters.opt.action.sqlite_update
 ) {
-  if ((doc_matters.opt.action.verbose)) {
-    writeln("sqlite processing... ");
-  }
+  msg.v("sqlite update processing...");
   SQLiteHubBuildTablesAndPopulate!()(doc_abstraction, doc_matters);
+  msg.vv("sqlite update done");
 } else if (doc_matters.opt.action.sqlite_delete) {
-  if ((doc_matters.opt.action.verbose)) {
-    writeln("sqlite processing... ");
-  }
+  msg.v("sqlite delete processing...");
   SQLiteHubBuildTablesAndPopulate!()(doc_abstraction, doc_matters);
+  msg.vv("sqlite delete done");
 }
 #+END_SRC
 
@@ -249,9 +166,12 @@ if (doc_matters.opt.action.sqlite_insert
 #+BEGIN_SRC d
 if ((opt_action.sqlite_db_drop)) {
   if ((opt_action.verbose)) {
-    writeln("sqlite drop db... ");
+    writeln("sqlite drop db...");
   }
   SQLiteDbDrop!()(opt_action);
+  if ((opt_action.very_verbose)) {
+    writeln("sqlite drop db done");
+  }
 }
 #+END_SRC
 
@@ -261,19 +181,12 @@ if ((opt_action.sqlite_db_drop)) {
 #+BEGIN_SRC d
 if ((opt_action.sqlite_db_create)) {
   if ((opt_action.verbose)) {
-    writeln("sqlite create table... ");
+    writeln("sqlite create table...");
   }
   SQLiteTablesCreate!()(env, opt_action);
-}
-#+END_SRC
-
-*** postgresql
-
-#+name: output_options
-#+BEGIN_SRC d
-if (doc_matters.opt.action.postgresql) {
-  /+ mixin outputPostgreSQL; +/
-  writeln("pgsql processing");
+  if ((opt_action.very_verbose)) {
+    writeln("sqlite create table done");
+  }
 }
 #+END_SRC