Update the EXIF table so that it properly formats data from my Canon camera
This commit is contained in:
		
							parent
							
								
									3eb3217092
								
							
						
					
					
						commit
						b9869c11f0
					
				
					 2 changed files with 42 additions and 17 deletions
				
			
		| 
						 | 
				
			
			@ -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>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue