--- scripts/pgallery/src/pgallery.sh 2012/08/28 10:44:41 1.5 +++ scripts/pgallery/src/pgallery.sh 2012/08/28 17:08:34 1.7 @@ -5,7 +5,7 @@ # 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.4 2012/08/28 08:43:05 as Exp $ +# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.6 2012/08/28 12:30:30 as Exp $ # ARG_TITLE="PGallery" @@ -19,11 +19,18 @@ ARG_INDEX="index.html" ARG_DIR="." ARG_UPDATE=1 ARG_COPYRIGHT="© $(date +%Y)" -ARG_INFOFILE="pgallery.txt" +ARG_INFOFILE="" +ARG_MAILTO="" +ARG_MAILFROM="PGallery <${USER}@${HOST}>" +ARG_URL= +ARG_EXIF="0x920a 0x829d 0x829a ISO 0x8827 / 0x010f - 0x0110" BIN_CONVERT="/usr/local/bin/convert" BIN_EXIFAUTOTRAN="/usr/local/bin/exifautotran" BIN_IMGINFO="/usr/local/bin/imginfo" +BIN_SENDMAIL="/usr/sbin/sendmail" +BIN_EXIFTRAN="/usr/local/bin/exiftran" +BIN_EXIF="/usr/local/bin/exif" MKAKEFILE=".htmakefile" VERSION="pgallery-1.1" @@ -36,15 +43,19 @@ usage() cat <] | [-s ] ) [-d ] [-n ] [-t ] [-u ] - [-b ] [-c ] - [-i ] [-C ] [-U] | -h | -v + [-b ] [-c ] [-l link] [-e ] + [-i ] [-C ] [-F ] [-T ] + [-U] | -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) -d dir gallery dir (default: $ARG_DIR) + -e exif list of tags in hex. (default: $ARG_EXIF) + see: http://www.exiv2.org/tags.html -f files gallery images -h this page -i name index file name (default: $ARG_INDEX) + -l url gallery link -n name page title (default: $ARG_TITLE) -s suffix list of suffix. if no \`\`-f'' defined, used to find images in \`\`-d'' directoy. case insensitive @@ -53,10 +64,13 @@ Options: -u quality quality from thumbnail images 0-100% (default: $ARG_BIGQALITY) -v print version -C copyright copyright (html) string (default: $ARG_COPYRIGHT) + -F from mail sender (default: $ARG_MAILFROM) -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 - TNQALITY BIGSIZE BIGQALITY + supported variable: TITLE COPYRIGHT INDEX FILETYPES TNSIZE URL + TNQALITY BIGSIZE BIGQALITY MAILTO MAILFROM + EXIF + -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 USAGE @@ -146,6 +160,7 @@ HLaErzv/wD99ABmjNZk0AAAAABJRU5ErkJggg=="); font-family: Geneva,Arial,sans-serif; font-size: 12px; text-shadow: 1px 1px 1px #000; + color: #808080; } div.tn { float: left; @@ -230,11 +245,14 @@ div.box { width: ${ARG_BIGSIZE}px; margin: auto; } -div.box div.c { +div.box div.d { width: ${ARG_BIGSIZE}px; - text-align: right; + padding: 5px; + text-align: center; +} +div.box div.i { + width: ${ARG_BIGSIZE}px; font-size: 90%; - color: #808080; height: 25px; line-height: 25px; position: relative; @@ -243,7 +261,6 @@ div.box div.c { body > div.c { text-align: center; font-size: 90%; - color: #808080; height: 25px; line-height: 25px; position: relative; @@ -324,15 +341,22 @@ HTML # html_img() { - img=$1 - link=$2 - linkb=$3 - linkn=$4 + orig=$1 + img=$2 + link=$3 + linkb=$4 + linkn=$5 info=$($BIN_IMGINFO -f $img) width=$(echo $info | awk '{print $3}') height=$(echo $info | awk '{print $4}') + desc=$(get_exif_desc $orig) + if [ "$desc" != "" ] + then + desc="
$desc
" + fi + if [ "$linkb" != "" ] then hlinkb="zurück" @@ -355,8 +379,10 @@ html_img()
$img
-
- $ARG_TITLE $ARG_COPYRIGHT + $desc +
+
$(get_exif_info $orig)
+
$ARG_TITLE $ARG_COPYRIGHT
$olinkb @@ -375,7 +401,66 @@ err() exit 1 } +# +# mysendmail() +# +mysendmail() +{ + subject=$1 + ( + cat < /dev/null | iconv -t ISO-8859-1 -f UTF-8 | while read line + do + echo "$line
" + done +} + +# +# get_exif_value() +# +get_exif_value() +{ + img=$1 + hex=$2 + $BIN_EXIFTRAN -d $img | grep $hex | sed -E 's/^.{45}//' +} + +# +# get_exif_info() +# +get_exif_info() +{ + img=$1 + exifinfo= + for exif in $ARG_EXIF + do + if echo $exif | grep -q -E '0x[[:alnum:]]{4}' + then + exifinfo="$exifinfo$(get_exif_value $img $exif) " + else + exifinfo="$exifinfo$exif " + fi + done + echo $exifinfo +} + # parse args while [ "$1" != "" ] do @@ -383,55 +468,54 @@ do shift case $arg in -h) - usage - ;; + usage;; -n) ARG_TITLE=$1 - shift - ;; + shift;; -t) ARG_TNSIZE=$1 - shift - ;; + shift;; -u) ARG_TNQALITY=$1 - shift - ;; + shift;; -b) ARG_BIGSIZE=$1 - shift - ;; + shift;; -c) ARG_BIGQALITY=$1 - shift - ;; + shift;; -f) ARG_FILES=$1 - shift - ;; + shift;; + -l) + ARG_URL=$1 + shift;; -s) ARG_FILETYPES=$1 - shift - ;; + shift;; -d) ARG_DIR=$1 - shift - ;; + shift;; + -e) + ARG_EXIF=$1 + shift;; -C) ARG_COPYRIGHT=$1 - shift - ;; + shift;; + -F) + ARG_MAILFROM=$1 + shift;; -I) ARG_INFOFILE=$1 - shift - ;; + shift;; + -T) + ARG_MAILTO=$1 + shift;; -U) - ARG_UPDATE=0 - ;; + ARG_UPDATE=0;; -v) echo $VERSION - exit - ;; + exit;; *) echo "unknown argument $arg" exit @@ -442,7 +526,8 @@ done 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 + for n in TITLE COPYRIGHT INDEX FILETYPES TNSIZE TNQALITY BIGSIZE \ + BIGQALITY MAILTO MAILFROM URL EXIF do v=$(make -f $ARG_INFOFILE -V$n) test "$v" = "" && continue @@ -450,12 +535,16 @@ then done fi -echo $ARG_COPYRIGHT -exit - +# go to gallery directory MY=$(get_my_path) cd "$ARG_DIR" || exit 1 +# fix url +if [ "$ARG_URL" != "" ] +then + echo "$ARG_URL" | grep -q '/$' || ARG_URL="${ARG_URL}/" +fi + # if no images defined, find files if [ "$ARG_FILES" = "" -a "$ARG_FILETYPES" != "" ] then @@ -519,7 +608,6 @@ then echo new images: $FLIST_NEW echo update images: $FLIST_UPDATE fi -exit # Create make file to rotate und convert all big and thumbnails. # Is needed to define the new real image sizes. @@ -578,7 +666,7 @@ do index="$index $(html_tn $tn $imglink)" ( html_header - html_img $big $ARG_INDEX "$linkb" "$linkn" + html_img $file $big $ARG_INDEX "$linkb" "$linkn" html_footer ) > $imglink done @@ -593,3 +681,47 @@ echo create html index echo "
$ARG_TITLE $ARG_COPYRIGHT
" html_footer ) > $ARG_INDEX + + +test "$ARG_MAILTO" = "" && exit 0 + +# send info mail +if [ "$FLIST_NEW" != "" -o "$FLIST_UPDATE" != "" ] +then + echo "send mail to $ARG_MAILTO" + ( + echo "Hallo," + echo + echo -n "the gallery $ARG_TITLE has been updated" + if [ "$ARG_URL" != "" ] + then + echo ":" + echo $ARG_URL + else + echo "." + fi + + suffix= + test "$ARG_URL" != "" && suffix=.html + + if [ "$FLIST_NEW" != "" ] + then + echo + echo "add pictures:" + for file in $FLIST_NEW + do + echo "- ${ARG_URL}${file}${suffix}" + done + fi + + if [ "$FLIST_UPDATE" != "" ] + then + echo + echo "update pictures:" + for file in $FLIST_UPDATE + do + echo "- ${ARG_URL}${file}${suffix}" + done + fi + ) | mysendmail "PGallery Update: $ARG_TITLE" +fi