]> git.sommitrealweird.co.uk Git - bpgallery.git/blobdiff - bpgallery.sh
Bump version number for release
[bpgallery.git] / bpgallery.sh
index ef403e75db53369134e680b595f4488e4402f535..0317e0be6ab5ca2d849594cbcab6fb85ca33aedf 100755 (executable)
@@ -19,7 +19,7 @@
 
 set -f
 
-VERSION="0.9.3"
+VERSION="1.0.1"
 
 function bpgallery_default_head() {
 cat <<END
@@ -34,12 +34,30 @@ cat <<END
 END
 }
 
+declare -rf bpgallery_default_head
+
+function bpgallery_default_description() {
+cat <<END
+       <h1>${TITLE}</h1>
+       ${DESCRIPTION}
+END
+}
+
+declare -rf bpgallery_default_description
+
 function bpgallery_default_thumbsline() {
+if [[ -z $caption ]]; then
+       caption_alt=Unknown
+else
+       caption_alt=$caption
+fi
 cat << END
-<div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a><div class="caption">$caption</div></div>
+<div class="thumbnail"><a href="$filename"><img src="icons/$filename" alt="$caption_alt" /></a><div class="caption">$caption</div></div>
 END
 }
 
+declare -rf bpgallery_default_thumbsline
+
 function bpgallery_default_tail() {
 cat << END
 </body>
@@ -47,6 +65,8 @@ cat << END
 END
 }
 
+declare -rf bpgallery_default_tail
+
 function bpgallery_default_stylesheet() {
 cat <<END
 body {
@@ -80,16 +100,46 @@ img {
 END
 }
 
+declare -rf bpgallery_default_stylesheet
+
+function bpgallery_escape_url() {
+       temp=$1
+       temp=${temp//\%/%25}
+       temp=${temp//:/%3A}
+       temp=${temp//;/%3B}
+       temp=${temp// /%20}
+       temp=${temp//$/%24}
+       temp=${temp//&/%26}
+       temp=${temp//+/%2B}
+       temp=${temp//,/%2C}
+       temp=${temp//\//%2F}
+       temp=${temp//=/%3D}
+       temp=${temp//\?/%3F}
+       temp=${temp//@/%40}
+       temp=${temp//\"/%22}
+       echo $temp
+}
+
+declare -rf bpgallery_escape_url
+
+if [[ ! -z ${BPGALLERY_THEME} ]] ; then
+       declare -r BPGALLERY_THEME
+fi
+
+if [[ ! -z ${TITLE} ]] ; then
+       declare -r TITLE
+fi
+
 if [[ -e /usr/local/etc/bpgallery/config ]] ; then
-       . /usr/local/etc/bpgallery/config
+       . /usr/local/etc/bpgallery/config 2>/dev/null
 fi
 
 if [[ -e /etc/bpgallery/config ]] ; then
-       . /etc/bpgallery/config
+       . /etc/bpgallery/config 2>/dev/null
 fi
 
 if [[ -e $HOME/.bpgallery.rc ]]; then
-       . $HOME/.bpgallery.rc
+       . $HOME/.bpgallery.rc 2>/dev/null
 fi
 
 if [[ -z ${BPGALLERY_THEME} ]]; then
@@ -97,11 +147,11 @@ if [[ -z ${BPGALLERY_THEME} ]]; then
 fi
 
 if [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then
-       . $HOME/.bpgallery.themes/${BPGALLERY_THEME}
+       . $HOME/.bpgallery.themes/${BPGALLERY_THEME} 2>/dev/null
 elif [[ -e /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then
-       . /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME}
+       . /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} 2>/dev/null
 elif [[ -e /etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then
-       . /etc/bpgallery/themes/${BPGALLERY_THEME}
+       . /etc/bpgallery/themes/${BPGALLERY_THEME} 2>/dev/null
 fi
 
 if [[ -z $TITLE ]]; then 
@@ -140,6 +190,10 @@ if [[ -z $GREPCOMMAND ]]; then
        GREPCOMMAND=grep
 fi
 
+if [[ -z $SEDCOMMAND ]]; then
+       SEDCOMMAND=sed
+fi
+
 if [[ -z $WIDTH ]]; then
        WIDTH=100
 fi
@@ -152,12 +206,22 @@ if [[ -z $WCCOMMAND ]]; then
        WCCOMMAND="wc -l"
 fi
 
+if [[ -z $CAPTIONHEIGHT ]]; then
+       CAPTIONHEIGHT=75
+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
@@ -179,10 +243,11 @@ fi
 FINDIMAGESOPTIONS=""
 
 for imageext in $IMAGEEXTENSIONS; do
-       FINDIMAGESOPTIONS=$FINDIMAGESOPTIONS' -o -type f -maxdepth 1 -iname '*.$imageext' -print0'
+       FINDIMAGESOPTIONS=$FINDIMAGESOPTIONS' -o -type f -iname '*.$imageext' -print0'
 done
 
 FINDIMAGESOPTIONS=${FINDIMAGESOPTIONS## -o }
+FINDIMAGESOPTIONS='-maxdepth 1 '${FINDIMAGESOPTIONS}
 
 function usage() {
 cat <<END
@@ -234,32 +299,50 @@ 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."
+
+       imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do filename=${filename//\"/\\\"}; if [ ! -r "icons/$filename" ] || [ "$filename" -nt "icons/$filename" ]; then $ECHOCOMMAND $filename; fi; done | $WCCOMMAND)
+
+       echo "images to update: $imagestoupdate"
+       
+       
+       currentimage=0
 
-totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace echo {} | $WCCOMMAND);
-currentimage=0
+       $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do tempfilename=${filename//\"/\\\"/}; if [ ! -r "icons/$tempfilename" ] || [ "$tempfilename" -nt "icons/$tempfilename" ] ; then $ECHOCOMMAND -n $filename; $ECHOCOMMAND -n -e "\000"; fi; done | $XARGSCOMMAND -0 --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$imagestoupdate images; echo $throwout; currentimage=$((currentimage+1)); done
+       echo done: $imagestoupdate/$imagestoupdate images
+fi
 
-$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
+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#./}; caption=$($GREPCOMMAND -E "^$filename       " captions.txt); caption=${caption#*    }; $BPGALLERY_THUMBSLINE_FUNCTION; done >> 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; filename=$(bpgallery_escape_url "$filename"); $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html
 
 $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 ..
 
 # add a bit to the maxheight for the size of the caption
-MAXHEIGHT=$((MAXHEIGHT+75))
+MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css