--- scripts/pgallery/src/pgallery.sh	2012/08/31 14:26:58	1.19
+++ scripts/pgallery/src/pgallery.sh	2012/09/11 16:47:16	1.25
@@ -5,10 +5,11 @@
 # can do whatever you want with this stuff. If we meet some day, and you think
 # this stuff is worth it, you can buy me a beer in return Aron Schlesinger
 #
-# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.18 2012/08/31 12:33:07 as Exp $
+# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.24 2012/09/11 16:32:41 as Exp $
 #
-. $(dirname $0)/libpgallery
 
+. /usr/local/libexec/libpgallery
+
 ARG_TITLE="PGallery"
 ARG_FILES=
 ARG_FILETYPES="jpg jpeg png gif tif tiff"
@@ -28,6 +29,8 @@ ARG_EXIF="0x920a 0x829d 0x829a ISO 0x8827 / 0x010f - 0
 ARG_INDEXIMG=
 ARG_STARTTS=
 ARG_ENDTS=
+ARG_LINK=
+ARG_NAVI=0
 
 MKAKEFILE=".htmakefile"
 
@@ -38,10 +41,10 @@ usage()
 {
 	cat <<USAGE
 usage $0: ( [-f <files>] | [-s <suffix>] ) [-d <dir>] [-n <name>]
-                [-t <thumbnail_size>] [-u <thumbnail_quality>]
+                [-t <thumbnail_size>] [-u <thumbnail_quality>] [-H <link>]
                 [-b <big_size>] [-c <big_quality>] [-l link] [-e <exif>]
                 [-i <index>] [-C <copyright>] [-F <mailfrom>] [-T <mailto>]
-                [-U] | -h | -v
+                [-U] [-w] | -h | -v
 Options:
   -b size       size from big images in pixel (default: $ARG_BIGSIZE)
   -c quality    quality from big images 0-100% (default: $ARG_BIGQALITY)
@@ -60,13 +63,15 @@ Options:
   -t size       size from thumbnail images in pixel (default: $ARG_TNSIZE)
   -u quality    quality from thumbnail images 0-100% (default: $ARG_BIGQALITY)
   -v            print version
+  -w            enable navi width link in the overview
   -C copyright  copyright (html) string (default: $ARG_COPYRIGHT)
   -F from       mail sender (default: $ARG_MAILFROM)
+  -L link       optional home link
   -I file       info text file for pgallery. info file paras prefered.
                 the syntax of the file is MAKE(1)
                 supported variable: TITLE COPYRIGHT INDEX FILETYPES TNSIZE URL
                                     TNQALITY BIGSIZE BIGQALITY MAILTO MAILFROM
-                                    EXIF INDEXIMG
+                                    EXIF INDEXIMG LINK NAVI
   -T mailto     send update infos to this address. if not set, no mail delivery
   -U            no update, new calculation of all images.
                 normally only new and modified images will calculated
@@ -86,8 +91,6 @@ do
 	test $arg = -d && is_dir=1
 done
 
-echo $ARG_DIR
-
 # load save args
 if [ -f "$ARG_DIR/$ARGFILE" ]
 then
@@ -139,6 +142,9 @@ do
 		-F)
 			ARG_MAILFROM=$1
 			shift;;
+		-L)
+			ARG_LINK=$1
+			shift;;
 		-I)
 			ARG_INFOFILE=$1
 			shift;;
@@ -150,6 +156,8 @@ do
 		-v)
 			echo $VERSION
 			exit;;
+		-w)
+			ARG_NAVI=1;;
 		*)
 			echo "unknown argument $arg"
 			exit
@@ -165,7 +173,7 @@ if [ "$ARG_INFOFILE" != "" ]
 then
 	test -f $ARG_INFOFILE || err "info file not found \`\`$ARG_INFOFILE''"
 	for n in TITLE COPYRIGHT INDEX FILETYPES TNSIZE TNQALITY BIGSIZE \
-		BIGQALITY MAILTO MAILFROM URL EXIF INDEXIMG
+		BIGQALITY MAILTO MAILFROM URL EXIF INDEXIMG LINK NAVI
 	do
 		v=$(make -f $ARG_INFOFILE -V$n)
 		test "$v" = "" && continue
@@ -177,7 +185,7 @@ fi
 for n in $(set | awk -F= '{print $1}')
 do
 	echo "$n" | grep -q '^ARG_' || continue
-	eval "$n=\"\$(echo \"\$$n\" | iconv -f ISO-8859-1 -t UTF-8)\""
+	eval "$n=\"\$(echo \"\$$n\" | $BIN_ICONV -f ISO-8859-1 -t UTF-8)\""
 done
 
 # fix url
@@ -200,12 +208,13 @@ else
 	FLIST="$ARG_FILES"
 fi
 
-# Filter big and thumbnails
+# Filter big, thumbnails and curipted images
 echo -n "find images"
 FLISTF=
 for file in $FLIST
 do
 	test $(echo $file | grep -E '\.(tn|big)\.jpg$') && continue
+	test $($BIN_JPEGINFO $file | grep -Eq 'WARNING|ERROR') && continue
 	FLISTF="$FLISTF $file"
 	echo -n " $file"
 done
@@ -263,6 +272,7 @@ echo "save settings"
 set | while read n
 do
 	echo "$n" | grep -q '^ARG_' || continue
+	echo "$n" | grep -q '^ARG_UPDATE' && continue
 	echo "$n" >> $ARGFILE
 done
 
@@ -308,13 +318,14 @@ MAKE
 done
 echo "tns: $targets" >> $MKAKEFILE
 
-#make -f $MKAKEFILE
+make -f $MKAKEFILE
 rm $MKAKEFILE
 
 # create html index
 echo create html index
 (
 	html_header
+
 	startdate=
 	test $ARG_STARTTS -ne -1 && startdate=$(date -r $ARG_STARTTS "+%d.%m.%Y")
 	enddate=
@@ -322,8 +333,10 @@ echo create html index
 	date=
 	test "$startdate" != "" && date="$startdate"
 	test "$enddate" != "$startdate" && date="$date - $enddate"
+	link=
+	test "$ARG_LINK" != "" && link="<a href='$ARG_LINK'>overview</a>"
+	html_title "$ARG_TITLE" "$link" "$date"
 
-	html_title "$ARG_TITLE" "$date"
 	for file in $FLIST
 	do
 		tn="${file}.tn.jpg"