Up version number for release

[bpgallery.git] / bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 94bd4eb2ee1b87ac4f8450e0d497f151f7cd51f1..c6dc4ad2181883435fbaf84ee36fc8b8a21e0d7a 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -1,25 +1,25 @@
 #!/usr/bin/env bash
 
 # bpgallery.sh - builds a simple 'gallery' from a collection of images
 #!/usr/bin/env bash
 
 # bpgallery.sh - builds a simple 'gallery' from a collection of images

-# Copyright (C) 2004 Brett Parker <iDunno@sommitrealweird.co.uk>
+# Copyright (C) 2004-2008 Brett Parker <iDunno@sommitrealweird.co.uk>

 #
 #

-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This program is free software; you can redistribute it and/or modify 
+# it under the terms of the GNU General Public License as published by 
+# the Free Software Foundation; either version 2 of the License, or 

 # (at your option) any later version.
 # 
 # (at your option) any later version.
 # 

-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 

 # GNU General Public License for more details.
 # 
 # GNU General Public License for more details.
 # 

-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 
 set -f
 
 
 set -f
 

-VERSION="1.1.2"
+VERSION="1.1.5"

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


@@ -80,8 +80,9 @@ div.thumbnail {
        float: left;
        padding: 20px;
        border: 0px;
        float: left;
        padding: 20px;
        border: 0px;

-       width: ${WIDTH}px;
+       width: ${MAXWIDTH}px;

        height: ${MAXHEIGHT}px;
        height: ${MAXHEIGHT}px;

+       text-align: center;

 }
 
 div.caption {
 }
 
 div.caption {


@@ -376,6 +377,16 @@ else
        WCCOMMAND="$WCCOMMAND -l"
 fi
 
        WCCOMMAND="$WCCOMMAND -l"
 fi
 

+if [[ -z $MAXTHREADS ]]; then
+       # if there's more than 2G of memory, then do 4 threads, otherwise, just 1
+       __total_memory=$(free -t -g | sed -ne '2 { s#Mem:[[:space:]]*\([0-9]*\)[[:space:]]*.*$#\1#; p; }')
+       if [[ $__total_memory -ge 2 ]]; then
+               MAXTHREADS=4
+       else
+               MAXTHREADS=1
+       fi
+fi
+

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


@@ -498,9 +509,16 @@ set.
         WIDTH
             the width to make the icons
 
         WIDTH
             the width to make the icons
 

+        HEIGHT
+            the height to make the icons (sets up a bounding box with WIDTH)
+

         MEDIUMWIDTH
             set the width of images in the medium size pages
 
         MEDIUMWIDTH
             set the width of images in the medium size pages
 

+        MEDIUMHEIGHT
+            the height to make images in the medium size pages (sets up a
+            bounding box with MEDIUMWIDTH)
+

         BPGALLERY_THEME
             set the theme to use (described below)
 
         BPGALLERY_THEME
             set the theme to use (described below)
 


@@ -530,11 +548,61 @@ Version: $VERSION
 END
 }
 
 END
 }
 

