author: Christian <christian@libellug.org>
status: Not submitted upstream
descr : various enhancements for the imgconv script :
        o tgz and bz2 support,
        o minor bug fixes,
        o quality settings vars

--- original.old/convert/imgconv	2005-04-22 13:41:28.000000000 +0000
+++ original.new/convert/imgconv	2006-05-18 20:51:14.000000000 +0000
@@ -11,7 +11,9 @@
 #default options
 dir=./web-gallery
 zip=0
-mq=0
+tgz=1
+bz2=1
+mq=1
 hq=0
 interactive=0
 verbose=echo
@@ -151,6 +153,8 @@
 [ $mq -gt 0 ] && mkdir -p $dir/mq
 [ $hq -gt 0 ] && mkdir -p $dir/hq
 [ $zip -gt 0 ] && mkdir -p $dir/zip
+[ $tgz -gt 0 ] && mkdir -p $dir/tgz
+[ $bz2 -gt 0 ] && mkdir -p $dir/bz2
 
 # Protect info.txt, even if we don't make it.
 echo "<Files info.txt>" > $dir/.htaccess
@@ -165,6 +169,10 @@
 #files=$@
 
 i=1
+thquality=50 #60
+lqquality=70 #90
+mqquality=60 #80
+
 for imagefile in $files; do
 
     good_file "$imagefile"
@@ -177,16 +185,16 @@
 
   $verbose -n "."
   $convertor -geometry 120x120 -modulate 100,140,100 -unsharp 1x20 \
-      -quality 60 $extra_opts "$imagefile" $dir/thumbs/img-$i.jpg
+      -quality $thquality $extra_opts "$imagefile" $dir/thumbs/img-$i.jpg
 
   $verbose -n "."
   $convertor -geometry 640x480 -modulate 100,130,100 -unsharp 1x5 \
-      -quality 90 "$imagefile" $dir/lq/img-$i.jpg
+      -quality $lqquality "$imagefile" $dir/lq/img-$i.jpg
 
   if [ $mq -gt 0 ]; then
       $verbose -n "."
       $convertor -geometry 1024x768 -modulate 100,130,100 -unsharp 1x5 \
-	  -quality 80 "$imagefile" $dir/mq/img-$i.jpg
+	  -quality $mqquality "$imagefile" $dir/mq/img-$i.jpg
   fi
 
   if [ $hq -gt 0 ] ; then
@@ -204,9 +212,24 @@
 
 # zip stuff
 if [ $zip -gt 0 ]; then
-    $verbose "archiving"
-    [ $mq ] && zip -R $dir/zip/mq.zip  web-gallery/mq/*.jpg
-    [ $hq ] && zip -R $dir/zip/hq.zip web-gallery/hq/*.jpg
+	zip=`which zip`
+	[ ! -z "$zip" ] && {
+    $verbose "archiving (zip)"
+    [ $mq -gt 0 ] && zip -R $dir/zip/mq.zip web-gallery/mq/*.jpg
+    [ $hq -gt 0 ] && zip -R $dir/zip/hq.zip web-gallery/hq/*.jpg
+	}
+fi
+
+# tgz && bz2 stuff
+if [ $tgz -gt 0 ]; then
+	$verbose "archiving (tgz)"
+	[ $mq -gt 0 ] && tar czf $dir/tgz/mq.tgz web-gallery/mq/*.jpg
+	[ $hq -gt 0 ] && tar czf $dir/tgz/hq.tgz web-gallery/hq/*.jpg
+fi
+if [ $bz2 -gt 0 ]; then
+    $verbose "archiving (bz2)"
+    [ $mq -gt 0 ] && tar cjf $dir/bz2/mq.tar.bz2 web-gallery/mq/*.jpg
+    [ $hq -gt 0 ] && tar cjf $dir/bz2/hq.tar.bz2 web-gallery/hq/*.jpg
 fi
 
 #info.txt