Simplify photos variables

apexskier · apexskier · commit 455ec25d7947 · 2023-12-26T17:05:29.000-07:00
diff --git a/archetypes/photos/index.md b/archetypes/photos/index.md
@@ -5,7 +5,6 @@ tags: []
 images:
   - https://content.camlittle.com/photos/{{ .Name }}_1280.jpg
 
-photo: {{ .Name }}
 camera: Sony α6300
 location: 
 
diff --git a/content/photos/2017-04-28-alpine-start/index.md b/content/photos/2017-04-28-alpine-start/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors", "sun"]
 images:
   - https://content.camlittle.com/photos/2017-04-28-alpine-start_1280.jpg
 
-photo: 2017-04-28-alpine-start
 camera: Sony α6300
 location: Mount Adams, Washington
 
diff --git a/content/photos/2017-08-23-wild-meadow-colors/index.md b/content/photos/2017-08-23-wild-meadow-colors/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2017-08-23-wild-meadow-colors_1280.jpg
 
-photo: 2017-08-23-wild-meadow-colors
 camera: Sony α6300
 location: Glacier Peak, North Cascades, Washington
 
diff --git a/content/photos/2019-06-05-dettifoss/index.md b/content/photos/2019-06-05-dettifoss/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors", "waterfall"]
 images:
   - https://content.camlittle.com/photos/2019-06-05-dettifoss_1280.jpg
 
-photo: 2019-06-05-dettifoss
 camera: Sony α6300
 location: Dettifoss, Iceland
 
diff --git a/content/photos/2019-07-27-fog-beams/index.md b/content/photos/2019-07-27-fog-beams/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors", "sun"]
 images:
   - https://content.camlittle.com/photos/2019-07-27-fog-beams_1280.jpg
 
-photo: 2019-07-27-fog-beams
 camera: Sony α6300
 location: West Coast Trail, British Columbia
 
diff --git a/content/photos/2020-07-25-bohemian-switzerland-national-park/index.md b/content/photos/2020-07-25-bohemian-switzerland-national-park/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2020-07-25-bohemian-switzerland-national-park_1280.jpg
 
-photo: 2020-07-25-bohemian-switzerland-national-park
 camera: Sony α6300
 location: Bohemian Switzerland National Park, Czechia
 
diff --git a/content/photos/2020-08-14-tatras/index.md b/content/photos/2020-08-14-tatras/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2020-08-14-tatras_1280.jpg
 
-photo: 2020-08-14-tatras
 camera: Sony α6300
 location: PTTK Murowaniec, Tatras National Park
 
diff --git a/content/photos/2020-09-15-pieniny/index.md b/content/photos/2020-09-15-pieniny/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2020-09-15-pieniny_1280.jpg
 
-photo: 2020-09-15-pieniny
 camera: Sony α6300
 location: Pieniny Mountains National Park
 
diff --git a/content/photos/2021-05-02-ojcowski-spring-growth/index.md b/content/photos/2021-05-02-ojcowski-spring-growth/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/ojcowski-spring-growth_1280.jpg
 
-photo: ojcowski-spring-growth
 camera: Sony α6300
 location: Ojcowski National Park, Poland
 
@@ -15,4 +14,4 @@ color:
   left: '#5a6b4f'
   bottom: '#596e49'
   average: '#637d57'
----
+---
diff --git a/content/photos/2021-07-18-sopot-summer/index.md b/content/photos/2021-07-18-sopot-summer/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/sopot-summer_1280.jpg
 
-photo: sopot-summer
 camera: Sony α6300
 location: Sopot, Poland
 captureDate: 2021-07-13
diff --git a/content/photos/2021-09-05-carlsbad-cactus/index.md b/content/photos/2021-09-05-carlsbad-cactus/index.md
@@ -5,7 +5,6 @@ tags: [outdoors]
 images:
   - https://content.camlittle.com/photos/2021-09-05-carlsbad-cactus_1280.jpg
 
