Fix previews generation

[galgen.git] / galgen.zsh

diff --git a/galgen.zsh b/galgen.zsh
index c86ffadc6eb0a34878b0b99966fa4db41034bc29..4ab43c4abdf8c661807fd1a2250a986150e5322b 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.7.0
 
 set -e
 
@@ -26,19 +26,12 @@ setopt EXTENDED_GLOB
 imgs=()
 for img (*.jxl(N)) { [[ -r .info/$img.img ]] || imgs=($imgs $img) }
 [[ ${#imgs} == 0 ]] || {
-    echo JPEG XL info... >&2
+    echo Infos... >&2
     parallel "jxlinfo {} > .info/{}.img" ::: $imgs
 }
 
 imgs=()
-for img (*.webp(N)) { [[ -r .info/$img.img ]] || imgs=($imgs $img) }
-[[ ${#imgs} == 0 ]] || {
-    echo WebP info... >&2
-    parallel "webpinfo {} > .info/{}.img" ::: $imgs
-}
-
-imgs=()
-src=((*.jxl|*.webp))
+src=(*.jxl)
 for img ($src) { [[ -r .info/$img.exif ]] || imgs=($imgs $img) }
 src=()
 [[ ${#imgs} == 0 ]] || {
@@ -46,61 +39,54 @@ src=()
     parallel "exiftool -escapeHTML -htmlFormat -groupHeadings --${=${(j/ --/)exifTagsOmit}} {} > .info/{}.exif" ::: $imgs
 }
 
-imgs=((*.jxl|*.webp)($ordering))
+imgs=((*.jxl)($ordering))
 pages=$(( ${#imgs} / $pagesize ))
 [[ $(( $pages * $pagesize )) -lt ${#imgs} ]] && pages=$(( $pages + 1 ))
 
 local tmp=`mktemp`
 trap "rm -f $tmp" HUP PIPE INT QUIT TERM EXIT
 
-jpgs=()
-pngs=()
-ppms_jxl=()
-ppms_webp=()
-for img ($imgs) {
-    [[ -r .info/$img.img ]]
-    if [[ $img:e = jxl ]] ; then
+pams=()
+djxl2pam="( djxl --quiet {} ppm:- || djxl --quiet {} pgm:- )"
+if [[ -n "$NOALT" ]] ; then
+    for img ($imgs) {
+        [[ -r preview/$img.webp ]] || pams=($pams $img)
+    }
+else
+    jpgs=()
+    pngs=()
+    for img ($imgs) {
+        [[ -r .info/$img.img ]]
         [[ -r alt/$img.jpg ]] || [[ -r alt/$img.png ]] && : || {
             grep -q "JPEG bitstream reconstruction" .info/$img.img &&
                 jpgs=($jpgs $img) || pngs=($pngs $img)
         }
-        [[ -r preview/$img.webp ]] || ppms_jxl=($ppms_jxl $img)
-    else
-        [[ -r preview/$img.webp ]] || ppms_webp=($ppms_webp $img)
-    fi
-}
+        [[ -r preview/$img.webp ]] || pams=($pams $img)
+    }
 
-[[ ${#jpgs} == 0 ]] || {
-    echo JPEG reconstruction... >&2
-    parallel "djxl --quiet {} alt/{}.jpg && touch -r {} alt/{}.jpg" ::: $jpgs
-}
-jpgs=()
-
-[[ ${#pngs} == 0 ]] || {
-    echo PNG generation... >&2
-    parallel "${0:h}/djxl2ppm {}" ::: $pngs
-    parallel "pamtopng < {}.ppm > {}.png && rm {}.ppm" ::: $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=()
+    [[ ${#jpgs} == 0 ]] || {
+        echo JPEG reconstruction... >&2
+        parallel "djxl --quiet {} alt/{}.jpg && touch -r {} alt/{}.jpg" ::: $jpgs
+    }
+    jpgs=()
 
-[[ ${#ppms_jxl} == 0 ]] || {
-    echo JPEG XL decompression for preview... >&2
-    parallel "${0:h}/djxl2ppm {}" ::: $ppms_jxl
-}
-[[ ${#ppms_webp} == 0 ]] || {
-    echo WebP decompression for preview... >&2
-    parallel "dwebp {} -ppm -o {}.ppm" ::: $ppms_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
+    [[ ${#pngs} == 0 ]] || {
+        echo PNG generation... >&2
+        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=()
+fi
+
+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} == 0 ]] || {
+    echo Generating previews... >&2
+    parallel "$djxl2pam | $mkpreview" ::: $pams
 }
-ppms_jxl=()
-ppms_webp=()
-ppms=()
+pams=()
 
 for (( i=1 ; i <= ${#imgs} ; i++ )) {
     local img=${imgs[$i]}
@@ -143,15 +129,17 @@ EOF
     echo "<pre>" >> $tmp
     cat .info/$img.img >> $tmp
     echo "</pre>" >> $tmp
-    if [[ $img:e = jxl ]] ; then
-        echo "Alternative formats:" >> $tmp
-        [[ -r alt/$img.jpg ]] && {
-            echo "<a href=\"alt/$img.jpg\">JPEG</a>" >> $tmp
-        } || {
-            echo "<a href=\"$img.png\">PNG</a>" >> $tmp
-        }
-    fi
-    echo "<hr/>" >> $tmp
+    [[ -n "$NOALT" ]] || {
+        if [[ $img:e = jxl ]] ; then
+            echo "Alternative formats:" >> $tmp
+            [[ -r alt/$img.jpg ]] && {
+                echo "<a href=\"alt/$img.jpg\">JPEG</a>" >> $tmp
+            } || {
+                echo "<a href=\"$img.png\">PNG</a>" >> $tmp
+            }
+        fi
+        echo "<hr/>" >> $tmp
+    }
     [[ -r .info/$img.exif ]]
     cat .info/$img.exif >> $tmp
     echo "</body></html>" >> $tmp