doc (metadata & abstraction) struct follow through

1 files changed, 33 insertions, 36 deletions

diff --git a/src/sisudoc/io_out/hub.d b/src/sisudoc/io_out/hub.d
index 498fa5c..8c41ce5 100644
--- a/src/sisudoc/io_out/hub.d
+++ b/src/sisudoc/io_out/hub.d
@@ -59,101 +59,98 @@ template outputHub() {
     sisudoc.io_out.xmls,
     sisudoc.io_out.create_zip_file,
     sisudoc.io_out.paths_output;
-  @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);
       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"); }
       }
       if (sched == outTask.epub) {
         msg.v("epub3 processing... ");
         import sisudoc.io_out.epub3;
-        doc_abstraction.outputEPub3!()(doc_matters);
+        doc.outputEPub3!();
         msg.vv("epub3 done");
       }
       if (sched == outTask.html_stuff) {
-        outputMetadata!()(doc_matters);
+        outputMetadata!()(doc.matters);
         msg.vv("html metadata done");
       }
       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");
       }
       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");
       }
       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");
       }
       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");
       }
       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");
       }
       if (sched == outTask.sqlite) {
         msg.v("sqlite processing... ");
         import sisudoc.io_out.sqlite;
-        doc_abstraction.SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_matters);
+        doc.SQLiteHubDiscreteBuildTablesAndPopulate!();
         msg.vv("sqlite done");
       }
     }
-    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);
       }
     }
-    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");
     }
   }