From: Brett Parker Date: Sat, 23 Apr 2005 08:33:51 +0000 (+0000) Subject: Handle no captions.txt nicer X-Git-Tag: release-1.0.0~3 X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/commitdiff_plain/657a5a1384747ed03979162ea282e5653a790acc Handle no captions.txt nicer If there's no captions.txt, then don't try to grep it for the caption. git-archimport-id: arch@sommitrealweird.co.uk--2005-desktop/bpgallery--mainline--1.0--patch-2 --- diff --git a/README b/README index b9003a6..6af9d16 100644 --- a/README +++ b/README @@ -8,8 +8,8 @@ Requirements ------------ The ImageMagick tools (convert and identify) bash -find -xargs +GNU find +GNU xargs Installation ------------ diff --git a/TODO b/TODO index 1f48a60..c0ea7ad 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,3 @@ * Add in a middle image size, so thumbs -> medium -> full size -* Add in captions -* Add in theme support * Allow to recreate galleries and use new captions (only resizing changed images diff --git a/bpgallery.sh b/bpgallery.sh index ef403e7..0d2009e 100755 --- a/bpgallery.sh +++ b/bpgallery.sh @@ -19,7 +19,7 @@ set -f -VERSION="0.9.3" +VERSION="0.9.3+arch" function bpgallery_default_head() { cat < /dev/null ; then BPGALLERY_HEAD_FUNCTION="bpgallery_${BPGALLERY_THEME}_head" else @@ -248,7 +252,7 @@ echo done: $totalimages/$totalimages images $BPGALLERY_HEAD_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; $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html $BPGALLERY_TAIL_FUNCTION >> index.html @@ -259,7 +263,7 @@ MAXHEIGHT=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAN cd .. # add a bit to the maxheight for the size of the caption -MAXHEIGHT=$((MAXHEIGHT+75)) +MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT)) $BPGALLERY_STYLESHEET_FUNCTION > style.css