X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/82f99e21c12b5ad16229ff5cff088bad710f3a04..489511a520f9dc32502658b066ffe8235e5cdd10:/bpgallery.sh diff --git a/bpgallery.sh b/bpgallery.sh index 7a6f9d2..9a4b765 100755 --- a/bpgallery.sh +++ b/bpgallery.sh @@ -19,7 +19,7 @@ set -f -VERSION="0.9.2" +VERSION="0.9.3+arch" function bpgallery_default_head() { cat <${TITLE} + ${DESCRIPTION} +END +} + function bpgallery_default_thumbsline() { cat << END -
+
$caption
END } @@ -53,7 +60,7 @@ body { background: white; color: black; font-family: sans-serif; - font-size: 12pt; + font-size: 10pt; } div.thumbnail { @@ -64,6 +71,12 @@ div.thumbnail { height: ${MAXHEIGHT}px; } +div.caption { + width: 100%; + text-align: center; + font-weight: bold; +} + a { border: 0px; } @@ -74,6 +87,30 @@ img { END } +if [[ -e /usr/local/etc/bpgallery/config ]] ; then + . /usr/local/etc/bpgallery/config +fi + +if [[ -e /etc/bpgallery/config ]] ; then + . /etc/bpgallery/config +fi + +if [[ -e $HOME/.bpgallery.rc ]]; then + . $HOME/.bpgallery.rc +fi + +if [[ -z ${BPGALLERY_THEME} ]]; then + BPGALLERY_THEME=default +fi + +if [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then + . $HOME/.bpgallery.themes/${BPGALLERY_THEME} +elif [[ -e /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then + . /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} +elif [[ -e /etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then + . /etc/bpgallery/themes/${BPGALLERY_THEME} +fi + if [[ -z $TITLE ]]; then TITLE="Photo Gallery" fi @@ -106,6 +143,14 @@ if [[ -z $HEADCOMMAND ]]; then HEADCOMMAND=head fi +if [[ -z $GREPCOMMAND ]]; then + GREPCOMMAND=grep +fi + +if [[ -z $SEDCOMMAND ]]; then + SEDCOMMAND=sed +fi + if [[ -z $WIDTH ]]; then WIDTH=100 fi @@ -118,6 +163,44 @@ if [[ -z $WCCOMMAND ]]; then WCCOMMAND="wc -l" fi +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 + BPGALLERY_THUMBSLINE_FUNCTION="bpgallery_default_thumbsline" +fi + +if declare -F "bpgallery_${BPGALLERY_THEME}_tail" > /dev/null ; then + BPGALLERY_TAIL_FUNCTION="bpgallery_${BPGALLERY_THEME}_tail" +else + BPGALLERY_TAIL_FUNCTION="bpgallery_default_tail" +fi + +if declare -F "bpgallery_${BPGALLERY_THEME}_stylesheet" > /dev/null ; then + BPGALLERY_STYLESHEET_FUNCTION="bpgallery_${BPGALLERY_THEME}_stylesheet" +else + BPGALLERY_STYLESHEET_FUNCTION="bpgallery_default_stylesheet" +fi + FINDIMAGESOPTIONS="" for imageext in $IMAGEEXTENSIONS; do @@ -176,37 +259,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." -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 -echo done: $totalimages/$totalimages images + $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 -bpgallery_default_head > index.html -$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; bpgallery_default_thumbsline $filename; done >> index.html +$BPGALLERY_HEAD_FUNCTION > index.html +$BPGALLERY_DESCRIPTION_FUNCTION >> index.html -bpgallery_default_tail >> 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 + +$BPGALLERY_TAIL_FUNCTION >> index.html cd icons -for imageext in $IMAGEEXTENSIONS; do - if ( ls "*.$imageext" > /dev/null 2>/dev/null ); then - TEMPMAX=$($IDENTIFYCOMMAND *.$imageext | grep "Geometry:" | sed -r 's#^.*Geometry:.*?[0-9]+x([0-9]+)\+.*$#\1#' | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1) - if [[ $TEMPMAX -gt $MAXHEIGHT ]]; then - MAXHEIGHT=$TEMPMAX - fi - fi -done +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+$CAPTIONHEIGHT)) -bpgallery_default_stylesheet > style.css +$BPGALLERY_STYLESHEET_FUNCTION > style.css