From 84f4c4c963e4b3edc04300f8c5b931028e028c6c Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 20 Sep 2026 23:50:58 -0400 Subject: conf: read conf/document_make, drop the dr_ prefix Spine now looks for conf/document_make, and bundles that name. (the dr_ prefix was a sisu-era name to distinguish it) (assisted by Claude-Code) --- org/default_paths.org | 4 ++-- org/in_zip_pod.org | 4 ++-- org/out_src_pod.org | 8 ++++---- src/sisudoc/ocda/io_in/paths_source.d | 4 ++-- src/sisudoc/ocda/io_in/read_zip_pod.d | 4 ++-- src/sisudoc/outputs/io_out/source_pod.d | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/org/default_paths.org b/org/default_paths.org index 15f196f..bbc0362 100644 --- a/org/default_paths.org +++ b/org/default_paths.org @@ -186,7 +186,7 @@ template PathMatters() { string manifest_file_with_path() { return _manifested.pod_manifest_file_with_path; } - string[] config_dr_document_make_dirs() { + string[] config_document_make_dirs() { string[] _config_dirs; return _config_dirs; } @@ -500,7 +500,7 @@ template configFilePaths() { ) { struct ConfFilePaths { string config_filename_document() { - return "dr_document_make"; + return "document_make"; } string config_filename_site() { return "config_local_site"; diff --git a/org/in_zip_pod.org b/org/in_zip_pod.org index 3ab3238..2922ecf 100644 --- a/org/in_zip_pod.org +++ b/org/in_zip_pod.org @@ -159,10 +159,10 @@ template spineExtractZipPod() { } /+ ↓ extract entries +/ /+ zip internal structure uses paths like: - pod.manifest, conf/dr_document_make, + pod.manifest, conf/document_make, pod/media/text/en/filename.sst, image/filename.png but the extracted pod directory needs to look like a normal pod: - pod.manifest, conf/dr_document_make, + pod.manifest, conf/document_make, media/text/en/filename.sst, image/filename.png The "pod/" prefix in zip entries for text files maps to the pod root. +/ diff --git a/org/out_src_pod.org b/org/out_src_pod.org index f0b381a..eac9882 100644 --- a/org/out_src_pod.org +++ b/org/out_src_pod.org @@ -267,16 +267,16 @@ auto pod_zipMakeReady(M,P,S)(M doc_matters, P pths_pod, S _st) { } } } - } { // bundle dr_document_make + } { // bundle conf/document_make auto fn_src_in = ((doc_matters.src.is_pod) ? doc_matters.src.conf_dir_path : pth_dr_doc_src.conf_root).to!string - ~ "/" ~ "dr_document_make"; + ~ "/" ~ "document_make"; auto fn_src_out_pod_zip_base - = pths_pod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "dr_document_make"; + = pths_pod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "document_make"; auto fn_src_out_filesystem = pths_pod.conf_root(doc_matters.src.filename).filesystem_open_zpod.to!string - ~ "/" ~ "dr_document_make"; + ~ "/" ~ "document_make"; if (exists(fn_src_in)) { debug(io) { writeln("(io debug) src out found: ", fn_src_in); } if (doc_matters.opt.action.source_or_pod) { diff --git a/src/sisudoc/ocda/io_in/paths_source.d b/src/sisudoc/ocda/io_in/paths_source.d index f32b89e..1a4b4da 100644 --- a/src/sisudoc/ocda/io_in/paths_source.d +++ b/src/sisudoc/ocda/io_in/paths_source.d @@ -174,7 +174,7 @@ template PathMatters() { string manifest_file_with_path() { return _manifested.pod_manifest_file_with_path; } - string[] config_dr_document_make_dirs() { + string[] config_document_make_dirs() { string[] _config_dirs; return _config_dirs; } @@ -482,7 +482,7 @@ template configFilePaths() { ) { struct ConfFilePaths { string config_filename_document() { - return "dr_document_make"; + return "document_make"; } string config_filename_site() { return "config_local_site"; diff --git a/src/sisudoc/ocda/io_in/read_zip_pod.d b/src/sisudoc/ocda/io_in/read_zip_pod.d index ea1fa1b..49429be 100644 --- a/src/sisudoc/ocda/io_in/read_zip_pod.d +++ b/src/sisudoc/ocda/io_in/read_zip_pod.d @@ -183,10 +183,10 @@ template spineExtractZipPod() { } /+ ↓ extract entries +/ /+ zip internal structure uses paths like: - pod.manifest, conf/dr_document_make, + pod.manifest, conf/document_make, pod/media/text/en/filename.sst, image/filename.png but the extracted pod directory needs to look like a normal pod: - pod.manifest, conf/dr_document_make, + pod.manifest, conf/document_make, media/text/en/filename.sst, image/filename.png The "pod/" prefix in zip entries for text files maps to the pod root. +/ diff --git a/src/sisudoc/outputs/io_out/source_pod.d b/src/sisudoc/outputs/io_out/source_pod.d index 0ba6007..667e809 100644 --- a/src/sisudoc/outputs/io_out/source_pod.d +++ b/src/sisudoc/outputs/io_out/source_pod.d @@ -298,16 +298,16 @@ template spinePod() { } } } - } { // bundle dr_document_make + } { // bundle conf/document_make auto fn_src_in = ((doc_matters.src.is_pod) ? doc_matters.src.conf_dir_path : pth_dr_doc_src.conf_root).to!string - ~ "/" ~ "dr_document_make"; + ~ "/" ~ "document_make"; auto fn_src_out_pod_zip_base - = pths_pod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "dr_document_make"; + = pths_pod.conf_root(doc_matters.src.filename).zpod.to!string ~ "/" ~ "document_make"; auto fn_src_out_filesystem = pths_pod.conf_root(doc_matters.src.filename).filesystem_open_zpod.to!string - ~ "/" ~ "dr_document_make"; + ~ "/" ~ "document_make"; if (exists(fn_src_in)) { debug(io) { writeln("(io debug) src out found: ", fn_src_in); } if (doc_matters.opt.action.source_or_pod) { -- cgit v1.2.3