From 020051fd4bcb582c5edcd03ce1851374b876ab13 Mon Sep 17 00:00:00 2001
From: Morgan Hardwood <bugs@londonlight.org>
Date: Tue, 18 Feb 2020 20:02:51 +0100
Subject: [PATCH] Better formatting of generateRtexifUpdates

No functional changes.
---
 tools/generateRtexifUpdates | 87 ++++++++++++++++++++++++++++++++-----
 1 file changed, 75 insertions(+), 12 deletions(-)

diff --git a/tools/generateRtexifUpdates b/tools/generateRtexifUpdates
index 72a97862e..b4ace209d 100755
--- a/tools/generateRtexifUpdates
+++ b/tools/generateRtexifUpdates
@@ -32,7 +32,10 @@ echo
 #------------------------------------------------------------------------------
 # Canon
 printf '%s\n' "Saving ${tmpdir}/canon_lenses"
-xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -canon:all) | sort -fuV > "${tmpdir}/canon_lenses"
+xmlstarlet sel -T -t \
+    -m "taginfo/table/tag[@name='LensType']/values/key" \
+    -v "concat(@id,'	',val)" \
+    -n < <("$et" -listx -canon:all) | sort -fuV > "${tmpdir}/canon_lenses"
 
 #In :10.1    Sigma 50mm f/2.8 EX
 #Out:            {10, "Sigma 50mm f/2.8 EX"},
@@ -55,7 +58,11 @@ sed -r -i \
 # replace <tab> with '] = "'
 # append '";'
 printf '%s\n' "Saving ${tmpdir}/canon_cameras"
-xmlstarlet sel -T -t -m "taginfo/table/tag[@name='CanonModelID']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -canon:all) | sort -fuV > "${tmpdir}/canon_cameras"
+xmlstarlet sel -T -t \
+    -m "taginfo/table/tag[@name='CanonModelID']/values/key" \
+    -v "concat(@id,'	',val)" \
+    -n < <("$et" -listx -canon:all) | sort -fuV > "${tmpdir}/canon_cameras"
+
 sed -r -i \
     -e 's/^/        choices[/' \
     -e 's/\t/] = "/' \
@@ -65,28 +72,84 @@ sed -r -i \
 #------------------------------------------------------------------------------
 # Nikon LensIDs are composite tags
 printf '%s\n' "Saving ${tmpdir}/nikon"
-xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensID']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -composite:all) > "${tmpdir}/nikon"
-sed -r -i -e '/^...	/d' -e 's/^/    {"/' -e 's/([A-F0-9]+)[A-F0-9.]*\t/\1", "/' -e 's/$/"},/' -e 's|(.* ")(.*) F([0-9]+)|\1\2 f/\3|' -e 's| F/([0-9]+)| f/\1|' "${tmpdir}/nikon"
+
+xmlstarlet sel -T -t \
+    -m "taginfo/table/tag[@name='LensID']/values/key" \
+    -v "concat(@id,'	',val)" \
+    -n < <("$et" -listx -composite:all) > "${tmpdir}/nikon"
+
+sed -r -i \
+    -e '/^...	/d' \
+    -e 's/^/    {"/' \
+    -e 's/([A-F0-9]+)[A-F0-9.]*\t/\1", "/' \
+    -e 's/$/"},/' \
+    -e 's|(.* ")(.*) F([0-9]+)|\1\2 f/\3|' \
+    -e 's| F/([0-9]+)| f/\1|' \
+    "${tmpdir}/nikon"
 
 #------------------------------------------------------------------------------
 # Olympus
 printf '%s\n' "Saving ${tmpdir}/olympus"
-xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -olympus:all) | sort -fuV > "${tmpdir}/olympus"
-sed -r -i -e '/0 00 00\tNone/d' -e 's/^/        lenses["0/' -e 's/\t/"] = "/' -e 's/$/";/' -e 's| F([0-9]+)| f/\1|g' "${tmpdir}/olympus"
+
+xmlstarlet sel -T -t \
+    -m "taginfo/table/tag[@name='LensType']/values/key" \
+    -v "concat(@id,'	',val)" \
+    -n < <("$et" -listx -olympus:all) | sort -fuV > "${tmpdir}/olympus"
+
+sed -r -i \
+    -e '/0 00 00\tNone/d' \
+    -e 's/^/        lenses["0/' \
+    -e 's/\t/"] = "/' \
+    -e 's/$/";/' \
+    -e 's| F([0-9]+)| f/\1|g' \
+    "${tmpdir}/olympus"
 
 #------------------------------------------------------------------------------
 # Pentax
 printf '%s\n' "Saving ${tmpdir}/pentax"
-xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -pentax:all) | sort -fuV > "${tmpdir}/pentax"
-sed -r -i -e 's/^/        choices.insert (p_t (256 * /' -e 's/([0-9]+) ([0-9]+)([0-9.]*)/\1 + \2/' -e 's/\t/, "/' -e 's/$/"));/' -e 's| F([0-9]+)| f/\1|' "${tmpdir}/pentax"
+
+xmlstarlet sel -T -t \
+    -m "taginfo/table/tag[@name='LensType']/values/key" \
+    -v "concat(@id,'	',val)" \
+    -n < <("$et" -listx -pentax:all) | sort -fuV > "${tmpdir}/pentax"
+
+sed -r -i \
+    -e 's/^/        choices.insert (p_t (256 * /' \
+    -e 's/([0-9]+) ([0-9]+)([0-9.]*)/\1 + \2/' \
+    -e 's/\t/, "/' \
+    -e 's/$/"));/' \
+    -e 's| F([0-9]+)| f/\1|' \
+    "${tmpdir}/pentax"
 
 #------------------------------------------------------------------------------
 # Sony
 printf '%s\n' "Saving ${tmpdir}/sony"
-xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -sony:all) | sort -fuV > "${tmpdir}/sony"
+
+xmlstarlet sel -T -t \
+    -m "taginfo/table/tag[@name='LensType']/values/key" \
+    -v "concat(@id,'	',val)" \
+    -n < <("$et" -listx -sony:all) | sort -fuV > "${tmpdir}/sony"
+
 # Sony has more lenses under the LensType2 tag
 printf '%s\n' "Saving ${tmpdir}/sony-lenstype2"
-xmlstarlet sel -T -t -m "taginfo/table/tag[@name='LensType2']/values/key" -v "concat(@id,'	',val)" -n < <("$et" -listx -sony:all) | sort -fuV > "${tmpdir}/sony-lenstype2"
-sed -r -i -e 's/^/            {/' -e 's/([0-9]+)[0-9.]*\t/\1, "/' -e 's/$/"},/' -e 's| F([0-9]+)| f/\1|g' "${tmpdir}/sony"
-sed -r -i -e '/255\tTamron Lens (255)/d' -e 's/([0-9]+)[0-9.]*\t/\1, "/' -e 's/^/        choices.insert (p_t (/' -e 's/$/"));/' -e 's| F([0-9]+)| f/\1|g' "${tmpdir}/sony-lenstype2"
+
+xmlstarlet sel -T -t \
+    -m "taginfo/table/tag[@name='LensType2']/values/key" \
+    -v "concat(@id,'	',val)" \
+    -n < <("$et" -listx -sony:all) | sort -fuV > "${tmpdir}/sony-lenstype2"
+
+sed -r -i \
+    -e 's/^/            {/' \
+    -e 's/([0-9]+)[0-9.]*\t/\1, "/' \
+    -e 's/$/"},/' \
+    -e 's| F([0-9]+)| f/\1|g' \
+    "${tmpdir}/sony"
+
+sed -r -i \
+    -e '/255\tTamron Lens (255)/d' \
+    -e 's/([0-9]+)[0-9.]*\t/\1, "/' \
+    -e 's/^/        choices.insert (p_t (/' \
+    -e 's/$/"));/' \
+    -e 's| F([0-9]+)| f/\1|g' \
+    "${tmpdir}/sony-lenstype2"