Image ${i}/${#imgs}: $img

From: Sergey Matveev Date: Thu, 5 Feb 2026 10:56:15 +0000 (+0300) Subject: Less duplicate links and entities X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=HEAD;p=galgen.git Less duplicate links and entities --- diff --git a/galgen b/galgen index 4e1321d..0fb803d 100755 --- a/galgen +++ b/galgen @@ -1,7 +1,7 @@ #!/usr/bin/env zsh # Copyright (C) 2022-2026 Sergey Matveev -VERSION=0.7.0 +VERSION=0.8.0 setopt ERR_EXIT @@ -18,7 +18,7 @@ exifTagsOmit=( FilePermissions ) -[[ -z $style ]] || style="" +[[ -z $style ]] || style="" mkdir -p alt .info preview setopt EXTENDED_GLOB @@ -27,7 +27,7 @@ imgs=() for img (*.jxl(N)) { [[ -r .info/$img.img ]] || imgs=($imgs $img) } [[ ${#imgs} == 0 ]] || { echo Infos... >&2 - parallel "jxlinfo {} > .info/{}.img" ::: $imgs + parallel "jxlinfo {} >.info/{}.img" ::: $imgs } imgs=() @@ -36,7 +36,7 @@ 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)($ordering)) @@ -72,7 +72,7 @@ else [[ ${#pngs} == 0 ]] || { echo PNG generation... >&2 - parallel "$djxl2pam | pamtopng > {}.png" ::: $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 } @@ -93,112 +93,99 @@ for (( i=1 ; i <= ${#imgs} ; i++ )) { echo $i $img local dst=$i.img.html local p=$(( ( $i / $pagesize ) + 1 )) - cat > $tmp <$tmp < - - + + ${style} Image ${i}/${#imgs}: $img - - + + EOF [[ $i -eq 1 ]] || - echo "" >> $tmp + echo "" >>$tmp [[ $i -eq ${#imgs} ]] || - echo "" >> $tmp - cat >> $tmp <" >>$tmp + cat >>$tmp < EOF - [[ $i -eq 1 ]] || - echo "<<<" >> $tmp - echo "^^^" >> $tmp - [[ $i -eq ${#imgs} ]] || - echo ">>>" >> $tmp - echo "

$\"$img\"$ " >> $tmp + echo " $\"$img\"$ " >>$tmp [[ ! -r ${img}.txt ]] || { - echo "

" >> $tmp
-        cat ${img}.txt >> $tmp
-        echo "

" >> $tmp + echo "

" >>$tmp
+        cat ${img}.txt >>$tmp
+        echo "

" >>$tmp } - [[ ! -r ${img}.html ]] || { cat ${img}.html >> $tmp } - echo "

" >> $tmp + [[ ! -r ${img}.html ]] || { cat ${img}.html >>$tmp } [[ -r .info/$img.img ]] - echo "

" >> $tmp
-    cat .info/$img.img >> $tmp
-    echo "

" >> $tmp + echo "

" >>$tmp
+    cat .info/$img.img >>$tmp
+    echo "

" >>$tmp [[ -n "$NOALT" ]] || { if [[ $img:e = jxl ]] ; then - echo "Alternative formats:" >> $tmp + echo "Alternative formats:" >>$tmp [[ -r alt/$img.jpg ]] && { - echo "JPEG" >> $tmp + echo "JPEG" >>$tmp } || { - echo "PNG" >> $tmp + echo "PNG" >>$tmp } fi - echo "

" >> $tmp } [[ -r .info/$img.exif ]] - cat .info/$img.exif >> $tmp - echo "" >> $tmp + cat .info/$img.exif >>$tmp + echo "" >>$tmp cmp -s $tmp $dst || { - cat $tmp > $dst + cat $tmp >$dst touch -r $img $dst } } for (( p=1 ; p <= $pages ; p++ )) { local dst=$p.page.html - cat > $tmp <$tmp < - - + + ${style} Page ${p}/$pages - + + EOF [[ $p -eq 1 ]] || - echo "" >> $tmp + echo "" >>$tmp [[ $p -eq $pages ]] || - echo "" >> $tmp - cat >> $tmp <" >>$tmp + cat >>$tmp < EOF [[ $p -ne 1 ]] || { [[ ! -r .txt ]] || { - echo "

" >> $tmp
-            cat .txt >> $tmp
-            echo "

" >> $tmp + echo "

" >>$tmp
+            cat .txt >>$tmp
+            echo "

" >>$tmp } - [[ ! -r .html ]] || { cat .html >> $tmp } + [[ ! -r .html ]] || { cat .html >>$tmp } } - [[ $p -eq 1 ]] || - echo "<<<" >> $tmp - [[ $p -eq $pages ]] || - echo ">>>" >> $tmp - echo "| home" >> $tmp - echo "| end" >> $tmp - echo "

" >> $tmp for (( i=1 ; i <= $pagesize ; i++ )) { img=$(( ( $p - 1 ) * $pagesize + $i )) [[ $img -le ${#imgs} ]] || break - echo "" >> $tmp + echo "" >>$tmp alt="preview ${img}" title="" [[ ! -r ${imgs[$img]}.txt ]] || { alt=`cat ${imgs[$img]}.txt` title="title=\"$alt\"" } - echo " $\"$alt\"$ " >> $tmp + echo " $\"$alt\"$ " >>$tmp } - echo "" >> $tmp + echo "" >>$tmp cmp -s $tmp $dst || { - cat $tmp > $dst + cat $tmp >$dst echo page $p } }