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 b9003a611e21f44b94800d845c10e9b09cec9e7c..6af9d164c9f82d8aa3e219bb397b7584794e4e1a 100644 (file)
--- a/README
+++ b/README
@@ -8,8 +8,8 @@ Requirements
 ------------
 The ImageMagick tools (convert and identify)
 bash
 ------------
 The ImageMagick tools (convert and identify)
 bash

-find
-xargs
+GNU find
+GNU xargs

 
 Installation
 ------------
 
 Installation
 ------------

diff --git a/TODO b/TODO
index 1f48a60efc749d9a4a7a03408bcde64ace142915..c0ea7ad7eefb364d3aa875d4e6428b85d6cfd817 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
 * Add in a middle image size, so thumbs -> medium -> full size
 * 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
 * Allow to recreate galleries and use new captions (only resizing changed
   images

diff --git a/bpgallery.sh b/bpgallery.sh
index ef403e75db53369134e680b595f4488e4402f535..0d2009e47cdeb4a5c47596cf9947d42c913cb7b0 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -19,7 +19,7 @@
 
 set -f
 
 
 set -f
 

-VERSION="0.9.3"
+VERSION="0.9.3+arch"

 
 function bpgallery_default_head() {
 cat <<END
 
 function bpgallery_default_head() {
 cat <<END


@@ -152,6 +152,10 @@ if [[ -z $WCCOMMAND ]]; then
        WCCOMMAND="wc -l"
 fi
 
        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
 if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /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
 
 
 $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
 
 
 $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
 cd ..
 
 # add a bit to the maxheight for the size of the caption

-MAXHEIGHT=$((MAXHEIGHT+75))
+MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))

 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css