Update TODO and README

[bpgallery.git] / bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 0d2009e47cdeb4a5c47596cf9947d42c913cb7b0..9a4b76549d370ba8995cca5fb9f8d1967975c58b 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -34,6 +34,13 @@ cat <<END
 END
 }
 
+function bpgallery_default_description() {
+cat <<END
+       <h1>${TITLE}</h1>
+       ${DESCRIPTION}
+END
+}
+
 function bpgallery_default_thumbsline() {
 cat << END
 <div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a><div class="caption">$caption</div></div>
@@ -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/^/<p>/; }; /^$/ { s,$,</p><p>,; }; $ { s,$,</p>, };' 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 ..