From: Sergey Matveev Date: Wed, 20 Sep 2023 12:02:48 +0000 (+0300) Subject: Fix previews generation X-Git-Url: http://www.git.stargrave.org/?p=galgen.git;a=commitdiff_plain;h=42e9220f576d5a246af8a29416d1326bd0219cf9 Fix previews generation --- diff --git a/galgen.zsh b/galgen.zsh index 7c82821..4ab43c4 100755 --- a/galgen.zsh +++ b/galgen.zsh @@ -1,7 +1,7 @@ #!/usr/bin/env zsh # Copyright (C) 2022-2023 Sergey Matveev -VERSION=0.6.0 +VERSION=0.7.0 set -e @@ -46,12 +46,15 @@ pages=$(( ${#imgs} / $pagesize )) local tmp=`mktemp` trap "rm -f $tmp" HUP PIPE INT QUIT TERM EXIT -[[ -n "$NOALT" ]] || { - echo HERE - exit +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=() - pams=() for img ($imgs) { [[ -r .info/$img.img ]] [[ -r alt/$img.jpg ]] || [[ -r alt/$img.png ]] && : || { @@ -67,7 +70,6 @@ trap "rm -f $tmp" HUP PIPE INT QUIT TERM EXIT } jpgs=() - djxl2pam="( djxl --quiet {} ppm:- || djxl --quiet {} pgm:- )" [[ ${#pngs} == 0 ]] || { echo PNG generation... >&2 parallel "$djxl2pam | pamtopng > {}.png" ::: $pngs @@ -75,7 +77,7 @@ trap "rm -f $tmp" HUP PIPE INT QUIT TERM EXIT 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 -- -"