From 20a36744ada25bf063199a24fe3eebe85f056235 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 23 Feb 2022 15:11:39 -0500 Subject: verbosity level, "vox_gt[lv]" (voice greater than) --- src/doc_reform/io_out/epub3.d | 4 ++-- src/doc_reform/io_out/html.d | 6 +++--- src/doc_reform/io_out/hub.d | 10 +++++----- src/doc_reform/io_out/latex.d | 6 +++--- src/doc_reform/io_out/metadata.d | 10 +++++----- src/doc_reform/io_out/odt.d | 4 ++-- src/doc_reform/io_out/source_pod.d | 20 ++++++++++---------- src/doc_reform/io_out/sqlite.d | 10 +++++----- src/doc_reform/io_out/xmls.d | 2 +- 9 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src/doc_reform/io_out') diff --git a/src/doc_reform/io_out/epub3.d b/src/doc_reform/io_out/epub3.d index eb5e46a..0444aed 100644 --- a/src/doc_reform/io_out/epub3.d +++ b/src/doc_reform/io_out/epub3.d @@ -723,7 +723,7 @@ template outputEPub3() { foreach (image; doc_matters.srcs.image_list) { { /+ debug +/ if (doc_matters.opt.action.debug_do_epub) { - if (doc_matters.opt.action.very_verbose) { + if (doc_matters.opt.action.vox_gt2) { writeln( doc_matters.src.image_dir_path, "/", image, " -> ", pth_epub3.dbg_doc_oebps_image(doc_matters.src.filename), "/", image @@ -770,7 +770,7 @@ template outputEPub3() { } catch (ErrnoException ex) { // Handle error } - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln(" ", fn_epub); } debug(epub_archive) { diff --git a/src/doc_reform/io_out/html.d b/src/doc_reform/io_out/html.d index 2e6d0ad..26636ba 100644 --- a/src/doc_reform/io_out/html.d +++ b/src/doc_reform/io_out/html.d @@ -248,7 +248,7 @@ template outputHTML() { } catch (ErrnoException ex) { // Handle error } - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln(" ", pth_html.fn_scroll(doc_matters.src.filename)); } } @@ -530,7 +530,7 @@ template outputHTML() { } catch (ErrnoException ex) { // handle error } - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln(" ", pth_html.fn_seg(doc_matters.src.filename, "toc")); } } @@ -566,7 +566,7 @@ template outputHTML() { if (exists(fn_src_in)) { fn_src_in.copy(fn_src_out); } else { - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln("WARNING image not found: ", fn_src_in); } } diff --git a/src/doc_reform/io_out/hub.d b/src/doc_reform/io_out/hub.d index 5ecaf0e..55dce8e 100644 --- a/src/doc_reform/io_out/hub.d +++ b/src/doc_reform/io_out/hub.d @@ -131,7 +131,7 @@ template outputHub() { msg.vv("sqlite done"); } } - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln(" ", doc_matters.src.filename_base); } if (!(doc_matters.opt.action.parallelise_subprocesses)) { @@ -167,23 +167,23 @@ template outputHubOp() { mixin spineRgxOut; static auto rgx = RgxO(); if ((opt_action.sqlite_db_drop)) { - if ((opt_action.verbose)) { + if ((opt_action.vox_gt1)) { writeln("sqlite drop db..."); } import doc_reform.io_out.sqlite; SQLiteDbDrop!()(opt_action, config); - if ((opt_action.very_verbose)) { + if ((opt_action.vox_gt2)) { writeln("sqlite drop db done"); } } if ((opt_action.sqlite_db_create)) { - if ((opt_action.verbose)) { + if ((opt_action.vox_gt1)) { auto pth_sqlite_db = spinePathsSQLite!()(opt_action.cgi_sqlite_search_filename, opt_action.output_dir_set); writeln("sqlite create table..."); } import doc_reform.io_out.sqlite; SQLiteTablesCreate!()(env, opt_action, config); - if ((opt_action.very_verbose)) { + if ((opt_action.vox_gt2)) { writeln("sqlite create table done"); } } diff --git a/src/doc_reform/io_out/latex.d b/src/doc_reform/io_out/latex.d index e876eab..68ac2f9 100644 --- a/src/doc_reform/io_out/latex.d +++ b/src/doc_reform/io_out/latex.d @@ -1276,7 +1276,7 @@ string table(O,M)( default: { /+ debug +/ if (doc_matters.opt.action.debug_do_latex - && doc_matters.opt.action.verbose) { + && doc_matters.opt.action.vox_gt1) { writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part); writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a); writeln(__FILE__, ":", __LINE__, ": ", obj.text); @@ -1314,7 +1314,7 @@ string table(O,M)( try { { /+ debug +/ if (doc_matters.opt.action.debug_do_latex - && doc_matters.opt.action.verbose) { + && doc_matters.opt.action.vox_gt1) { writeln(latex_content.head); writeln(latex_content.content); writeln(latex_content.tail); @@ -1323,7 +1323,7 @@ string table(O,M)( if (!exists(pth_latex.latex_path_stuff)) { (pth_latex.latex_path_stuff).mkdirRecurse; } - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln(" ", pth_latex.latex_file_with_path(paper_size_orientation)); } auto f = File(pth_latex.latex_file_with_path(paper_size_orientation), "w"); diff --git a/src/doc_reform/io_out/metadata.d b/src/doc_reform/io_out/metadata.d index 6eab92e..9d6d57a 100644 --- a/src/doc_reform/io_out/metadata.d +++ b/src/doc_reform/io_out/metadata.d @@ -319,7 +319,7 @@ string theme_light_1 = format(q"┃ } catch (ErrnoException ex) { // Handle error } - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln(" ", pth_html.fn_scroll("metadata." ~ doc_matters.src.filename)); } } @@ -363,7 +363,7 @@ string theme_light_1 = format(q"┃ metadata_ ~= "" ~ inline_search_form(doc_matters) ~ "
"; if (!(doc_matters.conf_make_meta.meta.title_full.empty)) { metadata_ ~= "

