0.26.4 file renames, cleaning, reorganisation

1 files changed, 65 insertions, 90 deletions

diff --git a/org/default_paths.org b/org/default_paths.org
index b8ff2a4..5b7141a 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -18,13 +18,13 @@
 * 0. source paths                                   :module:sdp:paths_source:
 ** 0. module template
 
-#+BEGIN_SRC d :tangle ../src/sdp/output/paths_source.d
+#+BEGIN_SRC d :tangle ../src/sdp/source/paths_source.d
 /++
   read configuration files<BR>
   - read config files<BR>
   meta_config_files.d
 +/
-module sdp.output.paths_source;
+module sdp.source.paths_source;
 import std.array,
   std.file,
   std.path,
@@ -49,11 +49,10 @@ template PodManifest() {
     P   _pth
   ) {
     struct ManifestFile_ {
-      auto pod_manifest_filename() {
-        string _manifest_file = "sisupod.manifest";
-        return _manifest_file;
+      string pod_manifest_filename() {
+        return "sisupod.manifest";
       }
-      auto pod_manifest_path() {
+      string pod_manifest_path() {
         string _manifest_path;
         if ((isValidPath(_pth) && exists(_pth)!=0 && _pth.isDir)
         && (exists(_pth.chainPath(pod_manifest_filename).array)!=0
@@ -115,11 +114,11 @@ sisupod
 template PathMatters() {
   mixin SiSUrgxInit;
   static auto rgx = Rgx();
-  auto PathMatters(O,E,P,F)(
-    O   _opt_actions,
-    E   _env,
-    P   _pth,
-    F   _fns                   = "",
+  auto PathMatters(O,E)(
+    O        _opt_actions,
+    E        _env,
+    string   _pth,
+    string   _fns              = "",
     char[][] _manifest_fn_list = [[]],
   ) {
     auto _manifest = PodManifest!()(_pth);
@@ -145,15 +144,13 @@ template PathMatters() {
         }
         return Opt_();
       }
-      auto src_is_pod() {
-        auto _src_is_pod = (_manifest.pod_manifest_path.length > 0) ? true : false;
-        return _src_is_pod;
+      bool src_is_pod() {
+        return (_manifest.pod_manifest_path.length > 0) ? true : false;
       }
       auto pod() {
         struct Pod_ {
-          auto src_is_pod() {
-            auto _src_is_pod = (_manifest.pod_manifest_path.length > 0) ? true : false;
-            return _src_is_pod;
+          bool src_is_pod() {
+            return (_manifest.pod_manifest_path.length > 0) ? true : false;
           }
           auto collection_root() {
             auto _collection_root = asNormalizedPath(chainPath(_manifest.pod_manifest_path, "..")).array;
@@ -164,34 +161,34 @@ template PathMatters() {
             }
             return _collection_root;
           }
-          auto manifest_filename() {
+          string manifest_filename() {
             return _manifest.pod_manifest_filename;
           }
-          auto manifest_path() {
+          string manifest_path() {
             return _manifest.pod_manifest_path;
           }
-          auto pod_name() { // TODO decide what returned if src_is_pod == false
+          string pod_name() {
             return _manifest.pod_manifest_path.baseName;
           }
-          auto manifest_file_with_path() {
+          string manifest_file_with_path() {
             return _manifest.pod_manifest_file_with_path;
           }
-          auto config_sisu_document_make_dirs() {                              // TODO sisu_document_make
+          string[] config_sisu_document_make_dirs() {
             string[] _config_dirs;
             return _config_dirs;
           }
-          auto config_local_site_dirs() {                   // TODO sisu_document_make
+          string[] config_local_site_dirs() {
             string[] _config_dirs;
             return _config_dirs;
           }
-          auto image_dirs() {                               // TODO
+          string[] image_dirs() {
             string[] _image_dirs;
             return _image_dirs;
           }
           auto manifest_list_of_filenames() {
             return _manifest_fn_list;
           }
-          auto manifest_list_of_languages() {
+          string[] manifest_list_of_languages() {
             string[] _lngs;
             foreach (filename_; manifest_list_of_filenames) {
               string _k = "en";
@@ -211,41 +208,32 @@ template PathMatters() {
         auto _env = _env;
         string _sep = "␣";
         struct SRC_ {
-          auto is_pod() {
-            auto _src_is_pod = (_manifest.pod_manifest_path.length > 0) ? true : false;
-            return _src_is_pod;
+          bool is_pod() {
+            return (_manifest.pod_manifest_path.length > 0) ? true : false;
           }
-          auto path_and_fn() {
+          string path_and_fn() {
             return _fns;
           }
-          auto pod_name() { /+ work on +/
-            auto _pod_name = (is_pod)
-            ? _manifest.pod_manifest_path
-            : "";
-            return _pod_name;
+          string pod_name() {
+            return (is_pod) ? _manifest.pod_manifest_path : "";
           }
-          auto filename() {
-            auto _fn = (path_and_fn).baseName;
-            return _fn;
+          string filename() {
+            return path_and_fn.baseName;
           }
-          auto filename_base() {
-            auto _fn = filename.stripExtension;
-            return _fn;
+          string filename_base() {
+            return filename.stripExtension;
           }
-          auto filename_extension() {
-            auto _ext = filename.match(rgx.src_pth_sst_or_ssm).captures["extension"];
-            return _ext;
+          string filename_extension() {
+            return filename.match(rgx.src_pth_sst_or_ssm).captures["extension"];
           }
-          auto lng() {
+          string lng() {
             string _k;
             if (auto m = path_and_fn.match(rgx.language_code_and_filename)) {
               _k = m.captures[1];
-            } else {
-              _k = "en";
-            }
+            } else {_k = "en"; }
             return _k;
           }
-          auto docname_composite_unique_per_src_doc() {
+          string docname_composite_unique_per_src_doc() {
           /+
             z pod name if any + src filename + lng code
              filename ~ "." ~  lng
@@ -263,7 +251,7 @@ template PathMatters() {
             }
             return _fn;
           }
-          auto docname_composite_unique_per_src_pod() {
+          string docname_composite_unique_per_src_pod() {
           /+
             z pod name if any + src filename (without lng code)
              filename ~ _sep ~ lng
@@ -282,18 +270,16 @@ template PathMatters() {
             }
             return _fn;
           }
-          auto language() {
+          string language() {
             return lng();
           }
-          auto file_with_absolute_path() {
-            string _pth = _env["pwd"].chainPath(path_and_fn).array;
-            return _pth;
+          string file_with_absolute_path() {
+            return _env["pwd"].chainPath(path_and_fn).array;
           }
-          auto absolute_path_to_src() {
-            string _pth = (_env["pwd"].chainPath(path_and_fn)).dirName.array;
-            return _pth;
+          string absolute_path_to_src() {
+            return (_env["pwd"].chainPath(path_and_fn)).dirName.array;
           }
-          auto base_dir() {
+          string base_dir() {
             string _dir;
             if ( // TODO this should catch generated --source sisupod, untested, needs manifest
               auto m = (absolute_path_to_src)
@@ -311,7 +297,7 @@ template PathMatters() {
             }
             return _dir;
           }
-          auto base_parent_dir_path() {
+          string base_parent_dir_path() {
             string _dir;
             if ( // TODO this should catch generated --source sisupod, untested, needs manifest
               auto m = (absolute_path_to_src)
@@ -323,7 +309,7 @@ template PathMatters() {
             }
             return _dir;
           }
-          auto base_dir_path() { // looks like there is work to do
+          string base_dir_path() {
             string _dir;
             if (
               auto m = (absolute_path_to_src)
@@ -343,11 +329,11 @@ template PathMatters() {
             }
             return _dir;
           }
-          auto media_dir_path() { // TODO rework, can base directly on src fn path
+          string media_dir_path() {
             string _dir = asNormalizedPath(base_dir_path.chainPath("media")).array;
             return _dir;
           }
-          auto image_dir_path() {
+          string image_dir_path() {
             string _paths;
             string[] _possible_img_pths = [ "./image", "../image", "../../image" ];
             string _img_pth_found = "";
@@ -372,8 +358,7 @@ template PathMatters() {
             return _img_pth_found;
           }
           auto conf_dir_path() {
-            auto _dir = asNormalizedPath(base_dir_path.chainPath("conf")).array;
-            return _dir;
+            return asNormalizedPath(base_dir_path.chainPath("conf")).array;
           }
           auto base_parent_dir() {
             string _dir;
@@ -390,18 +375,16 @@ template PathMatters() {
             }
             return _dir;
           }
-          auto config_dirs() {                              // TODO
+          string[] config_dirs() {
             string[] _config_dirs;
             if (is_pod) {
-            } else {
-            }
+            } else {}
             return _config_dirs;
           }
-          auto image_dirs() {                               // TODO
+          string[] image_dirs() {
             string[] _image_dirs;
             if (is_pod) {
-            } else {
-            }
+            } else {}
             return _image_dirs;
           }
         }
@@ -453,15 +436,15 @@ template ConfigFilePaths() {
     E   _env,
   ) {
     struct ConfFilePaths {
-      auto config_filename_document_toml() {
+      string config_filename_document_toml() {
         return "sisu_document_make";
       }
-      auto config_filename_site_toml() {
+      string config_filename_site_toml() {
         return "config_local_site";
       }
       auto possible_config_path_locations() {
         struct _ConfFilePaths {
-          auto sisu_document_make() {
+          string[] sisu_document_make() {
             /+ FIX clean up conf paths ↓ +/
             /+ config local site (file system only, not in pod) +/
             /+ return paths +/
@@ -504,7 +487,7 @@ template ConfigFilePaths() {
             +/
             return _possible_config_path_locations;
           }
-          auto config_local_site() {
+          string[] config_local_site() {
             /+ FIX clean up conf paths ↓ +/
             /+ config local site (file system only, not in pod) +/
             string _dot_pwd        = asNormalizedPath(chainPath(to!string(_env["pwd"]), ".sisu")).array;
@@ -617,7 +600,7 @@ template SiSUpathsSRC() {
       auto pwd() {
         return _pwd;
       }
-      auto language() {
+      string language() {
         // use command line info as well?
         string _k;
         if (auto m = _fn_src_and_path.match(rgx.language_code_and_filename)) {
@@ -627,7 +610,7 @@ template SiSUpathsSRC() {
         }
         return _k;
       }
-      auto doc_root() {
+      string doc_root() {
         return "sisudoc";
       }
       auto media_root() {
@@ -944,13 +927,9 @@ template SiSUoutPaths() {
   ) {
     struct _PathsStruct {
       string output_root() {
-        string out_root_;
-        if (output_pth_root.length > 0) {
-          out_root_ = output_pth_root;
-        } else {
-          out_root_ = "sisugen";
-        }
-        return out_root_;
+        return (output_pth_root.length > 0)
+        ? output_pth_root
+        : "sisugen";
       }
       string output_base() {
         return asNormalizedPath(output_root.chainPath(lng)).array;
@@ -965,13 +944,9 @@ template SiSUoutPathSQLite() {
   ) {
     struct _PathsStruct {
       string output_root() {
-        string out_root_;
-        if (output_pth_root.length > 0) {
-          out_root_ = output_pth_root;
-        } else {
-          out_root_ = "sisugen";
-        }
-        return out_root_;
+        return (output_pth_root.length > 0)
+        ? output_pth_root
+        : "sisugen";
       }
       string output_base() {
         return asNormalizedPath(output_root).array;
@@ -1006,7 +981,7 @@ template SiSUoutPathsFnPd() {
             - else if pod_name != file_name
               - pod_name.file_name
         +/
-        auto _fn_src = fn_src_pth.baseName.stripExtension;
+        string _fn_src = fn_src_pth.baseName.stripExtension;
         string _output_base_name;
         if (!(pod_name.empty)) {
           if (pod_name == _fn_src) {