Fix the image height code

[bpgallery.git] / bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 7a6f9d255e336d0cbf6333cc0a42bda798221003..ef403e75db53369134e680b595f4488e4402f535 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -19,7 +19,7 @@
 
 set -f
 
-VERSION="0.9.2"
+VERSION="0.9.3"
 
 function bpgallery_default_head() {
 cat <<END
@@ -36,7 +36,7 @@ END
 
 function bpgallery_default_thumbsline() {
 cat << END
-<div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a></div>
+<div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a><div class="caption">$caption</div></div>
 END
 }
 
@@ -53,7 +53,7 @@ body {
         background: white;
         color: black;
         font-family: sans-serif;
-        font-size: 12pt;
+        font-size: 10pt;
 }
 
 div.thumbnail {
@@ -64,6 +64,12 @@ div.thumbnail {
         height: ${MAXHEIGHT}px;
 }
 
+div.caption {
+       width: 100%;
+       text-align: center;
+       font-weight: bold;
+}
+
 a {
         border: 0px;
 }
@@ -74,6 +80,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 +136,10 @@ if [[ -z $HEADCOMMAND ]]; then
        HEADCOMMAND=head
 fi
 
+if [[ -z $GREPCOMMAND ]]; then
+       GREPCOMMAND=grep
+fi
+
 if [[ -z $WIDTH ]]; then
        WIDTH=100
 fi
@@ -118,6 +152,30 @@ if [[ -z $WCCOMMAND ]]; then
        WCCOMMAND="wc -l"
 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}_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
@@ -188,25 +246,20 @@ $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --verbose --max-procs=4 --r
 
 echo done: $totalimages/$totalimages images
 
-bpgallery_default_head > index.html
+$BPGALLERY_HEAD_FUNCTION > index.html
 
-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; bpgallery_default_thumbsline $filename; done >> 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
 
-bpgallery_default_tail >> 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)
 
 cd ..
 
+# add a bit to the maxheight for the size of the caption
+MAXHEIGHT=$((MAXHEIGHT+75))
 
-bpgallery_default_stylesheet > style.css
+$BPGALLERY_STYLESHEET_FUNCTION > style.css