-photo: 2021-09-05-carlsbad-cactus
 camera: Sony α6300
 location: Carlsbad Caverns National Park, NM
 
diff --git a/content/photos/2021-09-05-carlsbad-snake/index.md b/content/photos/2021-09-05-carlsbad-snake/index.md
@@ -5,7 +5,6 @@ tags: [outdoors]
 images:
   - https://content.camlittle.com/photos/2021-09-05-carlsbad-snake_1280.jpg
 
-photo: 2021-09-05-carlsbad-snake
 camera: Sony α6300
 location: Carlsbad Caverns National Park, NM
 
diff --git a/content/photos/2021-09-11-lightning/index.md b/content/photos/2021-09-11-lightning/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2021-09-11-lightning_1280.jpg
 
-photo: 2021-09-11-lightning
 camera: Sony α6300
 location: San Rafael Reef, UT
 
diff --git a/content/photos/2021-10-10-seasonal-transition/index.md b/content/photos/2021-10-10-seasonal-transition/index.md
@@ -5,9 +5,8 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2021-10-10-seasonal-transition_1280.jpg
 
-photo: 2021-10-10-seasonal-transition
 camera: Sony α6300
-location: Cache National Forest⁩, UT
+location: Cache National Forest, UT
 
 color:
   top: '#dcdde1'
diff --git a/content/photos/2022-03-09-big-and-little-horns/index.md b/content/photos/2022-03-09-big-and-little-horns/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/big-and-little-horns_1280.jpg
 
-photo: big-and-little-horns
 camera: Sony α6300
 location: Capitol Reef National Park, UT
 captureDate: 2022-03-09
diff --git a/content/photos/2022-07-16-birthday-bison/index.md b/content/photos/2022-07-16-birthday-bison/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2022-07-16-birthday-bison_1280.jpg
 
-photo: 2022-07-16-birthday-bison
 camera: Sony α6300
 location: Theodore Roosevelt National Park, ND
 captureDate: 2022-07-16
diff --git a/content/photos/2022-07-23-green-badlands/index.md b/content/photos/2022-07-23-green-badlands/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2022-07-23-green-badlands_1280.jpg
 
-photo: 2022-07-23-green-badlands
 camera: Sony α6300
 location: Badlands National Park, SD
 captureDate: 2022-07-23
diff --git a/content/photos/2022-10-09-snowbasin-fall/index.md b/content/photos/2022-10-09-snowbasin-fall/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2022-10-09-snowbasin-fall_1280.jpg
 
-photo: 2022-10-09-snowbasin-fall
 camera: Sony α6300
 location: Snowbasin, UT
 captureDate: 2022-10-09T12:59:49
diff --git a/content/photos/2022-10-24-tetons/index.md b/content/photos/2022-10-24-tetons/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2022-10-24-tetons_1280.jpg
 
-photo: 2022-10-24-tetons
 camera: Sony α6300
 location: Wyoming
 captureDate: 2022-10-24T16:19:27
diff --git a/content/photos/2022-12-29-great-sand-dunes/index.md b/content/photos/2022-12-29-great-sand-dunes/index.md
@@ -5,7 +5,6 @@ tags: [outdoors]
 images:
   - https://content.camlittle.com/photos/2022-12-29-great-sand-dunes_1280.jpg
 
-photo: 2022-12-29-great-sand-dunes
 camera: Sony α6300
 location: Great Sand Dunes National Park, CO
 captureDate: 2022-09-23
diff --git a/content/photos/2022-12-29-half-dome-cables/index.md b/content/photos/2022-12-29-half-dome-cables/index.md
@@ -5,7 +5,6 @@ tags: [outdoors]
 images:
   - https://content.camlittle.com/photos/2022-12-29-half-dome-cables_1280.jpg
 
-photo: 2022-12-29-half-dome-cables
 camera: Sony α6300
 location: Half Dome, Yosemite National Park, CA
 captureDate: 2022-09-02
