From 9c07f0aac1f5d7a7480667dca53671fcd986db5a Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 23 May 2018 18:32:32 -0400
Subject: image paths

---
 org/default_paths.org | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'org/default_paths.org')

diff --git a/org/default_paths.org b/org/default_paths.org
index 5c0dba4..16dcfaf 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -348,8 +348,24 @@ template PathMatters() {
             return _dir;
           }
           auto image_dir_path() {
-            string _dir = asNormalizedPath(base_dir_path.chainPath("media/image")).array;
-            return _dir;
+            string _img_pth(string _possible_img_pth) {
+              return asNormalizedPath(file_with_absolute_path.dirName ~ "/" ~ _possible_img_pth).array;
+            }
+            string _paths;
+            string[] _possible_img_pths = [ "./image", "../image", "../../image" ];
+            string _img_pth_found = "";
+            foreach(_possible_img_pth; _possible_img_pths) {
+              if (exists(_img_pth(_possible_img_pth))) {
+                _img_pth_found = _img_pth(_possible_img_pth);
+                break;
+              } else {
+                _paths ~= " " ~ _img_pth(_possible_img_pth);
+              }
+            }
+            if (_img_pth_found.empty) {
+              writeln("WARNING not image path found, searched: ", _paths);
+            }
+            return _img_pth_found;
           }
           auto conf_dir_path() {
             auto _dir = asNormalizedPath(base_dir_path.chainPath("conf")).array;
@@ -631,24 +647,6 @@ template SiSUpathsSRC() {
       auto doc_src_with_path() {
         return asNormalizedPath(pwd.chainPath(_fn_src_and_path)).array;
       }
-      auto src_image_root_with_path() {
-        string[] _possible_img_pth = [
-          asNormalizedPath(pwd.chainPath((_fn_src_and_path).dirName ~ "/image")).array,
-          asNormalizedPath(pwd.chainPath((_fn_src_and_path).dirName ~ "/../image")).array,
-          asNormalizedPath(pwd.chainPath((_fn_src_and_path).dirName ~ "/../../image")).array,
-        ];
-        string _img_pth_found = "";
-        foreach(_img_pth; _possible_img_pth) {
-          if (exists(_img_pth)) {
-            _img_pth_found = _img_pth;
-            break;
-          }
-        }
-        if (_img_pth_found.empty) {
-          writeln("WARNING not image path found, searched: ", _possible_img_pth);
-        }
-        return _img_pth_found;
-      }
     }
     return SisuSrcPaths();
   }
-- 
cgit v1.2.3