Fix image shortcodes, get_image_metadata()

1 files changed, 19 insertions, 15 deletions

diff --git a/templates/shortcodes/img.html b/templates/shortcodes/img.html
index f23f783..a5a0541 100644
--- a/templates/shortcodes/img.html
+++ b/templates/shortcodes/img.html
@@ -1,30 +1,34 @@
+{%- set img = src | split(pat="/") | last %}
 {%- set dirtest = src | trim_start_matches(pat="./") %}
-{%- if dirtest is containing("/") %}
-  {%- set reldir = true %}
-{%- endif %}
+{%- if dirtest is containing("/") %} {%- set reldir = true %} {%- endif %}
 
 {%- if src is starting_with("./") and reldir %} {# Relative Path #}
   {%- set path = src | trim_start_matches(pat="./") | split(pat="/") | slice(end=-1) | join(sep="/") | trim_start_matches(pat="/") %}
-  {%- set path = path ~ "/"  %}
+  {%- set path = path ~ "/" %}
+  {%- if not w or not h %}
+    {%- set meta = get_image_metadata(path=page.path ~ path ~ img) %}
+    {%- set w = meta.width %}
+    {%- set h = meta.height %}
+  {%- endif %}
 
 {%- elif src is starting_with("/") %} {# Root Path #}
   {%- set rootpath = src | split(pat="/") | slice(end=-1) | join(sep="/") %}
   {%- set path = config.base_url ~ rootpath ~ "/"  %}
+  {%- if not w or not h %}
+    {%- set meta = get_image_metadata(path=rootpath ~ "/" ~ img) %}
+    {%- set w = meta.width %}
+    {%- set h = meta.height %}
+  {%- endif %}
 
 {%- else %} {# Same Directory Path #}
-  {%- set path = "" %}
-
+  {%- set path = page.path %}
+  {%- if not w or not h %}
+    {%- set meta = get_image_metadata(path=page.path ~ img) %}
+    {%- set w = meta.width %}
+    {%- set h = meta.height %}
+  {%- endif %}
 {%- endif %}
 
-{%- if not w or not h %}
-  {%- set metafile = page.path ~ path ~ src %}
-  {%- set meta = get_image_metadata(path=metafile) %}
-  {%- set w = meta.width %}
-  {%- set h = meta.height %}
-{%- endif %}
-
-{%- set img = src | split(pat="/") | last %}
-
 {%- if not alt %}
   {%- set alt = img | split(pat=".") | first %}
 {%- endif %}