diff --git a/content/photos/2022-12-29-lake-marie/index.md b/content/photos/2022-12-29-lake-marie/index.md
@@ -5,7 +5,6 @@ tags: [outdoors]
 images:
   - https://content.camlittle.com/photos/2022-12-29-lake-marie_1280.jpg
 
-photo: 2022-12-29-lake-marie
 camera: Sony α6300
 location: Lake Marie, John Muir Wilderness, CA
 captureDate: 2022-08-25
diff --git a/content/photos/2022-12-29-milky-way/index.md b/content/photos/2022-12-29-milky-way/index.md
@@ -5,7 +5,6 @@ tags: [outdoors]
 images:
   - https://content.camlittle.com/photos/2022-12-29-milky-way_1280.jpg
 
-photo: 2022-12-29-milky-way
 camera: Sony α6300
 location: Sequoia & Kings Canyon Wilderness, CA
 captureDate: 2023-08-23
diff --git a/content/photos/2022-12-29-pika/index.md b/content/photos/2022-12-29-pika/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2022-12-29-pika_1280.jpg
 
-photo: 2022-12-29-pika
 camera: Sony α6300
 location: Kings Canyon National Park, CA
 captureDate: 2022-08-22
diff --git a/content/photos/2022-12-29-purple-paintbrush/index.md b/content/photos/2022-12-29-purple-paintbrush/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2022-12-29-purple-paintbrush_1280.jpg
 
-photo: 2022-12-29-purple-paintbrush
 camera: Sony α6300
 location: Sequoia & Kings Canyon Wilderness, CA
 captureDate: 2022-08-16T06:03:00
diff --git a/content/photos/2022-12-29-sunrise-on-whitney/index.md b/content/photos/2022-12-29-sunrise-on-whitney/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors", "sun"]
 images:
   - https://content.camlittle.com/photos/2022-12-29-sunrise-on-whitney_1280.jpg
 
-photo: 2022-12-29-sunrise-on-whitney
 camera: Sony α6300
 location: Mount Whitney, CA
 captureDate: 2022-08-16T06:03:00
diff --git a/content/photos/2023-01-24-not-canon-beach/index.md b/content/photos/2023-01-24-not-canon-beach/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors", "sun"]
 images:
   - https://content.camlittle.com/photos/2023-01-24-not-canon-beach_1280.jpg
 
-photo: 2023-01-24-not-canon-beach
 camera: Sony α6300
 location: Cape Kiwanda State Natural Area, OR
 captureDate: 2023-01-24T16:58:49
diff --git a/content/photos/2023-01-28-tree-of-life/index.md b/content/photos/2023-01-28-tree-of-life/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2023-01-28-tree-of-life_1280.jpg
 
-photo: 2023-01-28-tree-of-life
 camera: Sony α6300
 location: Kalaloch, WA
 captureDate: 2023-01-28T14:46:23
diff --git a/content/photos/2023-02-07-mcarthur-burney-falls/index.md b/content/photos/2023-02-07-mcarthur-burney-falls/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors", "waterfall"]
 images:
   - https://content.camlittle.com/photos/2023-02-07-mcarthur-burney-falls_1280.jpg
 
-photo: 2023-02-07-mcarthur-burney-falls
 camera: Sony α6300
 location: McArthur-Burney Falls Memorial State Park, CA
 captureDate: 2023-02-07T14:55:59
diff --git a/content/photos/2023-02-12-death-valley-colors/index.md b/content/photos/2023-02-12-death-valley-colors/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2023-02-12-death-valley-colors_1280.jpg
 
-photo: 2023-02-12-death-valley-colors
 camera: Sony α6300
 location: Badwater Basin, Death Valley National Park
 captureDate: 2023-02-12T17:33:07
diff --git a/content/photos/2023-02-13-death-valley-layers/index.md b/content/photos/2023-02-13-death-valley-layers/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors", "sun"]
 images:
   - https://content.camlittle.com/photos/2023-02-13-death-valley-layers_1280.jpg
 
