Add in update method

[bpgallery.git] / bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 07b0d228b7b0fb4aa8c4246ba65d28a41950b5cd..9a4b76549d370ba8995cca5fb9f8d1967975c58b 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -19,7 +19,7 @@
 
 set -f
 
 
 set -f
 

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

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


@@ -34,9 +34,16 @@ cat <<END
 END
 }
 
 END
 }
 

+function bpgallery_default_description() {
+cat <<END
+       <h1>${TITLE}</h1>
+       ${DESCRIPTION}
+END
+}
+

 function bpgallery_default_thumbsline() {
 cat << 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
 }
 
 END
 }
 


@@ -53,7 +60,7 @@ body {
         background: white;
         color: black;
         font-family: sans-serif;
         background: white;
         color: black;
         font-family: sans-serif;

-        font-size: 12pt;
+        font-size: 10pt;

 }
 
 div.thumbnail {
 }
 
 div.thumbnail {


@@ -64,6 +71,12 @@ div.thumbnail {
         height: ${MAXHEIGHT}px;
 }
 
         height: ${MAXHEIGHT}px;
 }
 

+div.caption {
+       width: 100%;
+       text-align: center;
+       font-weight: bold;
+}
+

 a {
         border: 0px;
 }
 a {
         border: 0px;
 }


@@ -130,6 +143,14 @@ if [[ -z $HEADCOMMAND ]]; then
        HEADCOMMAND=head
 fi
 
        HEADCOMMAND=head
 fi
 

+if [[ -z $GREPCOMMAND ]]; then
+       GREPCOMMAND=grep
+fi
+
+if [[ -z $SEDCOMMAND ]]; then
+       SEDCOMMAND=sed
+fi
+

 if [[ -z $WIDTH ]]; then
        WIDTH=100
 fi
 if [[ -z $WIDTH ]]; then
        WIDTH=100
 fi


@@ -142,12 +163,26 @@ if [[ -z $WCCOMMAND ]]; then
        WCCOMMAND="wc -l"
 fi
 
        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}_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
 if declare -F "bpgallery_${BPGALLERY_THEME}_thumbsline" > /dev/null ; then
        BPGALLERY_THUMBSLINE_FUNCTION="bpgallery_${BPGALLERY_THEME}_thumbsline"
 else


@@ -224,37 +259,50 @@ fi
 
 if [ ! -d icons ]; then
        mkdir icons
 
 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
 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
+
+       $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/^/<p>/; }; /^$/ { s,$,</p><p>,; }; $ { s,$,</p>, };' description.txt)
+else
+       DESCRIPTION=""
+fi

 
 

-echo done: $totalimages/$totalimages images

 
 $BPGALLERY_HEAD_FUNCTION > index.html
 
 $BPGALLERY_HEAD_FUNCTION > index.html

+$BPGALLERY_DESCRIPTION_FUNCTION >> index.html

 
 

-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; $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
 
 cd icons
 
 
 $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 ..
 
 
 cd ..
 

+# add a bit to the maxheight for the size of the caption
+MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))

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