+function check_dimensions() {
+       wantedwidth=$1
+       wantedheight=$2
+       dir=$3
+       filename=$4
+       if [ ! -e "$dir/$filename" ]; then
+               echo 0
+               return
+       fi
+       iconwidth=$($IDENTIFYCOMMAND -format "%wx%h" "$dir/$filename")
+       iconheight=${iconwidth//*x}
+       iconwidth=${iconwidth//x*}
+       # are the dimensions correctish?
+       imagesizeright=1
+       if [ ! -z $wantedheight ]; then
+               if [ $wantedwidth -ne $iconwidth ] && [ $wantedheight -ne $iconheight ]; then
+                       imagesizeright=0
+               else
+                       # make sure that both of the dimensions are smaller than they
+                       # should be
+                       if [ $iconwidth -gt $wantedwidth ] || [ $iconheight -gt $wantedheight ]; then
+                               imagesizeright=0
+                       fi
+               fi
+       else
+               if [ $wantedwidth -ne $iconwidth ]; then
+                       imagesizeright=0
+               fi
+       fi
+       echo $imagesizeright
+}
+

 function generate_resized_images() {
        $ECHOCOMMAND "Generating $2"
 function generate_resized_images() {
        $ECHOCOMMAND "Generating $2"

+       width=$1
+       height=${width//*x}
+       if [ $width != $height ]; then
+               width=${width//x*}
+       else
+               height=""
+       fi

        currentimage=0
        totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | $WCCOMMAND);
        currentimage=0
        totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | $WCCOMMAND);

-       imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | while read filename; do filename=${filename//\"/\\\"}; if [ ! -r "$2/$filename" ] || [ "$filename" -nt "$2/$filename" ] || [ $($IDENTIFYCOMMAND -format "%w" "$2/$filename") -ne $1 ]; then $ECHOCOMMAND $filename; fi; done | $WCCOMMAND)
+       imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS |
+               $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} |
+               while read filename; do
+                       filename=${filename//\"/\\\"}
+                       imagesizeright=$(check_dimensions "$width" "$height" "$2" "$filename")
+                       if [ ! -r "$2/$filename" ] ||
+                               [ "$filename" -nt "$2/$filename" ] ||
+                               [ $imagesizeright -ne 1 ]; then
+                               $ECHOCOMMAND $filename
+                       fi
+               done |
+               $WCCOMMAND)

        
        if [ $totalimages -eq 0 ]; then
                # might as well exit at this point - there are no pictures
        
        if [ $totalimages -eq 0 ]; then
                # might as well exit at this point - there are no pictures


@@ -561,13 +629,29 @@ function generate_resized_images() {
                $ECHOCOMMAND "Generating $imagestoupdate of $totalimages $2"
        fi
        
                $ECHOCOMMAND "Generating $imagestoupdate of $totalimages $2"
        fi
        

-       $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | while read filename; do tempfilename=${filename//\"/\\\"/}; if [ ! -r "$2/$tempfilename" ] || [ "$tempfilename" -nt "$2/$tempfilename" ] || [ $($IDENTIFYCOMMAND -format "%w" "$2/$filename") -ne $1 ]; then $ECHOCOMMAND -n $filename; $ECHOCOMMAND -n -e "\000"; fi; done | $XARGSCOMMAND -0 --verbose --max-procs=4 -I {} $CONVERTTOOL -resize $1 '{}' $2/'{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$imagestoupdate images; currentimage=$((currentimage+1)); done
+       $FINDCOMMAND . $FINDIMAGESOPTIONS | \
+               $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | \
+               while read filename; do 
+                       tempfilename=${filename//\"/\\\"/}; 
+                       imagesizeright=$(check_dimensions "$width" "$height" "$2" "$filename")
+                       if [ ! -r "$2/$tempfilename" ] \
+                               || [ "$tempfilename" -nt "$2/$tempfilename" ] \
+                               || [ $imagesizeright -ne 1 ]; then 
+                                       $ECHOCOMMAND -n $filename
+                                       $ECHOCOMMAND -n -e "\000"
+                       fi
+               done | \
+               $XARGSCOMMAND -0 --verbose --max-procs=$MAXTHREADS -I {} $CONVERTTOOL -resize $1 '{}' $2/'{}' 2>&1 | \
+                       while read throwout; do
+                               $ECHOCOMMAND done: $currentimage/$imagestoupdate images
+                               currentimage=$((currentimage+1))
+                       done

        $ECHOCOMMAND done: $imagestoupdate/$imagestoupdate images
        $ECHOCOMMAND "Completed generating $2 for $totalimages images"
 }
 
 function generate_thumbs() {
        $ECHOCOMMAND done: $imagestoupdate/$imagestoupdate images
        $ECHOCOMMAND "Completed generating $2 for $totalimages images"
 }
 
 function generate_thumbs() {

-       if [[ ! -z $HEIGHT ]]; then
+       if [ ! -z $HEIGHT ]; then

                generate_resized_images "${WIDTH}x${HEIGHT}" $ICONSDIRECTORY
        else
        generate_resized_images $WIDTH $ICONSDIRECTORY
                generate_resized_images "${WIDTH}x${HEIGHT}" $ICONSDIRECTORY
        else
        generate_resized_images $WIDTH $ICONSDIRECTORY


@@ -575,8 +659,8 @@ function generate_thumbs() {
 }
 
 function generate_medium() {
 }
 
 function generate_medium() {

-       if [[ ! -z $MEDIUMHEIGHT ]]; then
-               generate_resized_images "${WIDTH}x${HEIGHT}" $MEDIUMDIRECTORY
+       if [ ! -z $MEDIUMHEIGHT ]; then
+               generate_resized_images "${MEDIUMWIDTH}x${MEDIUMHEIGHT}" $MEDIUMDIRECTORY

        else
                generate_resized_images $MEDIUMWIDTH $MEDIUMDIRECTORY
        fi
        else
                generate_resized_images $MEDIUMWIDTH $MEDIUMDIRECTORY
        fi