Title: " ~ doc_matters.conf_make_meta.meta.title_full ~ "

"; - } else if (doc_matters.opt.action.debug_do || doc_matters.opt.action.very_verbose) { + } else if (doc_matters.opt.action.debug_do || doc_matters.opt.action.vox_gt2) { writeln("ERROR no Title information provided in document header ", doc_matters.src.filename_base); } if (!(doc_matters.conf_make_meta.meta.creator_author.empty)) { @@ -374,18 +374,18 @@ string theme_light_1 = format(q"┃ metadata_ ~= "

Author: " ~ doc_matters.conf_make_meta.meta.creator_author ~ "

"; } - } else if (doc_matters.opt.action.debug_do || doc_matters.opt.action.very_verbose) { + } else if (doc_matters.opt.action.debug_do || doc_matters.opt.action.vox_gt2) { writeln("ERROR no Author information provided in document header ", doc_matters.src.filename_base); } metadata_ ~= "

Published: " ~ doc_matters.conf_make_meta.meta.date_published ~ "

"; if (!(doc_matters.conf_make_meta.meta.rights_copyright.empty)) { metadata_ ~= "

Copyright: " ~ doc_matters.conf_make_meta.meta.rights_copyright ~ "

"; - } else if (doc_matters.opt.action.debug_do || doc_matters.opt.action.very_verbose) { + } else if (doc_matters.opt.action.debug_do || doc_matters.opt.action.vox_gt2) { writeln("WARNING no Copyright information provided in document header ", doc_matters.src.filename_base); } if (!(doc_matters.conf_make_meta.meta.rights_license.empty)) { metadata_ ~= "

License: " ~ doc_matters.conf_make_meta.meta.rights_license ~ "

