X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/489511a520f9dc32502658b066ffe8235e5cdd10..56fdabc7cf470c6d6cee9efc652dda63f7dc7fa8:/bpgallery.sh diff --git a/bpgallery.sh b/bpgallery.sh index 9a4b765..948d589 100755 --- a/bpgallery.sh +++ b/bpgallery.sh @@ -19,7 +19,7 @@ set -f -VERSION="0.9.3+arch" +VERSION="1.0.1+arch" function bpgallery_default_head() { cat <${TITLE} @@ -41,12 +43,21 @@ cat <
$caption
+
$caption_alt
$caption
END } +declare -rf bpgallery_default_thumbsline + function bpgallery_default_tail() { cat << END @@ -54,6 +65,8 @@ cat << END END } +declare -rf bpgallery_default_tail + function bpgallery_default_stylesheet() { cat </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 [[ -e $1 && -d $1 && -e $1/.bpgallery.rc ]]; then + . $1/.bpgallery.rc 2>/dev/null fi if [[ -z ${BPGALLERY_THEME} ]]; then @@ -104,11 +151,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 @@ -167,10 +214,6 @@ 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 @@ -204,10 +247,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 <&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$imagestoupdate images; currentimage=$((currentimage+1)); done + $ECHOCOMMAND done: $imagestoupdate/$imagestoupdate images + $ECHOCOMMAND "Completed generating thumbs for $totalimages images" +} + if [[ -z $1 ]]; then - echo "No path given" + $ECHOCOMMAND "No path given" usage exit 1 fi @@ -245,7 +309,7 @@ if [[ "$1" == "--version" || "$1" == "-v" ]]; then fi if [[ ! -d $1 ]]; then - echo "$1 is not a directory" + $ECHOCOMMAND "$1 is not a directory" usage exit 2 fi @@ -253,33 +317,16 @@ fi cd "$1" if ( ! $FINDCOMMAND . $FINDIMAGESOPTIONS > /dev/null 2>/dev/null ); then - echo "$1 does not contain any images. Quitting." + $ECHOCOMMAND "$1 does not contain any images. Quitting." exit 4 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, updating." - - 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) - - 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 +generate_thumbs + if [ -r description.txt ] ; then DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/

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

,; }; $ { s,$,

, };' description.txt) else @@ -290,7 +337,7 @@ fi $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 +$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