markup source digests (write to terminal)

6 files changed, 30 insertions, 9 deletions

diff --git a/src/sisudoc/io_out/source_pod.d b/src/sisudoc/io_out/source_pod.d
index 97e31af..3fd7a9a 100644
--- a/src/sisudoc/io_out/source_pod.d
+++ b/src/sisudoc/io_out/source_pod.d
@@ -395,10 +395,10 @@ template spinePod() {
           && doc_matters.opt.action.pod) {
             auto data = (cast(byte[]) (fn_pod).read);
             if (doc_matters.opt.action.vox_gt1) {
-              writeln(" ", doc_matters.src.filename, " > ");
+              writeln(doc_matters.src.filename, " > ", doc_matters.src.filename_base, ".zip");
             }
             if (doc_matters.opt.action.pod) {
-              writefln("%s\n. %-(%02x%)::%s . %s.zip", fn_pod, data.sha256Of, data.length, doc_matters.src.filename_base);
+              writeln(data.sha256Of.toHexString, "::", data.length, " - ", doc_matters.src.filename_base, ".zip");
             }
           }
           if (doc_matters.opt.action.debug_do_pod) {
@@ -406,7 +406,7 @@ template spinePod() {
               auto zipped = new ZipArchive((fn_pod).read);
               foreach (filename, member; zipped.directory) {
                 auto data = zipped.expand(member);
-                writeln(". ", ((data).sha256Of).toHexString, "::", data.length, " . ", filename);
+                writeln(data.sha256Of.toHexString, "::", data.length, " . ", filename);
               }
             } catch (ZipException ex) {
               // Handle errors
diff --git a/src/sisudoc/meta/metadoc.d b/src/sisudoc/meta/metadoc.d
index 035f57e..34212a5 100644
--- a/src/sisudoc/meta/metadoc.d
+++ b/src/sisudoc/meta/metadoc.d
@@ -90,9 +90,10 @@ template spineAbstraction() {
     }
     auto _header_body_insertfilelist_imagelist
       = spineRawMarkupContent!()(_opt_action, _manifest.src.path_and_fn);
-    writeln("src doc digest: ", _header_body_insertfilelist_imagelist.doc_digest.markup_doc.toHexString, " ", _header_body_insertfilelist_imagelist.doc_digest.markup_doc.toHexString.length);
-    writeln("header:         ", _header_body_insertfilelist_imagelist.doc_digest.header.toHexString, " ", _header_body_insertfilelist_imagelist.doc_digest.header.toHexString.length);
-    writeln("text:           ", _header_body_insertfilelist_imagelist.doc_digest.text.toHexString, " ", _header_body_insertfilelist_imagelist.doc_digest.text.toHexString.length);
+    // writeln("src doc digest: ", _header_body_insertfilelist_imagelist.doc_digest.markup_doc.toHexString, " ", _header_body_insertfilelist_imagelist.doc_digest.markup_doc.toHexString.length);
+    // writeln("header:         ", _header_body_insertfilelist_imagelist.doc_digest.header.toHexString, " ", _header_body_insertfilelist_imagelist.doc_digest.header.toHexString.length);
+    // writeln("text:           ", _header_body_insertfilelist_imagelist.doc_digest.text.toHexString, " ", _header_body_insertfilelist_imagelist.doc_digest.text.toHexString.length);
+    auto doc_digests = _header_body_insertfilelist_imagelist.doc_digest;
     if ((_opt_action.debug_do)
       || (_opt_action.debug_do_stages)
     ) {
@@ -148,7 +149,7 @@ template spineAbstraction() {
     ) {
       writeln("step4 commence → (doc_matters) [", _manifest.src.filename, "]");
     }
-    struct DocumentMatters {
+    struct ST_DocumentMatters {
       auto generator_program() {
         struct Prog_ {
           string project_name() {
@@ -195,6 +196,9 @@ template spineAbstraction() {
       auto conf_make_meta() {
         return _make_and_meta_struct;
       }
+      auto doc_digest() {
+        return doc_digests;
+      }
       auto has() {
         return _doc_has_struct;
       }
@@ -287,7 +291,7 @@ template spineAbstraction() {
         return SRC_();
       }
     }
-    auto doc_matters = DocumentMatters();
+    auto doc_matters = ST_DocumentMatters();
     if ((_opt_action.debug_do)
       || (_opt_action.debug_do_stages)
     ) {
diff --git a/src/sisudoc/meta/metadoc_show_config.d b/src/sisudoc/meta/metadoc_show_config.d
index 8a6af5d..76a0394 100644
--- a/src/sisudoc/meta/metadoc_show_config.d
+++ b/src/sisudoc/meta/metadoc_show_config.d
@@ -59,6 +59,8 @@ template spineShowSiteConfig() {
       sisudoc.meta.rgx;
     import
       std.array,
+      std.digest.crc,
+      std.digest.sha,
       std.exception,
       std.regex,
       std.stdio,
@@ -145,6 +147,8 @@ template spineShowConfig() {
       sisudoc.meta.rgx;
     import
       std.array,
+      std.digest.crc,
+      std.digest.sha,
       std.exception,
       std.regex,
       std.stdio,
diff --git a/src/sisudoc/meta/metadoc_show_make.d b/src/sisudoc/meta/metadoc_show_make.d
index 817f5dc..ddbb687 100644
--- a/src/sisudoc/meta/metadoc_show_make.d
+++ b/src/sisudoc/meta/metadoc_show_make.d
@@ -58,6 +58,8 @@ template spineShowMake() {
       sisudoc.meta.rgx;
     import
       std.array,
+      std.digest.crc,
+      std.digest.sha,
       std.exception,
       std.regex,
       std.stdio,
diff --git a/src/sisudoc/meta/metadoc_show_metadata.d b/src/sisudoc/meta/metadoc_show_metadata.d
index 320f28b..31ff1ea 100644
--- a/src/sisudoc/meta/metadoc_show_metadata.d
+++ b/src/sisudoc/meta/metadoc_show_metadata.d
@@ -58,6 +58,8 @@ template spineShowMetaData() {
       sisudoc.meta.rgx;
     import
       std.array,
+      std.digest.crc,
+      std.digest.sha,
       std.exception,
       std.regex,
       std.stdio,
diff --git a/src/sisudoc/meta/metadoc_show_summary.d b/src/sisudoc/meta/metadoc_show_summary.d
index 379a1a7..36ed3c1 100644
--- a/src/sisudoc/meta/metadoc_show_summary.d
+++ b/src/sisudoc/meta/metadoc_show_summary.d
@@ -59,6 +59,8 @@ template spineMetaDocSummary() {
       sisudoc.meta.rgx;
     import
       std.array,
+      std.digest.crc,
+      std.digest.sha,
       std.exception,
       std.regex,
       std.stdio,
@@ -102,13 +104,20 @@ template spineMetaDocSummary() {
         }
       }
       writefln(
-        "%s\n\"%s\", %s\n%s [%s]\n%s\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%s",
+        "%s\n\"%s\", %s\n%s [%s]\n%s \n%s%s\n%s%s\n%s%s\n%s\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%40-s%10-d\n%s",
         markup.repeat_character_by_number_provided("-", char_repeat_number),
         doc_matters.conf_make_meta.meta.title_full,
         doc_matters.conf_make_meta.meta.creator_author,
         doc_matters.src.filename,
         doc_matters.src.language,
         markup.repeat_character_by_number_provided("-", char_repeat_number),
+        doc_matters.doc_digest.markup_doc.toHexString,
+        "  - src doc digest",
+        doc_matters.doc_digest.header.toHexString,
+        "  - doc header",
+        doc_matters.doc_digest.text.toHexString,
+        "  - doc text",
+        markup.repeat_character_by_number_provided("-", char_repeat_number),
         "- toc arr length:",
         to!int(doc_abstraction["toc"].length),
         "- doc_abstraction arr length:",