"; - } else if (doc_matters.opt.action.debug_do || doc_matters.opt.action.very_verbose) { + } else if (doc_matters.opt.action.debug_do || doc_matters.opt.action.vox_gt2) { writeln("WARNING no License information provided in document header ", doc_matters.src.filename_base); } if (!(doc_matters.conf_make_meta.meta.notes_summary.empty)) { diff --git a/src/doc_reform/io_out/odt.d b/src/doc_reform/io_out/odt.d index 2c0ae66..b80b9f0 100644 --- a/src/doc_reform/io_out/odt.d +++ b/src/doc_reform/io_out/odt.d @@ -877,7 +877,7 @@ template outputODT() { default: { /+ debug +/ if (doc_matters.opt.action.debug_do - && doc_matters.opt.action.verbose) { + && doc_matters.opt.action.vox_gt1) { writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part); writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a); writeln(__FILE__, ":", __LINE__, ": ", obj.text); @@ -2079,7 +2079,7 @@ template outputODT() { } } } - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln(" ", pth_odt.odt_file); } } catch (ErrnoException ex) { diff --git a/src/doc_reform/io_out/source_pod.d b/src/doc_reform/io_out/source_pod.d index 4b59116..14d63d7 100644 --- a/src/doc_reform/io_out/source_pod.d +++ b/src/doc_reform/io_out/source_pod.d @@ -105,7 +105,7 @@ template spinePod() { pths_pod.pod_dir_().mkdirRecurse; } if (doc_matters.opt.action.source_or_pod) { - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln(" ", pths_pod.fn_pod_filelist(doc_matters.src.filename).filesystem_open_zpod); } if (!exists(pths_pod.text_root(doc_matters.src.filename).filesystem_open_zpod)) { @@ -128,7 +128,7 @@ template spinePod() { } } if (doc_matters.opt.action.debug_do_pod - && doc_matters.opt.action.verbose) { + && doc_matters.opt.action.vox_gt1) { writeln(__LINE__, ": ", doc_matters.src.filename, " -> ", pths_pod.fn_doc(doc_matters.src.filename, doc_matters.src.language).filesystem_open_zpod @@ -163,7 +163,7 @@ template spinePod() { } } else { if (doc_matters.opt.action.debug_do_pod - && doc_matters.opt.action.verbose) { + && doc_matters.opt.action.vox_gt1) { writeln("WARNING (io) src out NOT found (image): ", fn_src_in); } } @@ -190,7 +190,7 @@ template spinePod() { } } else { if (doc_matters.opt.action.debug_do_pod - && doc_matters.opt.action.verbose) { + && doc_matters.opt.action.vox_gt1) { writeln("WARNING (io) src out NOT found (document make): ", fn_src_in); } } @@ -217,7 +217,7 @@ template spinePod() { Node _pmy; string _pm = "doc:\n filename: " ~ doc_matters.src.filename ~ "\n language: " ~ doc_matters.pod.manifest_list_of_languages.to!string ~ "\n"; if (doc_matters.opt.action.debug_do_pod - && doc_matters.opt.action.verbose) { + && doc_matters.opt.action.vox_gt1) { try { _pmy = Loader.fromString(_pm).load(); } catch (ErrnoException ex) { @@ -280,7 +280,7 @@ template spinePod() { } } else { if (doc_matters.opt.action.debug_do_pod - && doc_matters.opt.action.verbose) { + && doc_matters.opt.action.vox_gt1) { writeln("WARNING (io) src in NOT found (markup source): ", fn_src_in); } } @@ -323,7 +323,7 @@ template spinePod() { } } else { if (doc_matters.opt.action.debug_do_pod - && doc_matters.opt.action.verbose) { + && doc_matters.opt.action.vox_gt1) { writeln("WARNING (io) src out NOT found (insert file): ", _pth_mkup_src_in); } } @@ -355,7 +355,7 @@ template spinePod() { } } else { if (doc_matters.opt.action.debug_do_pod - && doc_matters.opt.action.verbose) { + && doc_matters.opt.action.vox_gt1) { writeln("WARNING (io) src out NOT found (insert file): ", fn_src_in); } } @@ -377,10 +377,10 @@ template spinePod() { } if (exists(fn_pod)) { try { - if (!(doc_matters.opt.action.quiet) + if (doc_matters.opt.action.vox_gt0 && doc_matters.opt.action.pod) { auto data = (cast(byte[]) (fn_pod).read); - if (doc_matters.opt.action.verbose) { + if (doc_matters.opt.action.vox_gt1) { writeln(" ", doc_matters.src.filename, " > "); } if (doc_matters.opt.action.pod) { diff --git a/src/doc_reform/io_out/sqlite.d b/src/doc_reform/io_out/sqlite.d index 7e4d605..06a764f 100644 --- a/src/doc_reform/io_out/sqlite.d +++ b/src/doc_reform/io_out/sqlite.d @@ -108,7 +108,7 @@ template SQLiteHubBuildTablesAndPopulate() { } db.close; } - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln(" ", pth_sqlite.sqlite_file); } } @@ -142,7 +142,7 @@ template SQLiteHubDiscreteBuildTablesAndPopulate() { } db.close; } - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln(" ", pth_sqlite.sqlite_file(doc_matters.src.filename)); } } @@ -174,7 +174,7 @@ template SQLiteDbRun() { { /+ debug +/ if (opt_action.debug_do_sqlite) { writeln(note); - if (opt_action.very_verbose) { + if (opt_action.vox_gt2) { writeln(db_statement); } } @@ -425,7 +425,7 @@ template SQLiteFormatAndLoadObject() { ); } } else { - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln( "WARNING on internal document links, anchor to link <<" ~ m.captures["hash"] @@ -1611,7 +1611,7 @@ template SQLiteTablesCreate() { ? config.conf.w_srv_db_sqlite_path : ""; if (db_filename.length > 0 && db_path.length > 0) { - if ((opt_action.verbose)) { + if ((opt_action.vox_gt1)) { writeln("db name & path: ", db_path, db_filename); } auto pth_sqlite = spinePathsSQLite!()(db_filename, db_path); diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index 5ad5724..b9d5a1b 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -521,7 +521,7 @@ template outputXHTMLs() { ); } } else { - if (!(doc_matters.opt.action.quiet)) { + if (doc_matters.opt.action.vox_gt0) { writeln( "WARNING on internal document links, anchor to link <<" ~ m.captures["hash"] -- cgit v1.2.3