X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/a13646261ee12487ab74ad73c6bd208d60bafc19..HEAD:/bpgallery.sh?ds=inline

diff --git a/bpgallery.sh b/bpgallery.sh
index 3191eed..c6dc4ad 100755
--- 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
-# 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.
 # 
-# 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.
 # 
-# 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
 
-VERSION="1.1.2"
+VERSION="1.1.5"
 
 function bpgallery_default_head() {
 cat <<END
@@ -377,6 +377,16 @@ else
 	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
@@ -499,9 +509,16 @@ set.
         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
 
+        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)
 
@@ -536,6 +553,10 @@ function check_dimensions() {
 	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*}
@@ -620,7 +641,7 @@ function generate_resized_images() {
 					$ECHOCOMMAND -n -e "\000"
 			fi
 		done | \
-		$XARGSCOMMAND -0 --verbose --max-procs=4 -I {} $CONVERTTOOL -resize $1 '{}' $2/'{}' 2>&1 | \
+		$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))