From b9869c11f054430856ff0a0b9bd892e1579a5822 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 8 Apr 2023 19:31:02 -0700
Subject: [PATCH] Update the EXIF table so that it properly formats data from
 my Canon camera

---
 assets/styles/photos.css               |  2 +-
 layouts/partials/photo_exif_table.html | 57 ++++++++++++++++++--------
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/assets/styles/photos.css b/assets/styles/photos.css
index 8a92724..923bc63 100644
--- a/assets/styles/photos.css
+++ b/assets/styles/photos.css
@@ -119,7 +119,7 @@
     font-weight: bold;
 }
 
-.photo-params tbody tr:first-child > td {
+.photo-params tbody tr > td {
   border: none;
   border-bottom: 1px solid var(--photo-params-border-color);
 }
diff --git a/layouts/partials/photo_exif_table.html b/layouts/partials/photo_exif_table.html
index 569cff0..fbd229f 100644
--- a/layouts/partials/photo_exif_table.html
+++ b/layouts/partials/photo_exif_table.html
@@ -3,37 +3,62 @@
     <table>
       {{ if and .Tags.Make .Tags.Model }}
       <thead>
-        <td class="make-model" colspan=4>{{ .Tags.Make }} {{ .Tags.Model }}</td>
+        <td class="make-model" colspan=4>
+          {{- $make := .Tags.Make -}}
+          {{- $model := .Tags.Model -}}
+          {{- if in $model $make -}}
+            {{ .Tags.Model }}
+          {{- else -}}
+            {{ .Tags.Make }} {{ .Tags.Model }}
+          {{- end -}}
+        </td>
       </thead>
       {{ end }}
+      {{ with .Tags.LensModel }}
       <tr>
-        {{ if and .Lat .Long }}
-        <td colspan="2" class="location">
+        <td colspan=4 class="lens">{{ . }}</td>
+      </tr>
+      {{ end }}
+      <tr>
+        {{- $hasLocation := and .Lat .Long -}}
+        {{ if $hasLocation -}}
+        <td colspan=2 class="location">
           {{ $lat := float .Lat }}{{ $latDir := cond (eq $lat 0) "" (cond (gt $lat 0) "N" "S") }}
           <data class="latitude" value="{{ $lat }}">{{ .Lat | lang.FormatNumber (cond (ne $lat 0) 3 0) }}º{{ $latDir }}</data>,
           {{ $long := float .Long }}{{ $longDir := cond (eq $long 0) "" (cond (gt $long 0) "E" "W") }}
           <data class="longitude" value="{{ $long }}">{{ .Long | lang.FormatNumber (cond (ne $long 0) 3 0) }}º{{ $longDir }}</data>
         </td>
-        {{ end }}
-        {{ if and .Tags.PixelXDimension .Tags.PixelYDimension }}
-        <td colspan="2" class="size">
-          {{ $widthpx := .Tags.PixelXDimension }}
-          {{ $heightpx := .Tags.PixelYDimension }}
-          {{ if and (gt $widthpx 0) (gt $heightpx 0) }}
-          {{ $megapixels := div (mul $widthpx $heightpx) 1e6 }}
-          <span class="nobreak"><data value="{{ $megapixels }}">{{ $megapixels | lang.FormatNumber 0 }} MP</data></span>
-          • 
-          <span class="nobreak">{{ $widthpx }} × {{ $heightpx }}</span>
-          {{ end }}
+        {{- end -}}
+        {{ if and .Tags.PixelXDimension .Tags.PixelYDimension -}}
+          <td colspan={{ if $hasLocation }}2{{ else }}4{{ end }} class="size">
+          {{- $widthpx := .Tags.PixelXDimension -}}
+          {{- $heightpx := .Tags.PixelYDimension -}}
+          {{- if and (gt $widthpx 0) (gt $heightpx 0) -}}
+            {{- $megapixels := div (mul $widthpx $heightpx) 1e6 -}}
+            <data class="megapixels nobreak" value="{{ $megapixels }}">{{ $megapixels | lang.FormatNumber 0 }} MP</data>
+            •
+            <span class="nobreak"><data class="width">{{ $widthpx }}</data> × <data class="height">{{ $heightpx }}</data></span>
+          {{- end -}}
         </td>
         {{ end }}
       </tr>
       {{ if or .Tags.ISOSpeedRatings .Tags.FocalLengthIn35mmFilm .Tags.FNumber .Tags.ExposureTime }}
       <tr class="exposure-attributes">
         <td class="iso">{{ with .Tags.ISOSpeedRatings }}ISO {{ . }}{{ end }}</td>
-        <td class="focal-length">{{ with .Tags.FocalLengthIn35mmFilm }}{{ . }} mm{{ end }}</td>
+        <td class="focal-length">
+          {{- $focalLength := .Tags.FocalLengthIn35mmFilm | default .Tags.FocalLength -}}
+          {{- with $focalLength -}}{{ . }} mm{{- end -}}
+        </td>
         <td class="f-number">{{ with .Tags.FNumber }}ƒ{{ . }}{{ end }}</td>
-        <td class="exposure-time">{{ with .Tags.ExposureTime }}{{ . }} s{{ end }}</td>
+        <td class="exposure-time">
+          {{- with $exposureTime := .Tags.ExposureTime -}}
+            {{- if in $exposureTime "/" -}}
+              {{ . }} s
+            {{- else -}}
+              1/{{ printf "%.0f" (div 1.0 (float $exposureTime)) }} s
+            {{- end -}}
+          {{- end -}}
+        </td>
       </tr>
       {{ end }}
     </table>