Less temporary files

[galgen.git] / galgen.zsh

diff --git a/galgen.zsh b/galgen.zsh
index ca78ab9c5c9161fedea181c3f1020db15aff96ae..34fa14451861b54a5334f17de4fd81b038ff0877 100755 (executable)
--- a/galgen.zsh
+++ b/galgen.zsh
@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 # Copyright (C) 2022-2023 Sergey Matveev <stargrave@stargrave.org>
 
-VERSION=0.3.0
+VERSION=0.4.0
 
 set -e
 
@@ -20,30 +20,30 @@ exifTagsOmit=(
 
 [[ -z $style ]] || style="<link rel=\"stylesheet\" type=\"text/css\" href=\"$style\">"
 
-mkdir -p alt info preview
+mkdir -p alt .info preview
 setopt EXTENDED_GLOB
 
 imgs=()
-for img (*.jxl(N)) { [[ -r info/$img.img ]] || imgs=($imgs $img) }
+for img (*.jxl(N)) { [[ -r .info/$img.img ]] || imgs=($imgs $img) }
 [[ ${#imgs} == 0 ]] || {
     echo JPEG XL info... >&2
-    parallel "jxlinfo {} > info/{}.img" ::: $imgs
+    parallel "jxlinfo {} > .info/{}.img" ::: $imgs
 }
 
 imgs=()
-for img (*.webp(N)) { [[ -r info/$img.img ]] || imgs=($imgs $img) }
+for img (*.webp(N)) { [[ -r .info/$img.img ]] || imgs=($imgs $img) }
 [[ ${#imgs} == 0 ]] || {
     echo WebP info... >&2
-    parallel "webpinfo {} > info/{}.img" ::: $imgs
+    parallel "webpinfo {} > .info/{}.img" ::: $imgs
 }
 
 imgs=()
 src=((*.jxl|*.webp))
-for img ($src) { [[ -r info/$img.exif ]] || imgs=($imgs $img) }
+for img ($src) { [[ -r .info/$img.exif ]] || imgs=($imgs $img) }
 src=()
 [[ ${#imgs} == 0 ]] || {
     echo Exif info... >&2
-    parallel "exiftool -escapeHTML -htmlFormat -groupHeadings --${=${(j/ --/)exifTagsOmit}} {} > info/{}.exif" ::: $imgs
+    parallel "exiftool -escapeHTML -htmlFormat -groupHeadings --${=${(j/ --/)exifTagsOmit}} {} > .info/{}.exif" ::: $imgs
 }
 
 imgs=((*.jxl|*.webp)($ordering))
@@ -55,18 +55,18 @@ trap "rm -f $tmp" HUP PIPE INT QUIT TERM EXIT
 
 jpgs=()
 pngs=()
-ppms_jxl=()
-ppms_webp=()
+pams_jxl=()
+pams_webp=()
 for img ($imgs) {
-    [[ -r info/$img.img ]]
+    [[ -r .info/$img.img ]]
     if [[ $img:e = jxl ]] ; then
         [[ -r alt/$img.jpg ]] || [[ -r alt/$img.png ]] && : || {
-            grep -q "JPEG bitstream reconstruction" info/$img.img &&
+            grep -q "JPEG bitstream reconstruction" .info/$img.img &&
                 jpgs=($jpgs $img) || pngs=($pngs $img)
         }
-        [[ -r preview/$img.webp ]] || ppms_jxl=($ppms_jxl $img)
+        [[ -r preview/$img.webp ]] || pams_jxl=($pams_jxl $img)
     else
-        [[ -r preview/$img.webp ]] || ppms_webp=($ppms_webp $img)
+        [[ -r preview/$img.webp ]] || pams_webp=($pams_webp $img)
     fi
 }
 
@@ -76,31 +76,28 @@ for img ($imgs) {
 }
 jpgs=()
 
+djxl2pam="( djxl --quiet {} ppm:- || djxl --quiet {} pgm:- )"
 [[ ${#pngs} == 0 ]] || {
     echo PNG generation... >&2
-    parallel "${0:h}/djxl2ppm {}" ::: $pngs
-    parallel "pamtopng < {}.ppm > {}.png && rm {}.ppm" ::: $pngs
+    parallel "$djxl2pam | pamtopng > {}.png" ::: $pngs
     parallel "pngcrush -warn -rem alla -rem allb -z 2 {}.png alt/{}.png && rm {}.png" ::: $pngs
     parallel "advpng --quiet --recompress -4 alt/{}.png && touch -r {} alt/{}.png" ::: $pngs
 }
 pngs=()
 
-[[ ${#ppms_jxl} == 0 ]] || {
-    echo JPEG XL decompression for preview... >&2
-    parallel "${0:h}/djxl2ppm {}" ::: $ppms_jxl
+mkpreview="pnmscale -w 100"
+mkpreview="$mkpreview | cwebp -quiet -pass 10 -alpha_filter best -m 6 -o preview/{}.webp -- -"
+mkpreview="$mkpreview && touch -r {} preview/{}.webp"
+[[ ${#pams_jxl} == 0 ]] || {
+    echo JPEG XL previews... >&2
+    parallel "$djxl2pam | $mkpreview" ::: $pams_jxl
 }
-[[ ${#ppms_webp} == 0 ]] || {
-    echo WebP decompression for preview... >&2
-    parallel "dwebp {} -ppm -o {}.ppm" ::: $ppms_webp
+[[ ${#pams_webp} == 0 ]] || {
+    echo WebP previews... >&2
+    parallel "dwebp {} -ppm -o - | $mkpreview" ::: $pams_webp
 }
-ppms=($ppms_jxl $ppms_webp)
-[[ ${#ppms} == 0 ]] || {
-    echo Preview scaling and WebP compression... >&2
-    parallel "pnmscale -w 100 < {}.ppm > {}.ppm.ppm && mv {}.ppm.ppm {}.ppm && cwebp -quiet -pass 10 -alpha_filter best -m 6 -o preview/{}.webp {}.ppm && rm {}.ppm && touch -r {} preview/{}.webp" ::: $ppms
-}
-ppms_jxl=()
-ppms_webp=()
-ppms=()
+pams_jxl=()
+pams_webp=()
 
 for (( i=1 ; i <= ${#imgs} ; i++ )) {
     local img=${imgs[$i]}
@@ -139,9 +136,9 @@ EOF
     }
     [[ -r ${img}.html ]] && cat ${img}.html >> $tmp
     echo "<hr/>" >> $tmp
-    [[ -r info/$img.img ]]
+    [[ -r .info/$img.img ]]
     echo "<pre>" >> $tmp
-    cat info/$img.img >> $tmp
+    cat .info/$img.img >> $tmp
     echo "</pre>" >> $tmp
     if [[ $img:e = jxl ]] ; then
         echo "Alternative formats:" >> $tmp
@@ -152,8 +149,8 @@ EOF
         }
     fi
     echo "<hr/>" >> $tmp
-    [[ -r info/$img.exif ]]
-    cat info/$img.exif >> $tmp
+    [[ -r .info/$img.exif ]]
+    cat .info/$img.exif >> $tmp
     echo "</body></html>" >> $tmp
     cmp -s $tmp $dst || {
         cat $tmp > $dst