From c29894f17177499467faebda86a2784757efb03e Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Wed, 23 Dec 2015 22:30:21 +0000
Subject: [PATCH] Test generation of gallery from gps-tagged (fixed)
 photographs from spain-2015

---
 _layouts/gallery-map.html        |  2 +-
 _layouts/gallery-photo.html      |  4 ++
 _scripts/fix-galleries-spain.php | 31 +++++++++++++
 commands-spain.bat               |  5 ++
 commands.bat                     | 80 ++++++++++++++++++++++++++++++++
 5 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 _scripts/fix-galleries-spain.php
 create mode 100644 commands-spain.bat
 create mode 100644 commands.bat

diff --git a/_layouts/gallery-map.html b/_layouts/gallery-map.html
index d405bfa..a7b5b82 100644
--- a/_layouts/gallery-map.html
+++ b/_layouts/gallery-map.html
@@ -27,7 +27,7 @@ layout: post
                         title : "{{ item.title }}"
                     });
                     var w = new google.maps.InfoWindow({
-                        content: '<div style="margin-bottom:5px;">{{ item.title|replace:"'","\\'" }}</div><a href="/{{ item.fullname }}.html"><img alt="Photo: {{ item.title|replace:"'","\\'" }}" height="200" src="{{ site.asset_prefix }}/{{ item.fullname }}~200x200.jpg" title="{{ item.title|replace:"'","\\'" }}" width="200" /></a>'
+                        content: '<div style="margin-bottom:5px;">{{ item.title|replace:"'","\\'" }}</div><a href="/{{ site.baseurl }}/{{ item.fullname }}.html"><img alt="Photo: {{ item.title|replace:"'","\\'" }}" height="200" src="{{ site.asset_prefix }}/{{ item.fullname }}~200x200.jpg" title="{{ item.title|replace:"'","\\'" }}" width="200" /></a>'
                     });
                     google.maps.event.addListener(
                         m,
diff --git a/_layouts/gallery-photo.html b/_layouts/gallery-photo.html
index b3f7167..f857c0e 100644
--- a/_layouts/gallery-photo.html
+++ b/_layouts/gallery-photo.html
@@ -57,11 +57,15 @@ layout: post
                     <dt>Camera</dt>
                     <dd>{{ page.exif.make }} {{ page.exif.model }}
 
+                    {% if page.exif.aperture %}
                     <dt>Aperture</dt>
                     <dd>{{ page.exif.aperture }}</dd>
+                    {% endif %}
 
+                    {% if page.exif.aperture %}
                     <dt>Exposure</dt>
                     <dd>{{ page.exif.exposure }}</dd>
+                    {% endif %}
 
                     {% if page.sizes %}
                         <dt>Sizes</dt>
diff --git a/_scripts/fix-galleries-spain.php b/_scripts/fix-galleries-spain.php
new file mode 100644
index 0000000..2d99c1d
--- /dev/null
+++ b/_scripts/fix-galleries-spain.php
@@ -0,0 +1,31 @@
+<?php
+$a = 'D:\Todo\Gallery';
+$f = [];
+foreach (glob($a . '/*') as $b) {
+    $b = basename($b);
+    if (strpos($b, 'spain-2015') === 0) {
+        foreach (glob($a . '/' . $b . '/*.jpg') as $c) {
+            $f[basename($c)] = $c;
+        }
+    }
+}
+
+$d = 'D:\Rik\Photographs\Reis\Spanje 2015';
+$e = [];
+foreach (glob($d . '/*') as $b) {
+    if ($b != '.' && $b != '..') {
+        if (is_dir($b)) {
+            foreach (glob($b . '/*.jpg') as $c) {
+                $e[basename($c)] = $c;
+            }
+        }
+    }
+}
+$h = array_intersect_key($f, $e);
+$g = array_keys($h);
+
+foreach ($h as $i => $x) {
+    copy($e[$i], $x);
+}
+
+print_r(array_keys(array_diff_key($f, $h)));
\ No newline at end of file
diff --git a/commands-spain.bat b/commands-spain.bat
new file mode 100644
index 0000000..9a3f7aa
--- /dev/null
+++ b/commands-spain.bat
@@ -0,0 +1,5 @@
+call _scripts/generate-gallery 2015-spain-portrait "D:\Todo\Gallery/spain-2015-portrait"
+call _scripts/generate-gallery 2015-spain-tarragona "D:\Todo\Gallery/spain-2015-tarragona"
+call _scripts/generate-gallery 2015-spain-sitges "D:\Todo\Gallery/spain-2015-sitges"
+call _scripts/generate-gallery 2015-spain-barcelona "D:\Todo\Gallery/spain-2015-barcelona"
+call _scripts/generate-gallery 2015-spain-barcelona-stores "D:\Todo\Gallery/spain-2015-barcelona-stores"
\ No newline at end of file
diff --git a/commands.bat b/commands.bat
new file mode 100644
index 0000000..1838c4d
--- /dev/null
+++ b/commands.bat
@@ -0,0 +1,80 @@
+call _scripts/generate-gallery 2014-lade-braes "D:\Downloads\Gallery/Lade Braes"
+call _scripts/generate-gallery 2014-lab "D:\Downloads\Gallery/Lab"
+call _scripts/generate-gallery 2013-school "D:\Downloads\Gallery/School"
+call _scripts/generate-gallery 2013-dundee "D:\Downloads\Gallery/Dundee"
+call _scripts/generate-gallery 2013-guy-fawkes-bonfire "D:\Downloads\Gallery/Guy Fawkes Bonfire"
+call _scripts/generate-gallery 2013-miscellaneous "D:\Downloads\Gallery/Miscellaneous"
+call _scripts/generate-gallery 2013-wallace-monument "D:\Downloads\Gallery/Wallace Monument"
+call _scripts/generate-gallery 2013-west-sands "D:\Downloads\Gallery/West Sands"
+call _scripts/generate-gallery 2013-visit "D:\Downloads\Gallery/Visit"
+call _scripts/generate-gallery 2013-edinburgh "D:\Downloads\Gallery/Edinburgh"
+call _scripts/generate-gallery 2013-train "D:\Downloads\Gallery/Train"
+call _scripts/generate-gallery 2014-room "D:\Downloads\Gallery/Room"
+call _scripts/generate-gallery 2013-visit-bram "D:\Downloads\Gallery/visit-bram"
+call _scripts/generate-gallery 2015-st-andrews "D:\Downloads\Gallery/St Andrews"
+call _scripts/generate-gallery 2014-views "D:\Downloads\Gallery/Views"
+call _scripts/generate-gallery 2014-strathkinness "D:\Downloads\Gallery/Strathkinness"
+call _scripts/generate-gallery 2014-glasgow "D:\Downloads\Gallery/Glasgow"
+call _scripts/generate-gallery 2014-blair-atholl-distillery "D:\Downloads\Gallery/blair-atholl-distillery"
+call _scripts/generate-gallery 2014-heathergems-factory "D:\Downloads\Gallery/heathergems-factory"
+call _scripts/generate-gallery 2014-the-house-of-bruar "D:\Downloads\Gallery/the-house-of-bruar"
+call _scripts/generate-gallery 2014-waterfall "D:\Downloads\Gallery/waterfall"
+call _scripts/generate-gallery 2014-cooking "D:\Downloads\Gallery/Cooking"
+call _scripts/generate-gallery 2014-whisky-tasting "D:\Downloads\Gallery/whisky-tasting"
+call _scripts/generate-gallery 2014-glenshee-ski "D:\Downloads\Gallery/glenshee-ski"
+call _scripts/generate-gallery 2014-crail "D:\Downloads\Gallery/crail"
+call _scripts/generate-gallery 2014-whisky-tasting-1 "D:\Downloads\Gallery/whisky-tasting-1"
+call _scripts/generate-gallery 2014-london "D:\Downloads\Gallery/london"
+call _scripts/generate-gallery 2014-coastal-path "D:\Downloads\Gallery/coastal-path"
+call _scripts/generate-gallery 2014-anstruther "D:\Downloads\Gallery/anstruther"
+call _scripts/generate-gallery 2014-edinburgh-1 "D:\Downloads\Gallery/edinburgh-1"
+call _scripts/generate-gallery 2014-hike-blair-atholl "D:\Downloads\Gallery/hike-blair-atholl"
+call _scripts/generate-gallery 2014-seat-ibiza "D:\Downloads\Gallery/seat-ibiza"
+call _scripts/generate-gallery 2014-fife "D:\Downloads\Gallery/fife"
+call _scripts/generate-gallery 2014-holidays-uitgeest "D:\Downloads\Gallery/holidays-uitgeest"
+call _scripts/generate-gallery 2014-bike "D:\Downloads\Gallery/Bike"
+call _scripts/generate-gallery 2014-kettins "D:\Downloads\Gallery/Kettins"
+call _scripts/generate-gallery 2014-conference-usic "D:\Downloads\Gallery/conference-usic-2014"
+call _scripts/generate-gallery 2014-autumn-holidays "D:\Downloads\Gallery/autumn-holidays-2014"
+call _scripts/generate-gallery 2014-whisky-tasting-2 "D:\Downloads\Gallery/whisky-tasting-2"
+call _scripts/generate-gallery 2014-tentmuir "D:\Downloads\Gallery/tentmuir"
+call _scripts/generate-gallery 2014-movember "D:\Downloads\Gallery/movember"
+call _scripts/generate-gallery 2015-geneva "D:\Downloads\Gallery/geneva-2014"
+call _scripts/generate-gallery 2015-geneva-history-museum "D:\Downloads\Gallery/geneva-2014-history-museum"
+call _scripts/generate-gallery 2015-geneva-maison-tavel "D:\Downloads\Gallery/geneva-2014-maison-tavel"
+call _scripts/generate-gallery 2015-christmas-holidays "D:\Downloads\Gallery/christmas-holidays-2014"
+call _scripts/generate-gallery 2015-christmas-holidays-ikea "D:\Downloads\Gallery/christmas-holidays-2014-ikea"
+call _scripts/generate-gallery 2015-christmas-holidays-dwingelderveld "D:\Downloads\Gallery/christmas-holidays-2014-dwingelderveld"
+call _scripts/generate-gallery 2015-christmas-holidays-beach "D:\Downloads\Gallery/christmas-holidays-2014-beach"
+call _scripts/generate-gallery 2015-solar-eclipse "D:\Downloads\Gallery/solar-eclipse"
+call _scripts/generate-gallery 2015-botanical-garden "D:\Downloads\Gallery/botanical-garden"
+call _scripts/generate-gallery 2015-home-planting "D:\Downloads\Gallery/home-planting"
+call _scripts/generate-gallery 2015-round-the-houses "D:\Downloads\Gallery/round-the-houses"
+call _scripts/generate-gallery 2015-birthday-holidays "D:\Downloads\Gallery/birthday-holidays-2015"
+call _scripts/generate-gallery 2015-whisky-poker "D:\Downloads\Gallery/whisky-poker"
+call _scripts/generate-gallery 2015-spain-portrait "D:\Downloads\Gallery/spain-2015-portrait"
+call _scripts/generate-gallery 2015-spain-tarragona "D:\Downloads\Gallery/spain-2015-tarragona"
+call _scripts/generate-gallery 2015-spain-sitges "D:\Downloads\Gallery/spain-2015-sitges"
+call _scripts/generate-gallery 2015-spain-barcelona "D:\Downloads\Gallery/spain-2015-barcelona"
+call _scripts/generate-gallery 2015-spain-barcelona-stores "D:\Downloads\Gallery/spain-2015-barcelona-stores"
+call _scripts/generate-gallery 2015-summer-aberdeen "D:\Downloads\Gallery/summer-2015-aberdeen"
+call _scripts/generate-gallery 2015-summer-aberdeen-tolbooth "D:\Downloads\Gallery/summer-2015-aberdeen-tolbooth"
+call _scripts/generate-gallery 2015-summer-dunnottar-castle "D:\Downloads\Gallery/summer-2015-dunnottar-castle"
+call _scripts/generate-gallery 2015-summer-holidays "D:\Downloads\Gallery/summer-holidays-2015"
+call _scripts/generate-gallery 2015-northen-ireland-belfast "D:\Downloads\Gallery/northen-ireland-2015-belfast"
+call _scripts/generate-gallery 2015-northen-ireland-giants-causeway "D:\Downloads\Gallery/northen-ireland-2015-giants-causeway"
+call _scripts/generate-gallery 2015-northen-ireland-dark-hedges "D:\Downloads\Gallery/northen-ireland-2015-dark-hedges"
+call _scripts/generate-gallery 2015-visit-sanne-highlands-hike "D:\Downloads\Gallery/visit-sanne-2015-highlands-hike"
+call _scripts/generate-gallery 2015-visit-sanne-highlands-distillery "D:\Downloads\Gallery/visit-sanne-2015-highlands-distillery"
+call _scripts/generate-gallery 2015-visit-sanne-highlands-perth "D:\Downloads\Gallery/visit-sanne-2015-highlands-perth"
+call _scripts/generate-gallery 2015-visit-sanne-fife-pittenweem "D:\Downloads\Gallery/visit-sanne-2015-fife-pittenweem"
+call _scripts/generate-gallery 2015-visit-sanne-fife-anstruther "D:\Downloads\Gallery/visit-sanne-2015-fife-anstruther"
+call _scripts/generate-gallery 2015-visit-sanne "D:\Downloads\Gallery/visit-sanne-2015"
+call _scripts/generate-gallery 2015-seat-ibiza-heat-shield "D:\Downloads\Gallery/seat-ibiza-heat-shield"
+call _scripts/generate-gallery 2015-autumn-holidays "D:\Downloads\Gallery/autumn-holidays-2015"
+call _scripts/generate-gallery 2015-autumn-runs "D:\Downloads\Gallery/autumn-runs"
+call _scripts/generate-gallery 2015-glen-clova "D:\Downloads\Gallery/glen-clova"
+call _scripts/generate-gallery 2015-glen-clova-david "D:\Downloads\Gallery/glen-clova-david"
+call _scripts/generate-gallery 2015-kingsbarns-distillery "D:\Downloads\Gallery/kingsbarns-distillery"
+call _scripts/generate-gallery 2015-coastal-path-1 "D:\Downloads\Gallery/coastal-path-1"
+yekyll build
\ No newline at end of file