From 479e71e90146b1067120faf489af1b13a5a0cf3d Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 14 Apr 2018 16:39:52 -0400 Subject: sqlite3 some stuff & rearrange files, dlang, org --- org/output_sisupod.org | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'org/output_sisupod.org') diff --git a/org/output_sisupod.org b/org/output_sisupod.org index 5b1f6ab..a53f9c7 100644 --- a/org/output_sisupod.org +++ b/org/output_sisupod.org @@ -132,7 +132,7 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.src.filename).zpod; ~ "/" ~ image; if (exists(fn_src_in)) { debug(io) { - writeln("WARNING (io debug) src out found: ", fn_src_in); + writeln("(io debug) src out found: ", fn_src_in); } if (doc_matters.opt.action.source) { fn_src_in.copy(fn_src_out_filesystem); @@ -163,7 +163,7 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.src.filename).zpod; ~ "/" ~ "sisu_document_make"; if (exists(fn_src_in)) { debug(io) { - writeln("WARNING (io debug) src out found: ", fn_src_in); + writeln("(io debug) src out found: ", fn_src_in); } if (doc_matters.opt.action.source) { fn_src_in.copy(fn_src_out_filesystem); @@ -194,7 +194,7 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.src.filename).zpod; string[] filelist_src_zpod_arr; if (exists(fn_src_in)) { debug(io) { - writeln("WARNING (io debug) src out found: ", fn_src_in); + writeln("(io debug) src in found: ", fn_src_in); } filelist_src_out_sisupod_arr ~= fn_src_out_sisupod_zip_base; filelist_src_zpod_arr ~= fn_src_out_inside_pod; @@ -217,7 +217,7 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.src.filename).zpod; } else { if (doc_matters.opt.action.verbose || doc_matters.opt.action.debug_do) { - writeln("WARNING (io) src out NOT found (markup source): ", fn_src_in); + writeln("WARNING (io) src in NOT found (markup source): ", fn_src_in); } } } { /+ bundle insert files +/ @@ -248,7 +248,7 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.src.filename).zpod; ).filesystem_open_zpod.to!string; if (exists(fn_src_in)) { debug(io) { - writeln("WARNING (io debug) src out found: ", fn_src_in); + writeln("(io debug) src out found: ", fn_src_in); } if (doc_matters.opt.action.source) { fn_src_in.copy(fn_src_out_filesystem); @@ -272,9 +272,14 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.src.filename).zpod; } } { auto fn_src_in = doc_matters.src.filename; - if (exists(fn_src_in)) { - if (doc_matters.opt.action.sisupod) { + if (doc_matters.opt.action.sisupod) { + if (exists(doc_matters.src.file_with_absolute_path)) { createZipFile!()(fn_sisupod, zip.build()); + } else { + writeln("WARNING check missing source file(s): ", doc_matters.opt.action.sisupod); + } + if (!(exists(fn_sisupod))) { + writeln("WARNING failed to create sisupod zip archive: ", fn_sisupod); } } } @@ -286,8 +291,11 @@ auto fn_sisupod = pths_sisupod.sisupod_filename(doc_matters.src.filename).zpod; #+BEGIN_SRC d if (exists(fn_sisupod)) { try { - auto data = (cast(byte[]) (fn_sisupod).read); - writefln("%-(%02x%) %s", data.sha256Of, fn_sisupod); + if (doc_matters.opt.action.verbose) { + auto data = (cast(byte[]) (fn_sisupod).read); + writeln(doc_matters.src.filename, " >> "); + writefln("%-(%02x%) %s", data.sha256Of, fn_sisupod); + } debug(sisupod) { try { auto zipped = new ZipArchive((fn_sisupod).read); -- cgit v1.2.3