--- scripts/pgallery/src/pgallery.sh 2012/09/11 16:47:16 1.25 +++ scripts/pgallery/src/pgallery.sh 2017/12/07 14:24:00 1.28 @@ -1,11 +1,12 @@ -#!/bin/sh +#!/usr/local/libexec/pgallerysh # -# THE BEER-WARE LICENSE 2012 +# THE BEER-WARE LICENSE 2012,13 +# # wrote this file. As long as you retain this notice you # 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.24 2012/09/11 16:32:41 as Exp $ +# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.27 2013/04/03 08:14:52 as Exp $ # . /usr/local/libexec/libpgallery @@ -27,6 +28,7 @@ ARG_MAILFROM="PGallery <${USER}@${HOST}>" ARG_URL= ARG_EXIF="0x920a 0x829d 0x829a ISO 0x8827 / 0x010f - 0x0110" ARG_INDEXIMG= +ARG_NOINDEX= ARG_STARTTS= ARG_ENDTS= ARG_LINK= @@ -54,6 +56,7 @@ Options: -f files gallery images -h this page -i name index file name (default: $ARG_INDEX) + -x ignore gallery on index -l url gallery link -m image image for pgalleryindex. default the first image -n name page title (default: $ARG_TITLE) @@ -71,7 +74,7 @@ Options: the syntax of the file is MAKE(1) supported variable: TITLE COPYRIGHT INDEX FILETYPES TNSIZE URL TNQALITY BIGSIZE BIGQALITY MAILTO MAILFROM - EXIF INDEXIMG LINK NAVI + EXIF INDEXIMG LINK NAVI NOINDEX -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 @@ -158,6 +161,8 @@ do exit;; -w) ARG_NAVI=1;; + -x) + ARG_NOINDEX=1;; *) echo "unknown argument $arg" exit @@ -173,7 +178,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 LINK NAVI + BIGQALITY MAILTO MAILFROM URL EXIF INDEXIMG NOINDEX LINK NAVI do v=$(make -f $ARG_INFOFILE -V$n) test "$v" = "" && continue @@ -181,7 +186,7 @@ then done fi -#paras from iso to utf-8 +# paras from iso to utf-8 for n in $(set | awk -F= '{print $1}') do echo "$n" | grep -q '^ARG_' || continue @@ -238,6 +243,11 @@ test "$ARG_INDEXIMG" = "" && ARG_INDEXIMG=$(echo $FLIS # find start and end ts ARG_STARTTS=$(get_exif_ts $(echo $FLIST | awk '{print $1}')) +# XXX: +if [ "$ARG_STARTTS" = "-1" ] +then + ARG_STARTTS=$(get_exif_ts $(echo $FLIST | awk '{print $2}')) +fi ARG_ENDTS=$(get_exif_ts $(echo $FLIST | awk '{print $NF}')) # find new and to update images