-photo: 2023-02-13-death-valley-layers
 camera: Sony α6300
 location: Death Valley National Park
 captureDate: 2023-02-13T07:44:21
diff --git a/content/photos/2023-03-03-white-and-black-canyon/index.md b/content/photos/2023-03-03-white-and-black-canyon/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors"]
 images:
   - https://content.camlittle.com/photos/2023-03-03-white-and-black-canyon_1280.jpg
 
-photo: 2023-03-03-white-and-black-canyon
 camera: Sony α6300
 location: Black Canyon of the Gunnison
 captureDate: 2023-03-03T13:25:12
diff --git a/content/photos/2023-09-16-below-wheeler/index.md b/content/photos/2023-09-16-below-wheeler/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors", "nm"]
 images:
   - https://content.camlittle.com/photos/2023-09-16-below-wheeler_1280.jpg
 
-photo: 2023-09-16-below-wheeler
 camera: Sony α6300
 location: Wheeler Peak, NM
 captureDate: 2023-09-16T08:15:48
diff --git a/content/photos/2023-09-16-first-snow-nm/index.md b/content/photos/2023-09-16-first-snow-nm/index.md
@@ -5,7 +5,6 @@ tags: ["outdoors", "nm"]
 images:
   - https://content.camlittle.com/photos/2023-09-16-first-snow-nm_1280.jpg
 
-photo: 2023-09-16-first-snow-nm
 camera: Sony α6300
 location: Wheeler Peak, NM
 captureDate: 2023-09-16T06:55:47
diff --git a/layouts/index.html b/layouts/index.html
@@ -19,7 +19,7 @@
     {{ range $featuredPages }}
         {{ if eq .Type "photos" }}
         <li class="post-link">
-            {{ partial "single/thumbnail" (.Resources.GetMatch (printf "%s_128.jpg" .Params.photo)) }}
+            {{ partial "single/thumbnail" (.Resources.GetMatch "*_128.jpg") }}
             <div>
                 {{ partial "time" (default .Params.captureDate .Date) }}
                 <h3>
diff --git a/layouts/photos/head.html b/layouts/photos/head.html
@@ -1,12 +1,14 @@
 {{ if eq .Kind "page" }}
 <meta name="twitter:card" content="summary_large_image">
 
