diff options
| -rw-r--r-- | org/output_hub.org | 14 | ||||
| -rw-r--r-- | src/doc_reform/output/hub.d | 18 |
2 files changed, 20 insertions, 12 deletions
diff --git a/org/output_hub.org b/org/output_hub.org index 3fa0cb8..51736ae 100644 --- a/org/output_hub.org +++ b/org/output_hub.org @@ -64,11 +64,7 @@ template outputHubOp() { #+name: output_imports #+BEGIN_SRC d import doc_reform.output, - doc_reform.output.epub3, - doc_reform.output.html, - doc_reform.output.sqlite, doc_reform.output.xmls, - doc_reform.output.source_pod, doc_reform.output.create_zip_file, doc_reform.output.paths_output; #+END_SRC @@ -82,6 +78,7 @@ import doc_reform.output, #+BEGIN_SRC d if (sched == outTask.pod) { msg.v("sisu source processing... "); + import doc_reform.output.source_pod; DocReformPod!()(doc_matters); msg.vv("sisu source done"); } @@ -93,6 +90,7 @@ if (sched == outTask.pod) { #+BEGIN_SRC d if (sched == outTask.epub) { msg.v("epub3 processing... "); + import doc_reform.output.epub3; outputEPub3!()(doc_abstraction, doc_matters); msg.vv("epub3 done"); } @@ -105,6 +103,7 @@ if (sched == outTask.epub) { #+BEGIN_SRC d if (sched == outTask.html_scroll) { msg.v("html scroll processing... "); + import doc_reform.output.html; outputHTML!().scroll(doc_abstraction, doc_matters); msg.vv("html scroll done"); } @@ -116,6 +115,7 @@ if (sched == outTask.html_scroll) { #+BEGIN_SRC d if (sched == outTask.html_seg) { msg.v("html seg processing... "); + import doc_reform.output.html; outputHTML!().seg(doc_abstraction, doc_matters); msg.vv("html seg done"); } @@ -126,6 +126,7 @@ if (sched == outTask.html_seg) { #+name: output_scheduled_task #+BEGIN_SRC d if (sched == outTask.html_stuff) { + import doc_reform.output.html; outputHTML!().css(doc_matters); outputHTML!().images_cp(doc_matters); msg.vv("html css & images done"); @@ -138,6 +139,7 @@ if (sched == outTask.html_stuff) { #+BEGIN_SRC d if (sched == outTask.sqlite) { msg.v("sqlite processing... "); + import doc_reform.output.sqlite; SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_matters, doc_abstraction); msg.vv("sqlite done"); } @@ -151,10 +153,12 @@ if (sched == outTask.sqlite) { #+BEGIN_SRC d if (doc_matters.opt.action.sqlite_update) { msg.v("sqlite update processing..."); + import doc_reform.output.sqlite; SQLiteHubBuildTablesAndPopulate!()(doc_matters, doc_abstraction); msg.vv("sqlite update done"); } else if (doc_matters.opt.action.sqlite_delete) { msg.v("sqlite delete processing..."); + import doc_reform.output.sqlite; SQLiteHubBuildTablesAndPopulate!()(doc_matters, doc_abstraction); msg.vv("sqlite delete done"); } @@ -169,6 +173,7 @@ if ((opt_action.sqlite_db_drop)) { if ((opt_action.verbose)) { writeln("sqlite drop db..."); } + import doc_reform.output.sqlite; SQLiteDbDrop!()(opt_action); if ((opt_action.very_verbose)) { writeln("sqlite drop db done"); @@ -184,6 +189,7 @@ if ((opt_action.sqlite_db_create)) { if ((opt_action.verbose)) { writeln("sqlite create table..."); } + import doc_reform.output.sqlite; SQLiteTablesCreate!()(env, opt_action); if ((opt_action.very_verbose)) { writeln("sqlite create table done"); diff --git a/src/doc_reform/output/hub.d b/src/doc_reform/output/hub.d index e8d0dc4..4cff15e 100644 --- a/src/doc_reform/output/hub.d +++ b/src/doc_reform/output/hub.d @@ -5,11 +5,7 @@ module doc_reform.output.hub; template outputHub() { import doc_reform.output, - doc_reform.output.epub3, - doc_reform.output.html, - doc_reform.output.sqlite, doc_reform.output.xmls, - doc_reform.output.source_pod, doc_reform.output.create_zip_file, doc_reform.output.paths_output; import std.parallelism; @@ -23,31 +19,37 @@ template outputHub() { auto msg = Msg!()(doc_matters); if (sched == outTask.pod) { msg.v("sisu source processing... "); + import doc_reform.output.source_pod; DocReformPod!()(doc_matters); msg.vv("sisu source done"); } if (sched == outTask.epub) { msg.v("epub3 processing... "); + import doc_reform.output.epub3; outputEPub3!()(doc_abstraction, doc_matters); msg.vv("epub3 done"); } if (sched == outTask.html_scroll) { msg.v("html scroll processing... "); + import doc_reform.output.html; outputHTML!().scroll(doc_abstraction, doc_matters); msg.vv("html scroll done"); } if (sched == outTask.html_seg) { msg.v("html seg processing... "); + import doc_reform.output.html; outputHTML!().seg(doc_abstraction, doc_matters); msg.vv("html seg done"); } if (sched == outTask.html_stuff) { + import doc_reform.output.html; outputHTML!().css(doc_matters); outputHTML!().images_cp(doc_matters); msg.vv("html css & images done"); } if (sched == outTask.sqlite) { msg.v("sqlite processing... "); + import doc_reform.output.sqlite; SQLiteHubDiscreteBuildTablesAndPopulate!()(doc_matters, doc_abstraction); msg.vv("sqlite done"); } @@ -63,10 +65,12 @@ template outputHub() { } if (doc_matters.opt.action.sqlite_update) { msg.v("sqlite update processing..."); + import doc_reform.output.sqlite; SQLiteHubBuildTablesAndPopulate!()(doc_matters, doc_abstraction); msg.vv("sqlite update done"); } else if (doc_matters.opt.action.sqlite_delete) { msg.v("sqlite delete processing..."); + import doc_reform.output.sqlite; SQLiteHubBuildTablesAndPopulate!()(doc_matters, doc_abstraction); msg.vv("sqlite delete done"); } @@ -74,11 +78,7 @@ template outputHub() { } template outputHubOp() { import doc_reform.output, - doc_reform.output.epub3, - doc_reform.output.html, - doc_reform.output.sqlite, doc_reform.output.xmls, - doc_reform.output.source_pod, doc_reform.output.create_zip_file, doc_reform.output.paths_output; void outputHubOp(E,O)(E env, O opt_action) { @@ -88,6 +88,7 @@ template outputHubOp() { if ((opt_action.verbose)) { writeln("sqlite drop db..."); } + import doc_reform.output.sqlite; SQLiteDbDrop!()(opt_action); if ((opt_action.very_verbose)) { writeln("sqlite drop db done"); @@ -97,6 +98,7 @@ template outputHubOp() { if ((opt_action.verbose)) { writeln("sqlite create table..."); } + import doc_reform.output.sqlite; SQLiteTablesCreate!()(env, opt_action); if ((opt_action.very_verbose)) { writeln("sqlite create table done"); |