[BACK]Return to pgallery.sh CVS log [TXT] [DIR] Up to [Paefchen] / scripts / pgallery / src

Diff for /scripts/pgallery/src/pgallery.sh between versions 1.22 and 1.23

version 1.22, 2012/09/11 15:40:43 version 1.23, 2012/09/11 16:24:46
Line 5 Line 5
 # can do whatever you want with this stuff. If we meet some day, and you think  # 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  # this stuff is worth it, you can buy me a beer in return Aron Schlesinger
 #  #
# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.21 2012/08/31 15:58:03 as Exp $# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.22 2012/09/11 15:40:43 as Exp $
 #  #
 . $(dirname $0)/libpgallery  . $(dirname $0)/libpgallery
   
Line 29  ARG_INDEXIMG= Line 29  ARG_INDEXIMG=
 ARG_STARTTS=  ARG_STARTTS=
 ARG_ENDTS=  ARG_ENDTS=
 ARG_LINK=  ARG_LINK=
   ARG_NAVI=0
   
 MKAKEFILE=".htmakefile"  MKAKEFILE=".htmakefile"
   
Line 42  usage $0: ( [-f <files>] | [-s <suffix>] ) [-d <dir>]  Line 43  usage $0: ( [-f <files>] | [-s <suffix>] ) [-d <dir>] 
                 [-t <thumbnail_size>] [-u <thumbnail_quality>] [-H <link>]                  [-t <thumbnail_size>] [-u <thumbnail_quality>] [-H <link>]
                 [-b <big_size>] [-c <big_quality>] [-l link] [-e <exif>]                  [-b <big_size>] [-c <big_quality>] [-l link] [-e <exif>]
                 [-i <index>] [-C <copyright>] [-F <mailfrom>] [-T <mailto>]                  [-i <index>] [-C <copyright>] [-F <mailfrom>] [-T <mailto>]
                [-U] | -h | -v                [-U] [-w] | -h | -v
 Options:  Options:
   -b size       size from big images in pixel (default: $ARG_BIGSIZE)    -b size       size from big images in pixel (default: $ARG_BIGSIZE)
   -c quality    quality from big images 0-100% (default: $ARG_BIGQALITY)    -c quality    quality from big images 0-100% (default: $ARG_BIGQALITY)
Line 61  Options: Line 62  Options:
   -t size       size from thumbnail images in pixel (default: $ARG_TNSIZE)    -t size       size from thumbnail images in pixel (default: $ARG_TNSIZE)
   -u quality    quality from thumbnail images 0-100% (default: $ARG_BIGQALITY)    -u quality    quality from thumbnail images 0-100% (default: $ARG_BIGQALITY)
   -v            print version    -v            print version
     -w            enable navi width link in the overview
   -C copyright  copyright (html) string (default: $ARG_COPYRIGHT)    -C copyright  copyright (html) string (default: $ARG_COPYRIGHT)
   -F from       mail sender (default: $ARG_MAILFROM)    -F from       mail sender (default: $ARG_MAILFROM)
   -L link       optional home link    -L link       optional home link
Line 68  Options: Line 70  Options:
                 the syntax of the file is MAKE(1)                  the syntax of the file is MAKE(1)
                 supported variable: TITLE COPYRIGHT INDEX FILETYPES TNSIZE URL                  supported variable: TITLE COPYRIGHT INDEX FILETYPES TNSIZE URL
                                     TNQALITY BIGSIZE BIGQALITY MAILTO MAILFROM                                      TNQALITY BIGSIZE BIGQALITY MAILTO MAILFROM
                                    EXIF INDEXIMG LINK                                    EXIF INDEXIMG LINK NAVI
   -T mailto     send update infos to this address. if not set, no mail delivery    -T mailto     send update infos to this address. if not set, no mail delivery
   -U            no update, new calculation of all images.    -U            no update, new calculation of all images.
                 normally only new and modified images will calculated                  normally only new and modified images will calculated
Line 153  do Line 155  do
                 -v)                  -v)
                         echo $VERSION                          echo $VERSION
                         exit;;                          exit;;
                   -w)
                           ARG_NAVI=1;;
                 *)                  *)
                         echo "unknown argument $arg"                          echo "unknown argument $arg"
                         exit                          exit
Line 168  if [ "$ARG_INFOFILE" != "" ] Line 172  if [ "$ARG_INFOFILE" != "" ]
 then  then
         test -f $ARG_INFOFILE || err "info file not found \`\`$ARG_INFOFILE''"          test -f $ARG_INFOFILE || err "info file not found \`\`$ARG_INFOFILE''"
         for n in TITLE COPYRIGHT INDEX FILETYPES TNSIZE TNQALITY BIGSIZE \          for n in TITLE COPYRIGHT INDEX FILETYPES TNSIZE TNQALITY BIGSIZE \
                BIGQALITY MAILTO MAILFROM URL EXIF INDEXIMG LINK                BIGQALITY MAILTO MAILFROM URL EXIF INDEXIMG LINK NAVI
         do          do
                 v=$(make -f $ARG_INFOFILE -V$n)                  v=$(make -f $ARG_INFOFILE -V$n)
                 test "$v" = "" && continue                  test "$v" = "" && continue
Line 180  fi Line 184  fi
 for n in $(set | awk -F= '{print $1}')  for n in $(set | awk -F= '{print $1}')
 do  do
         echo "$n" | grep -q '^ARG_' || continue          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  done
   
 # fix url  # fix url
Line 203  else Line 207  else
         FLIST="$ARG_FILES"          FLIST="$ARG_FILES"
 fi  fi
   
# Filter big and thumbnails# Filter big, thumbnails and curipted images
 echo -n "find images"  echo -n "find images"
 FLISTF=  FLISTF=
 for file in $FLIST  for file in $FLIST
 do  do
         test $(echo $file | grep -E '\.(tn|big)\.jpg$') && continue          test $(echo $file | grep -E '\.(tn|big)\.jpg$') && continue
           test $($BIN_JPEGINFO $file | grep -Eq 'WARNING|ERROR') && continue
         FLISTF="$FLISTF $file"          FLISTF="$FLISTF $file"
         echo -n " $file"          echo -n " $file"
 done  done
Removed from v.1.22  
changed lines
  Added in v.1.23