From: Brett Parker Date: Sun, 24 Apr 2005 11:30:27 +0000 (+0000) Subject: Add in update method X-Git-Tag: release-1.0.0~2 X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/commitdiff_plain/489511a520f9dc32502658b066ffe8235e5cdd10 Add in update method Change the behaviour from quitting when we spot an icons directory to checking to see which images need updating. git-archimport-id: arch@sommitrealweird.co.uk--2005-desktop/bpgallery--mainline--1.0--patch-3 --- diff --git a/bpgallery.sh b/bpgallery.sh index 0d2009e..9a4b765 100755 --- a/bpgallery.sh +++ b/bpgallery.sh @@ -34,6 +34,13 @@ cat <${TITLE} + ${DESCRIPTION} +END +} + function bpgallery_default_thumbsline() { cat << END
$caption
@@ -140,6 +147,10 @@ if [[ -z $GREPCOMMAND ]]; then GREPCOMMAND=grep fi +if [[ -z $SEDCOMMAND ]]; then + SEDCOMMAND=sed +fi + if [[ -z $WIDTH ]]; then WIDTH=100 fi @@ -156,12 +167,22 @@ if [[ -z $CAPTIONHEIGHT ]]; then CAPTIONHEIGHT=75 fi +if [[ -z $DESCRIPTION ]]; then + DESCRIPTION="" +fi + if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /dev/null ; then BPGALLERY_HEAD_FUNCTION="bpgallery_${BPGALLERY_THEME}_head" else BPGALLERY_HEAD_FUNCTION="bpgallery_default_head" fi +if declare -F "bpgallery_${BPGALLERY_THEME}_description" > /dev/null ; then + BPGALLERY_DESCRIPTION_FUNCTION="bpgallery_${BPGALLERY_THEME}_description" +else + BPGALLERY_DESCRIPTION_FUNCTION="bpgallery_default_description" +fi + if declare -F "bpgallery_${BPGALLERY_THEME}_thumbsline" > /dev/null ; then BPGALLERY_THUMBSLINE_FUNCTION="bpgallery_${BPGALLERY_THEME}_thumbsline" else @@ -238,19 +259,36 @@ fi if [ ! -d icons ]; then mkdir icons + + totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace echo {} | $WCCOMMAND); + currentimage=0 + + $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$totalimages images; currentimage=$((currentimage+1)); done + + echo done: $totalimages/$totalimages images else - echo "$1 already contains an icons folder, stopping" - exit 3 -fi + echo "$1 already contains an icons folder, updating." -totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace echo {} | $WCCOMMAND); -currentimage=0 + imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do if [ ! -r "icons/$filename" ] || [ "$filename" -nt "icons/$filename" ]; then $ECHOCOMMAND $filename; fi; done | $WCCOMMAND) -$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do echo done: $currentimage/$totalimages images; currentimage=$((currentimage+1)); done + echo "images to update: $imagestoupdate" + + + currentimage=0 + + $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do if [ ! -r "icons/$filename" ] || [ "$filename" -nt "icons/$filename" ] ; then $ECHOCOMMAND $filename; fi; done | $XARGSCOMMAND --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$imagestoupdate images; currentimage=$((currentimage+1)); done + echo done: $imagestoupdate/$imagestoupdate images +fi + +if [ -r description.txt ] ; then + DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/

/; }; /^$/ { s,$,

,; }; $ { s,$,

, };' description.txt) +else + DESCRIPTION="" +fi -echo done: $totalimages/$totalimages images $BPGALLERY_HEAD_FUNCTION > index.html +$BPGALLERY_DESCRIPTION_FUNCTION >> index.html $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; if [ -r captions.txt ]; then caption=$($GREPCOMMAND -E "^$filename " captions.txt); caption=${caption#* }; else caption=""; fi; $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html @@ -259,6 +297,7 @@ $BPGALLERY_TAIL_FUNCTION >> index.html cd icons MAXHEIGHT=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%h\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1) +MAXWIDTH=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%w\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1) cd ..