doc (metadata & abstraction) struct follow through

1 files changed, 33 insertions, 36 deletions

diff --git a/org/output_hub.org b/org/output_hub.org
index fb9453a..c87c757 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -32,15 +32,12 @@ module sisudoc.io_out.hub;
 @safe:
 template outputHub() {
   <<output_imports>>
-  @system void outputHub(D,I)(
-    const D doc_abstraction,
-    I doc_matters
-  ) {
+  @system void outputHub(D)(D doc) {
     mixin Msg;
-    auto msg = Msg!()(doc_matters);
+    auto msg = Msg!()(doc.matters);
     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);
+    void Scheduled(D)(int sched, D doc) {
+      auto msg = Msg!()(doc.matters);
       <<output_scheduled_task_source_or_pod>>
       <<output_scheduled_task_epub>>
       <<output_scheduled_task_html_meta>>
@@ -51,15 +48,15 @@ template outputHub() {
       <<output_scheduled_task_odt>>
       <<output_scheduled_task_sqlite>>
     }
-    if (doc_matters.opt.action.vox_gt0) { writeln(doc_matters.src.filename_base); }
-    if (!(doc_matters.opt.action.parallelise_subprocesses)) {
-      foreach(schedule; doc_matters.opt.action.output_task_scheduler) {
-        Scheduled!()(schedule, doc_abstraction, doc_matters);
+    if (doc.matters.opt.action.vox_gt0) { writeln(doc.matters.src.filename_base); }
+    if (!(doc.matters.opt.action.parallelise_subprocesses)) {
+      foreach(schedule; doc.matters.opt.action.output_task_scheduler) {
+        Scheduled!()(schedule, doc);
       }
     } else {
       import std.parallelism;
-      foreach(schedule; parallel(doc_matters.opt.action.output_task_scheduler)) {
-        Scheduled!()(schedule, doc_abstraction, doc_matters);
+      foreach(schedule; parallel(doc.matters.opt.action.output_task_scheduler)) {
+        Scheduled!()(schedule, doc);
       }
     }
     <<output_shared_sqlite_db>>
@@ -134,11 +131,11 @@ import sisudoc.io_out,
 #+BEGIN_SRC d
 if (sched == outTask.source_or_pod) {
   msg.v("spine (doc reform) source processing... ");
-  if (doc_matters.opt.action.pod) { msg.v("spine (doc reform) source pod processing... "); }
+  if (doc.matters.opt.action.pod) { msg.v("spine (doc reform) source pod processing... "); }
   import sisudoc.io_out.source_pod;
-  spinePod!()(doc_matters);
-  if (doc_matters.opt.action.source) { msg.vv("spine (doc reform) source done"); }
-  if (doc_matters.opt.action.pod) { msg.vv("spine (doc reform) source pod done"); }
+  spinePod!()(doc.matters);
+  if (doc.matters.opt.action.source) { msg.vv("spine (doc reform) source done"); }
+  if (doc.matters.opt.action.pod) { msg.vv("spine (doc reform) source pod done"); }
 }
 #+END_SRC
 
@@ -149,7 +146,7 @@ if (sched == outTask.source_or_pod) {
 if (sched == outTask.epub) {
   msg.v("epub3 processing... ");
   import sisudoc.io_out.epub3;
-  doc_abstraction.outputEPub3!()(doc_matters);
+  doc.outputEPub3!();
   msg.vv("epub3 done");
 }
 #+END_SRC
@@ -160,7 +157,7 @@ if (sched == outTask.epub) {
 #+NAME: output_scheduled_task_html_meta
 #+BEGIN_SRC d
 if (sched == outTask.html_stuff) {
-  outputMetadata!()(doc_matters);
+  outputMetadata!()(doc.matters);
   msg.vv("html metadata done");
 }
 #+END_SRC
@@ -172,7 +169,7 @@ if (sched == outTask.html_stuff) {
 if (sched == outTask.html_scroll) {
   msg.v("html scroll processing... ");
   import sisudoc.io_out.html;
-  outputHTML!().scroll(doc_abstraction, doc_matters);
+  outputHTML!().scroll(doc);
   msg.vv("html scroll done");
 }
 #+END_SRC
@@ -184,7 +181,7 @@ if (sched == outTask.html_scroll) {
 if (sched == outTask.html_seg) {
   msg.v("html seg processing... ");
   import sisudoc.io_out.html;
-  outputHTML!().seg(doc_abstraction, doc_matters);
+  outputHTML!().seg(doc);
   msg.vv("html seg done");
 }
 #+END_SRC
@@ -195,8 +192,8 @@ if (sched == outTask.html_seg) {
 #+BEGIN_SRC d
 if (sched == outTask.html_stuff) {
   import sisudoc.io_out.html;
-  outputHTML!().css(doc_matters);
-  outputHTML!().images_cp(doc_matters);
+  outputHTML!().css(doc.matters);
+  outputHTML!().images_cp(doc.matters);
   msg.vv("html css & images done");
 }
 #+END_SRC
@@ -218,17 +215,17 @@ if (sched == outTask.latex) {
   msg.v("latex processing... (available for downstream processing & pdf output");
   import sisudoc.io_out.latex;
   import std.file;
-  if ((isValidPath(doc_matters.output_path ~ "/latex/sty"))
-    && (!(exists(doc_matters.output_path ~ "/latex/sty")))
+  if ((isValidPath(doc.matters.output_path ~ "/latex/sty"))
+    && (!(exists(doc.matters.output_path ~ "/latex/sty")))
   ) {
     outputLaTeXstyInit!()(
-      doc_matters.output_path,
-      doc_matters.opt.action.generated_by,
-      doc_matters.generator_program.name_version_and_compiler,
-      doc_matters.generator_program.time_output_generated,
+      doc.matters.output_path,
+      doc.matters.opt.action.generated_by,
+      doc.matters.generator_program.name_version_and_compiler,
+      doc.matters.generator_program.time_output_generated,
     );
   }
-  outputLaTeX!()(doc_abstraction, doc_matters);
+  outputLaTeX!()(doc.abstraction, doc.matters);
   msg.vv("latex done");
 }
 #+END_SRC
@@ -240,7 +237,7 @@ if (sched == outTask.latex) {
 if (sched == outTask.odt) {
   msg.v("odf:odt processing... ");
   import sisudoc.io_out.odt;
-  outputODT!()(doc_abstraction, doc_matters);
+  outputODT!()(doc.abstraction, doc.matters);
   msg.vv("odf:odt done");
 }
 #+END_SRC
@@ -252,7 +249,7 @@ if (sched == outTask.odt) {
 if (sched == outTask.sqlite) {
   msg.v("sqlite processing... ");
   import sisudoc.io_out.sqlite;
-  doc_abstraction.SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_matters);
+  doc.SQLiteHubDiscreteBuildTablesAndPopulate!();
   msg.vv("sqlite done");
 }
 #+END_SRC
@@ -263,15 +260,15 @@ if (sched == outTask.sqlite) {
 
 #+NAME: output_shared_sqlite_db
 #+BEGIN_SRC d
-if (doc_matters.opt.action.sqlite_update) {
+if (doc.matters.opt.action.sqlite_update) {
   msg.v("sqlite update processing...");
   import sisudoc.io_out.sqlite;
-  doc_abstraction.SQLiteHubBuildTablesAndPopulate!()(doc_matters);
+  doc.SQLiteHubBuildTablesAndPopulate!();
   msg.vv("sqlite update done");
-} else if (doc_matters.opt.action.sqlite_delete) {
+} else if (doc.matters.opt.action.sqlite_delete) {
   msg.v("sqlite delete processing...");
   import sisudoc.io_out.sqlite;
-  doc_abstraction.SQLiteHubBuildTablesAndPopulate!()(doc_matters);
+  doc.SQLiteHubBuildTablesAndPopulate!();
   msg.vv("sqlite delete done");
 }
 #+END_SRC