X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=99800c53a1441c3b620fef8a1d8752f246095677;hp=fda5cac0f8e4cb4d08720e97ec15c2a41e62c5bd;hb=27836d0908617449c8f7fc48e045922e17b8c671;hpb=14fdc5e189af52e3719101ce583e3ad95c5bb263 diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh index fda5cac0..99800c53 100755 --- a/misc/tools/cached-converter.sh +++ b/misc/tools/cached-converter.sh @@ -7,14 +7,27 @@ set -e : ${jpeg_qual_rgb:=95} : ${jpeg_qual_a:=99} : ${do_dds:=true} -: ${dds_flags:=} +: ${dds_tool:=compressonator-dxtc} : ${do_ogg:=false} : ${ogg_qual:=1} +: ${del_src:=false} + +me=$0 +case "$me" in + */*) + meprefix=${me%/*}/ + ;; + *) + meprefix= + ;; +esac tmpdir=`mktemp -d -t cached-converter.XXXXXX` trap 'exit 1' INT trap 'rm -rf "$tmpdir"' EXIT +lastinfiles= +lastinfileshash= cached() { flag=$1; shift @@ -26,28 +39,38 @@ cached() if ! $flag; then return 0 fi + if [ x"$infile1" = x"$outfile1" ]; then + keep=true + fi options=`echo "$*" | git hash-object --stdin` - sum=`git hash-object "$infile1"` - if [ -n "$infile2" ]; then - sum=$sum`git hash-object "$infile2"` + if [ x"$infile1/../$infile2" = x"$lastinfiles" ]; then + sum=$lastinfileshash + else + sum=`git hash-object "$infile1"` + if [ -n "$infile2" ]; then + sum=$sum`git hash-object "$infile2"` + fi + lastinfileshash=$sum fi mkdir -p "$CACHEDIR/$method-$options" name1="$CACHEDIR/$method-$options/$sum-1.${outfile1##*.}" [ -z "$outfile2" ] || name2="$CACHEDIR/$method-$options/$sum-2.${outfile2##*.}" tempfile1="${name1%/*}/new-${name1##*/}" [ -z "$outfile2" ] || tempfile2="${name2%/*}/new-${name2##*/}" - if [ -f "$name1" ]; then - ln "$name1" "$outfile1" 2>/dev/null || cp "$name1" "$outfile1" - [ -z "$outfile2" ] || ln "$name2" "$outfile2" 2>/dev/null || cp "$name2" "$outfile2" + if [ -f "$name1" ] && { [ -z "$outfile2" ] || [ -f "$name2" ]; }; then + case "$outfile1" in */*) mkdir -p "${outfile1%/*}"; esac && { ln "$name1" "$outfile1" 2>/dev/null || cp "$name1" "$outfile1"; } + [ -z "$outfile2" ] || { case "$outfile2" in */*) mkdir -p "${outfile2%/*}"; esac && { ln "$name2" "$outfile2" 2>/dev/null || cp "$name2" "$outfile2"; }; } + conv=true elif "$method" "$infile1" "$infile2" "$tempfile1" "$tempfile2" "$@"; then mv "$tempfile1" "$name1" [ -z "$outfile2" ] || mv "$tempfile2" "$name2" case "$outfile1" in */*) mkdir -p "${outfile1%/*}"; esac && { ln "$name1" "$outfile1" 2>/dev/null || cp "$name1" "$outfile1"; } [ -z "$outfile2" ] || { case "$outfile2" in */*) mkdir -p "${outfile2%/*}"; esac && { ln "$name2" "$outfile2" 2>/dev/null || cp "$name2" "$outfile2"; }; } + conv=true else rm -f "$tempfile1" rm -f "$tempfile2" - exit 1 + exit 1 fi } @@ -56,8 +79,8 @@ reduce_jpeg2_dds() i=$1; shift ia=$1; shift o=$1; shift; shift - convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.png" && \ - nvcompress -alpha -bc3 $1 "$tmpdir/x.png" "$o" + convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \ + "$meprefix"compress-texture "$dds_tool" dxt5 "$tmpdir/x.tga" "$o" $1 } reduce_jpeg2_jpeg2() @@ -89,7 +112,8 @@ reduce_rgba_dds() { i=$1; shift; shift o=$1; shift; shift - nvcompress -alpha -bc3 $1 "$i" "$o" + convert "$i" "$tmpdir/x.tga" && \ + "$meprefix"compress-texture "$dds_tool" dxt5 "$tmpdir/x.tga" "$o" $1 } reduce_rgba_jpeg2() @@ -107,7 +131,8 @@ reduce_rgb_dds() { i=$1; shift; shift o=$1; shift; shift - nvcompress -bc1 $1 "$i" "$o" + convert "$i" "$tmpdir/x.tga" && \ + "$meprefix"compress-texture "$dds_tool" dxt1 "$tmpdir/x.tga" "$o" $1 } reduce_rgb_jpeg() @@ -118,34 +143,63 @@ reduce_rgb_jpeg() jpegoptim --strip-all -m"$1" "$o" } +has_alpha() +{ + i=$1; shift; shift + o=$1; shift; shift + if convert "$F" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; } exit 0;'; then + # no alpha + : > "$o" + else + # has alpha + echo yes > "$o" + fi +} for F in "$@"; do + echo >&2 "Handling $F..." + conv=false + keep=false case "$F" in - *_alpha.jpg) - # handle in *.jpg case - ;; - *.jpg) - if [ -f "${F%.jpg}_alpha.jpg" ]; then - cached "$do_dds" reduce_jpeg2_dds "$F" "${F%.*}_alpha.jpg" "dds/${F%.*}.dds" "" "$dds_flags" - cached "$do_jpeg" reduce_jpeg2_jpeg2 "$F" "${F%.*}_alpha.jpg" "$F" "${F%.*}_alpha.jpg" "$jpeg_qual_rgb" - else - cached "$do_dds" reduce_rgb_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags" - cached "$do_jpeg" reduce_jpeg_jpeg "$F" "" "$F" "" "$jpeg_qual_rgb" - fi - ;; - *.png|*.tga) - if convert "$F" -depth 16 RGBA:- | perl -e 'while(read STDIN, $_, 8) { substr($_, 6, 2) eq "\xFF\xFF" or exit 1; } exit 0;'; then - cached "$do_dds" reduce_rgb_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags" - cached "$do_jpeg" reduce_rgb_jpeg "$F" "" "${F%.*}.jpg" "" "$jpeg_qual_rgb" - rm -f "$F" - else - cached "$do_dds" reduce_rgba_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags" - cached "$do_jpeg" reduce_rgba_jpeg2 "$F" "" "${F%.*}.jpg" "${F%.*}_alpha.jpg" "$jpeg_qual_rgb" "$jpeg_qual_a" - rm -f "$F" - fi - ;; - *.ogg) - cached "$do_ogg" reduce_ogg "$F" "" "$F" "" "$ogg_qual" - ;; + *_alpha.jpg) + # handle in *.jpg case + + # they always got converted, I assume + conv=true + keep=$do_jpeg + ;; + *.jpg) + if [ -f "${F%.jpg}_alpha.jpg" ]; then + cached "$do_dds" reduce_jpeg2_dds "$F" "${F%.*}_alpha.jpg" "dds/${F%.*}.dds" "" "$dds_flags" + cached "$do_jpeg" reduce_jpeg2_jpeg2 "$F" "${F%.*}_alpha.jpg" "$F" "${F%.*}_alpha.jpg" "$jpeg_qual_rgb" "$jpeg_qual_a" + else + cached "$do_dds" reduce_rgb_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags" + cached "$do_jpeg" reduce_jpeg_jpeg "$F" "" "$F" "" "$jpeg_qual_rgb" + fi + ;; + *.png|*.tga) + cached true has_alpha "$F" "" "$F.hasalpha" "" + conv=false + if [ -s "$F.hasalpha" ]; then + cached "$do_dds" reduce_rgba_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags" + cached "$do_jpeg" reduce_rgba_jpeg2 "$F" "" "${F%.*}.jpg" "${F%.*}_alpha.jpg" "$jpeg_qual_rgb" "$jpeg_qual_a" + rm -f "$F" # TGA becomes useless after JPEGging + else + cached "$do_dds" reduce_rgb_dds "$F" "" "dds/${F%.*}.dds" "" "$dds_flags" + cached "$do_jpeg" reduce_rgb_jpeg "$F" "" "${F%.*}.jpg" "" "$jpeg_qual_rgb" + rm -f "$F" # TGA becomes useless after JPEGging + fi + rm -f "$F.hasalpha" + ;; + *.ogg) + cached "$do_ogg" reduce_ogg "$F" "" "$F" "" "$ogg_qual" + ;; esac + if $del_src; then + if $conv; then + if ! $keep; then + rm -f "$F" + fi + fi + fi done