+{{ $mini := .Resources.GetMatch "*_128.jpg" }}
+{{ $photo := index (index (strings.FindRESubmatch `(.*)_128\.jpg` $mini.Name 1) 0) 1 }}
 <script type="application/ld+json">
 {
   "@context": "https://schema.org/",
   "@type": "ImageObject",
   "author": {{ .Site.Author.name }},
-  "contentUrl": "https://content.camlittle.com/photos/{{ .Params.photo }}_1280.jpg",
+  "contentUrl": "https://content.camlittle.com/photos/{{ $photo }}_1280.jpg",
   {{ with .Params.location }}
     "contentLocation": {{ . }},
   {{ end }}
diff --git a/layouts/photos/li.html b/layouts/photos/li.html
@@ -1,4 +1,5 @@
-{{ $mini := .Resources.GetMatch (printf "%s_128.jpg" .Params.photo) }}
+{{ $mini := .Resources.GetMatch "*_128.jpg" }}
+{{ $photo := index (index (strings.FindRESubmatch `(.*)_128\.jpg` $mini.Name 1) 0) 1 }}
 {{ $aspectRatio := div $mini.Width (float $mini.Height) }}
 {{ $id := printf "item-%s" ($mini.Content | md5 | truncate 10 "") }}
 
@@ -30,11 +31,11 @@
     <!-- this outer container forces the padding based aspect ratio to be constrained to the height of the page -->
     <a href="{{ .RelPermalink }}" target="_blank">
         <picture title="{{ .Title }}">
-            <source media="(max-width: 640px)" srcset="https://content.camlittle.com/photos/{{ .Params.photo }}_640.webp" type="image/webp" />
-            <source media="(max-width: 640px)" srcset="https://content.camlittle.com/photos/{{ .Params.photo }}_640.jpg" />
-            <source srcset="https://content.camlittle.com/photos/{{ .Params.photo }}_1280.webp" type="image/webp" />
-            <source srcset="https://content.camlittle.com/photos/{{ .Params.photo }}_1280.jpg" />
-            <img alt="{{ .Title }}" src="https://content.camlittle.com/photos/{{ .Params.photo }}_1280.jpg" width="1280" height="{{ math.Round (mul $aspectRatio 1280) }}" />
+            <source media="(max-width: 640px)" srcset="https://content.camlittle.com/photos/{{ $photo }}_640.webp" type="image/webp" />
+            <source media="(max-width: 640px)" srcset="https://content.camlittle.com/photos/{{ $photo }}_640.jpg" />
+            <source srcset="https://content.camlittle.com/photos/{{ $photo }}_1280.webp" type="image/webp" />
+            <source srcset="https://content.camlittle.com/photos/{{ $photo }}_1280.jpg" />
+            <img alt="{{ .Title }}" src="https://content.camlittle.com/photos/{{ $photo }}_1280.jpg" width="1280" height="{{ math.Round (mul $aspectRatio 1280) }}" />
         </picture>
     </a>
 </li>
diff --git a/layouts/photos/rss/item/contentPre.xml b/layouts/photos/rss/item/contentPre.xml
@@ -1 +1,3 @@
-<img src="https://content.camlittle.com/photos/{{ .Params.photo }}_1280.jpg" />
+{{ $mini := .Resources.GetMatch "*_128.jpg" }}
+{{ $photo := index (index (strings.FindRESubmatch `(.*)_128\.jpg` $mini.Name 1) 0) 1 }}
+<img src="https://content.camlittle.com/photos/{{ $photo }}_1280.jpg" />
diff --git a/layouts/photos/single.html b/layouts/photos/single.html
@@ -1,6 +1,7 @@
 {{ define "main" }}
 
-{{ $mini := .Resources.GetMatch (printf "%s_128.jpg" .Params.photo) }}
+{{ $mini := .Resources.GetMatch "*_128.jpg" }}
+{{ $photo := index (index (strings.FindRESubmatch `(.*)_128\.jpg` $mini.Name 1) 0) 1 }}
 {{ $aspectRatio := div $mini.Width (float $mini.Height) }}
 
 <!--
@@ -31,11 +32,11 @@
             {{ end }}
         "
     >
-        <source srcset="https://content.camlittle.com/photos/{{ .Params.photo }}_1280.webp 1280w, https://content.camlittle.com/photos/{{ .Params.photo }}_2880.webp 2880w" type="image/webp" />
-        <source srcset="https://content.camlittle.com/photos/{{ .Params.photo }}_1280.jpg 1280w, https://content.camlittle.com/photos/{{ .Params.photo }}_2880.jpg 2880w" />
+        <source srcset="https://content.camlittle.com/photos/{{ $photo }}_1280.webp 1280w, https://content.camlittle.com/photos/{{ $photo }}_2880.webp 2880w" type="image/webp" />
+        <source srcset="https://content.camlittle.com/photos/{{ $photo }}_1280.jpg 1280w, https://content.camlittle.com/photos/{{ $photo }}_2880.jpg 2880w" />
 
         <img
-            src="https://content.camlittle.com/photos/{{ .Params.photo }}_1280.jpg"
+            src="https://content.camlittle.com/photos/{{ $photo }}_1280.jpg"
             {{ with $mini }}height="{{ int (div 2880 $aspectRatio) }}" width="2880"{{end}}
         />
     </picture>
@@ -53,7 +54,7 @@ <h1>{{ .Title }}</h1>
 
     <p>
         <span title="Camera">📷</span> {{ .Params.camera }}<br />
-        <a href="https://content.camlittle.com/photos/{{ .Params.photo }}_original.jpg">Full size</a>
+        <a href="https://content.camlittle.com/photos/{{ $photo }}_original.jpg">Full size</a>
     </p>
 </section>
 
