From 0aa58bf31f37eab93a2810d38874fbb0c01f6493 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 11 Jun 2026 10:14:30 +0300 Subject: Add EXIF tooltip to details view --- bin/photoalbum | 101 ++++++++++++++++++++++++++++++++++- share/templates/default/details.tmpl | 8 ++- src/lib/album.source.sh | 95 +++++++++++++++++++++++++++++++- src/lib/template.source.sh | 6 +++ tests/cli.sh | 25 ++++++++- 5 files changed, 230 insertions(+), 5 deletions(-) diff --git a/bin/photoalbum b/bin/photoalbum index 323477d..95e03c5 100755 --- a/bin/photoalbum +++ b/bin/photoalbum @@ -711,6 +711,7 @@ validate_template_context() { animation_class backhref exif_details + exif_tooltip page_num photo photos_dir @@ -802,6 +803,8 @@ serialize_template_render_context() { serialize_template_render_var render_enter_page_html "$render_enter_page_html" serialize_template_render_var \ render_exif_details_html "$render_exif_details_html" + serialize_template_render_var \ + render_exif_tooltip_html "$render_exif_tooltip_html" serialize_template_render_var render_height_html "$render_height_html" serialize_template_render_var render_html_dir_html "$render_html_dir_html" serialize_template_render_var \ @@ -849,6 +852,8 @@ prepare_template_render_vars() { html_escape_to render_enter_page_html "$context_value" template_context_value_to render_exif_details_html \ "$context_name" exif_details + template_context_value_to context_value "$context_name" exif_tooltip + html_escape_to render_exif_tooltip_html "$context_value" html_escape_to render_height_html "${HEIGHT:-}" html_escape_to render_html_dir_html "$render_html_dir" html_escape_to render_maxpreviews_html "${MAXPREVIEWS:-}" @@ -918,6 +923,7 @@ render_template() { local render_current_date_text local render_enter_page_html local render_exif_details_html + local render_exif_tooltip_html local render_height_html local render_html_dir local render_html_dir_html @@ -1494,6 +1500,94 @@ photo_exif_details_html() { printf '\n' } +_first_exif_value_to() { + local -n output_ref="$1"; shift + local -n exif_ref="$1"; shift + local key + + output_ref='' + for key in "$@"; do + if [ -n "${exif_ref[$key]:-}" ]; then + # shellcheck disable=SC2034 + output_ref="${exif_ref[$key]}" + return + fi + done +} + +photo_exif_tooltip_text() { + local -r photo="$1"; shift + local -r photo_path="$1"; shift + local aperture + local camera + local date_time + local iso + local key + local line + local make + local model + local separator='' + local shutter_speed + local -A exif_values=() + local -a tooltip_parts=() + + while IFS= read -r line; do + if [[ "$line" =~ ^[[:space:]]*exif:([^:]+):[[:space:]]*(.*)$ ]]; then + exif_values["${BASH_REMATCH[1]}"]="${BASH_REMATCH[2]}" + fi + done < <(cached_photo_identify_output "$photo" "$photo_path") + + make="${exif_values[Make]:-}" + model="${exif_values[Model]:-}" + camera="$make" + if [ -n "$model" ]; then + if [ -n "$make" ]; then + case "$model" in + "$make"|"$make "*) + camera="$model" + ;; + *) + camera="$make $model" + ;; + esac + else + camera="$model" + fi + fi + + _first_exif_value_to aperture exif_values FNumber ApertureValue + _first_exif_value_to iso exif_values \ + ISOSpeedRatings PhotographicSensitivity ISO + _first_exif_value_to shutter_speed exif_values \ + ExposureTime ShutterSpeedValue + _first_exif_value_to date_time exif_values \ + DateTimeOriginal DateTimeDigitized DateTime + + if [ -n "$camera" ]; then + tooltip_parts+=("Camera: $camera") + fi + if [ -n "$aperture" ]; then + tooltip_parts+=("Aperture: $aperture") + fi + if [ -n "$iso" ]; then + tooltip_parts+=("ISO: $iso") + fi + if [ -n "$shutter_speed" ]; then + tooltip_parts+=("Shutter speed: $shutter_speed") + fi + if [ -n "$date_time" ]; then + tooltip_parts+=("Taken: $date_time") + fi + + for key in "${tooltip_parts[@]}"; do + printf '%s%s' "$separator" "$key" + separator='; ' + done + if (( ${#tooltip_parts[@]} > 0 )); then + printf '\n' + fi +} + render_details_page() { local -r html_dir="$1"; shift local -r photos_dir="$1"; shift @@ -1505,6 +1599,7 @@ render_details_page() { local -r photo_file="$1"; shift local animation_class local exif_details_html + local exif_tooltip_text template header "$page_num-$preview_num-details.html" \ html_dir "$html_dir" \ @@ -1517,6 +1612,9 @@ render_details_page() { exif_details_html=$( photo_exif_details_html "$photo_file" "$INCOMING_DIR/$photo_file" ) + exif_tooltip_text=$( + photo_exif_tooltip_text "$photo_file" "$INCOMING_DIR/$photo_file" + ) template details "$page_num-$preview_num-details.html" \ html_dir "$html_dir" \ backhref "$backhref" \ @@ -1525,7 +1623,8 @@ render_details_page() { preview_num "$preview_num" \ photo "$photo_file" \ animation_class "$animation_class" \ - exif_details "$exif_details_html" + exif_details "$exif_details_html" \ + exif_tooltip "$exif_tooltip_text" template footer "$page_num-$preview_num-details.html" \ html_dir "$html_dir" \ backhref "$backhref" \ diff --git a/share/templates/default/details.tmpl b/share/templates/default/details.tmpl index 90256b7..be2c47d 100644 --- a/share/templates/default/details.tmpl +++ b/share/templates/default/details.tmpl @@ -1,9 +1,15 @@ +if [ -n "$render_exif_tooltip_html" ]; then + render_exif_tooltip_attr=" title=\"$render_exif_tooltip_html\"" +else + render_exif_tooltip_attr='' +fi + cat <
- +
⇐ diff --git a/src/lib/album.source.sh b/src/lib/album.source.sh index 0efff6e..5652a5e 100644 --- a/src/lib/album.source.sh +++ b/src/lib/album.source.sh @@ -202,6 +202,94 @@ photo_exif_details_html() { printf '\n' } +_first_exif_value_to() { + local -n output_ref="$1"; shift + local -n exif_ref="$1"; shift + local key + + output_ref='' + for key in "$@"; do + if [ -n "${exif_ref[$key]:-}" ]; then + # shellcheck disable=SC2034 + output_ref="${exif_ref[$key]}" + return + fi + done +} + +photo_exif_tooltip_text() { + local -r photo="$1"; shift + local -r photo_path="$1"; shift + local aperture + local camera + local date_time + local iso + local key + local line + local make + local model + local separator='' + local shutter_speed + local -A exif_values=() + local -a tooltip_parts=() + + while IFS= read -r line; do + if [[ "$line" =~ ^[[:space:]]*exif:([^:]+):[[:space:]]*(.*)$ ]]; then + exif_values["${BASH_REMATCH[1]}"]="${BASH_REMATCH[2]}" + fi + done < <(cached_photo_identify_output "$photo" "$photo_path") + + make="${exif_values[Make]:-}" + model="${exif_values[Model]:-}" + camera="$make" + if [ -n "$model" ]; then + if [ -n "$make" ]; then + case "$model" in + "$make"|"$make "*) + camera="$model" + ;; + *) + camera="$make $model" + ;; + esac + else + camera="$model" + fi + fi + + _first_exif_value_to aperture exif_values FNumber ApertureValue + _first_exif_value_to iso exif_values \ + ISOSpeedRatings PhotographicSensitivity ISO + _first_exif_value_to shutter_speed exif_values \ + ExposureTime ShutterSpeedValue + _first_exif_value_to date_time exif_values \ + DateTimeOriginal DateTimeDigitized DateTime + + if [ -n "$camera" ]; then + tooltip_parts+=("Camera: $camera") + fi + if [ -n "$aperture" ]; then + tooltip_parts+=("Aperture: $aperture") + fi + if [ -n "$iso" ]; then + tooltip_parts+=("ISO: $iso") + fi + if [ -n "$shutter_speed" ]; then + tooltip_parts+=("Shutter speed: $shutter_speed") + fi + if [ -n "$date_time" ]; then + tooltip_parts+=("Taken: $date_time") + fi + + for key in "${tooltip_parts[@]}"; do + printf '%s%s' "$separator" "$key" + separator='; ' + done + if (( ${#tooltip_parts[@]} > 0 )); then + printf '\n' + fi +} + render_details_page() { local -r html_dir="$1"; shift local -r photos_dir="$1"; shift @@ -213,6 +301,7 @@ render_details_page() { local -r photo_file="$1"; shift local animation_class local exif_details_html + local exif_tooltip_text template header "$page_num-$preview_num-details.html" \ html_dir "$html_dir" \ @@ -225,6 +314,9 @@ render_details_page() { exif_details_html=$( photo_exif_details_html "$photo_file" "$INCOMING_DIR/$photo_file" ) + exif_tooltip_text=$( + photo_exif_tooltip_text "$photo_file" "$INCOMING_DIR/$photo_file" + ) template details "$page_num-$preview_num-details.html" \ html_dir "$html_dir" \ backhref "$backhref" \ @@ -233,7 +325,8 @@ render_details_page() { preview_num "$preview_num" \ photo "$photo_file" \ animation_class "$animation_class" \ - exif_details "$exif_details_html" + exif_details "$exif_details_html" \ + exif_tooltip "$exif_tooltip_text" template footer "$page_num-$preview_num-details.html" \ html_dir "$html_dir" \ backhref "$backhref" \ diff --git a/src/lib/template.source.sh b/src/lib/template.source.sh index 5c00176..87f73b1 100644 --- a/src/lib/template.source.sh +++ b/src/lib/template.source.sh @@ -250,6 +250,7 @@ validate_template_context() { animation_class backhref exif_details + exif_tooltip page_num photo photos_dir @@ -341,6 +342,8 @@ serialize_template_render_context() { serialize_template_render_var render_enter_page_html "$render_enter_page_html" serialize_template_render_var \ render_exif_details_html "$render_exif_details_html" + serialize_template_render_var \ + render_exif_tooltip_html "$render_exif_tooltip_html" serialize_template_render_var render_height_html "$render_height_html" serialize_template_render_var render_html_dir_html "$render_html_dir_html" serialize_template_render_var \ @@ -388,6 +391,8 @@ prepare_template_render_vars() { html_escape_to render_enter_page_html "$context_value" template_context_value_to render_exif_details_html \ "$context_name" exif_details + template_context_value_to context_value "$context_name" exif_tooltip + html_escape_to render_exif_tooltip_html "$context_value" html_escape_to render_height_html "${HEIGHT:-}" html_escape_to render_html_dir_html "$render_html_dir" html_escape_to render_maxpreviews_html "${MAXPREVIEWS:-}" @@ -457,6 +462,7 @@ render_template() { local render_current_date_text local render_enter_page_html local render_exif_details_html + local render_exif_tooltip_html local render_height_html local render_html_dir local render_html_dir_html diff --git a/tests/cli.sh b/tests/cli.sh index 3a38526..82fff5c 100755 --- a/tests/cli.sh +++ b/tests/cli.sh @@ -3100,6 +3100,8 @@ test_generate_escapes_html_values() { test::assert_contains 'exif:Artist' "$details_html" test::assert_contains "$exif_value_html" "$details_html" test::assert_contains "href=\"1-1.html\">Image view" "$details_html" + test::assert_not_contains 'title="Camera:' "$details_html" + test::assert_not_contains 'title=""' "$details_html" test::assert_not_contains 'A & "quoted" <title>' "$page_html" test::assert_not_contains "$photo_name" "$top_index_html" test::assert_not_contains "$photo_name" "$view_html" @@ -3118,7 +3120,14 @@ test_generate_renders_exif_details() { test::setup fake_bin="$TEST_TMPDIR/bin" config_file="$TEST_TMPDIR/photoalbum.conf" - identify_output=$'Image:\n exif:DateTime: 2026:06:04 12:34:56\n exif:Make: ExampleCam\n geometry: 120x90' + identify_output=$'Image:\n' + identify_output+=$' exif:DateTimeOriginal: 2026:06:04 12:34:56\n' + identify_output+=$' exif:Make: ExampleCam\n' + identify_output+=$' exif:Model: Model & "X"\n' + identify_output+=$' exif:FNumber: f/2.8\n' + identify_output+=$' exif:ISOSpeedRatings: 400\n' + identify_output+=$' exif:ExposureTime: 1/125\n' + identify_output+=$' geometry: 120x90' test::install_fake_imagemagick "$fake_bin" mkdir -p "$TEST_TMPDIR/incoming" @@ -3139,11 +3148,23 @@ test_generate_renders_exif_details() { test::assert_contains 'href="1-1-details.html">Details</a>' "$view_html" test::assert_contains '<table class="details">' "$details_html" - test::assert_contains '<th>exif:DateTime</th>' "$details_html" + test::assert_contains \ + 'title="Camera: ExampleCam Model & "X"; Aperture: f/2.8; ISO: 400; Shutter speed: 1/125; Taken: 2026:06:04 12:34:56"' \ + "$details_html" + test::assert_contains '<th>exif:DateTimeOriginal</th>' "$details_html" test::assert_contains '<td>2026:06:04 12:34:56</td>' "$details_html" test::assert_contains '<th>exif:Make</th>' "$details_html" test::assert_contains '<td>ExampleCam</td>' "$details_html" + test::assert_contains '<th>exif:Model</th>' "$details_html" + test::assert_contains '<td>Model & "X"</td>' "$details_html" + test::assert_contains '<th>exif:FNumber</th>' "$details_html" + test::assert_contains '<td>f/2.8</td>' "$details_html" + test::assert_contains '<th>exif:ISOSpeedRatings</th>' "$details_html" + test::assert_contains '<td>400</td>' "$details_html" + test::assert_contains '<th>exif:ExposureTime</th>' "$details_html" + test::assert_contains '<td>1/125</td>' "$details_html" test::assert_not_contains 'geometry: 120x90' "$details_html" + test::assert_not_contains 'Model & "X"' "$details_html" test::assert_not_contains 'No EXIF details available.' "$details_html" test::teardown -- cgit v1.2.3