From c8f3ea1fe9389f720546534ca57b050f16e34a8c Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 20 Nov 2017 13:44:08 -0500
Subject: process pod dir with sisudoc.txt (or file)

- process multiple files named in sisudoc.txt
- works with multilingual doc with inserts
- regex fixes were needed
---
 org/default_regex.org          |  6 +++---
 org/meta_read_source_files.org | 11 +++++++----
 org/sdp.org                    | 31 ++++++++++++++++++++-----------
 3 files changed, 30 insertions(+), 18 deletions(-)

(limited to 'org')

diff --git a/org/default_regex.org b/org/default_regex.org
index 2783663..9a17633 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -411,9 +411,9 @@ static nbsp_char_and_space                            = ctRegex!(`░[ ]`, "mg")
 
 #+name: prgmkup_rgx
 #+BEGIN_SRC d
-static src_pth                                        = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[tm])$`);
-static src_pth_contents                               = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+)/sisudoc[.]txt$`);
-static src_pth_zip                                    = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<filename>[a-zA-Z0-9._-]+[.]zip)$`);
+static src_pth                                        = ctRegex!(`^(?P<path>(?:[a-zA-Z0-9._-]+/)*)(?P<filename>[a-zA-Z0-9._-]+[.]ss[tm])$`);
+static src_pth_contents                               = ctRegex!(`^(?P<path>(?:[a-zA-Z0-9._-]+/)*)(?P<filename>[a-zA-Z0-9._-]+)/sisudoc[.]txt$`);
+static src_pth_zip                                    = ctRegex!(`^(?P<path>(?:[a-zA-Z0-9._-]+/)*)(?P<filename>[a-zA-Z0-9._-]+[.]zip)$`);
 static src_pth_unzip_pod                              = ctRegex!(`^(?P<path>media/text/[a-z]{2}/)*(?P<filename>[a-zA-Z0-9._-]+[.]ss[im])$`);
 static src_pth_types                                  = ctRegex!(`^(?P<path>[a-zA-Z0-9._-]+/)*(?P<gotfile>(?P<filename>[a-zA-Z0-9._-]+[.]ss[tm])|(?P<filelist>[a-zA-Z0-9._-]+/sisudoc[.]txt)|(?P<filezip>[a-zA-Z0-9._-]+[.]zip))$`);
 static src_fn                                         =
diff --git a/org/meta_read_source_files.org b/org/meta_read_source_files.org
index 9569ee4..5e32b1f 100644
--- a/org/meta_read_source_files.org
+++ b/org/meta_read_source_files.org
@@ -261,7 +261,8 @@ static template SiSUrawMarkupContent() {
 final private string readInMarkupSource(in char[] fn_src) {
   enforce(
     exists(fn_src)!=0,
-    "file not found"
+    "file not found: «" ~
+    fn_src ~ "»"
   );
   string source_txt_str;
   try {
@@ -333,7 +334,8 @@ auto markupSourceReadIn(in string fn_src) {
   static auto rgx = Rgx();
   enforce(
     fn_src.match(rgx.src_pth),
-    "not a sisu markup filename"
+    "not a sisu markup filename: «" ~
+    fn_src ~ "»"
   );
   auto source_txt_str = readInMarkupSource(fn_src);
   return source_txt_str;
@@ -364,12 +366,13 @@ auto markupSourceHeaderContentRawLineTupleArray(in string source_txt_str) {
 #+name: meta_markup_source_raw_get_insert_source_line_array
 #+BEGIN_SRC d
 final char[][] getInsertMarkupSourceContentRawLineArray(
-  in char[] fn_src_insert,
+  in char[]    fn_src_insert,
   Regex!(char) rgx_file
 ) {
   enforce(
     fn_src_insert.match(rgx_file),
-    "not a sisu markup filename"
+    "not a sisu markup filename: «" ~
+    fn_src_insert  ~ "»"
   );
   auto source_txt_str = readInMarkupSource(fn_src_insert);
   auto source_line_arr = markupSourceLineArray(source_txt_str);
diff --git a/org/sdp.org b/org/sdp.org
index 9cd57bc..d0d7eaf 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -112,6 +112,8 @@ unittest {
 #+BEGIN_SRC d
 import
   std.getopt,
+  std.file,
+  std.path,
   std.process;
 import
   sdp.meta,
@@ -316,13 +318,20 @@ foreach(arg; args[1..$]) {
     flag_action ~= " " ~ arg;   // flags not taken by getopt
   } else if (arg.match(rgx.src_pth)) {
     fns_src ~= arg;             // gather input markup source file names for processing
-  } else if (arg.match(rgx.src_pth_contents)) {
-    import std.file,
-      std.path;
+  } else if (arg.match(rgx.src_pth_contents)
+    ||  ((arg.isDir) && ((arg.chainPath("sisudoc.txt").array).isFile))
+  ) {
     string contents_location_;
+    string sisudoc_txt_;
+    if ((arg.chainPath("sisudoc.txt").array).isFile) {
+      sisudoc_txt_ = arg.chainPath("sisudoc.txt").array;
+    } else if (arg.match(rgx.src_pth_contents)) {
+      sisudoc_txt_ = arg;
+    } else {
+    }
     try {
-      if (exists(arg)) {
-        contents_location_ = arg.readText;
+      if (exists(sisudoc_txt_)) {
+        contents_location_ = sisudoc_txt_.readText;
       }
     }
     catch (ErrnoException ex) {
@@ -332,11 +341,11 @@ foreach(arg; args[1..$]) {
     }
     auto contents_locations_arr =
       (cast(char[]) contents_location_).split;
-    auto tmp_dir_ = (arg).dirName.array;
+    auto tmp_dir_ = (sisudoc_txt_).dirName.array;
     foreach (contents_location; contents_locations_arr) {
       assert(contents_location.match(rgx.src_pth),
-        "not a recognised file: " ~
-         contents_location
+        "not a recognised file: «" ~
+         contents_location ~ "»"
       );
       auto contents_location_pth_ = (contents_location).to!string;
       fns_src ~= (((tmp_dir_).chainPath(contents_location_pth_)).array).to!(char[]);
@@ -401,8 +410,8 @@ scope(failure) {
 }
 enforce(
   fn_src.match(rgx.src_pth_types),
-  "not a sisu markup filename: <<" ~
-  fn_src ~ ">>"
+  "not a sisu markup filename: «" ~
+  fn_src ~ "»"
 );
 #+END_SRC
 
@@ -705,8 +714,8 @@ import
 import
   std.array,
   std.exception,
-  std.stdio,
   std.regex,
+  std.stdio,
   std.string,
   std.traits,
   std.typecons,
-- 
cgit v1.2.3