[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.18 and 1.19

version 1.18, 2012/08/31 12:33:07 version 1.19, 2012/08/31 14:26:58
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.17 2012/08/29 14:44:04 as Exp $# $Paefchen: scripts/pgallery/src/pgallery.sh,v 1.18 2012/08/31 12:33:07 as Exp $
 #  #
 . $(dirname $0)/libpgallery  . $(dirname $0)/libpgallery
   
Line 26  ARG_MAILFROM="PGallery <${USER}@${HOST}>" Line 26  ARG_MAILFROM="PGallery <${USER}@${HOST}>"
 ARG_URL=  ARG_URL=
 ARG_EXIF="0x920a 0x829d 0x829a ISO 0x8827 / 0x010f - 0x0110"  ARG_EXIF="0x920a 0x829d 0x829a ISO 0x8827 / 0x010f - 0x0110"
 ARG_INDEXIMG=  ARG_INDEXIMG=
   ARG_STARTTS=
   ARG_ENDTS=
   
 MKAKEFILE=".htmakefile"  MKAKEFILE=".htmakefile"
   
Line 225  FLIST=$( Line 227  FLIST=$(
 # if no master image, we use the first one  # if no master image, we use the first one
 test "$ARG_INDEXIMG" = "" && ARG_INDEXIMG=$(echo $FLIST | awk '{print $1}')  test "$ARG_INDEXIMG" = "" && ARG_INDEXIMG=$(echo $FLIST | awk '{print $1}')
   
   # find start and end ts
   ARG_STARTTS=$(get_exif_ts $(echo $FLIST | awk '{print $1}'))
   ARG_ENDTS=$(get_exif_ts $(echo $FLIST | awk '{print $NF}'))
   
 # find new and to update images  # find new and to update images
 FLIST_NEW=  FLIST_NEW=
 FLIST_UPDATE=  FLIST_UPDATE=
Line 302  MAKE Line 308  MAKE
 done  done
 echo "tns: $targets" >> $MKAKEFILE  echo "tns: $targets" >> $MKAKEFILE
   
make -f $MKAKEFILE#make -f $MKAKEFILE
 rm $MKAKEFILE  rm $MKAKEFILE
   
 # create html index  # create html index
 index=""  
 for file in $FLIST  
 do  
         tn="${file}.tn.jpg"  
         imglink="${file}.html"  
         index="$index $(html_tn $tn $imglink)"  
 done  
 echo create html index  echo create html index
 (  (
         html_header          html_header
        echo $index        startdate=
         test $ARG_STARTTS -ne -1 && startdate=$(date -r $ARG_STARTTS "+%d.%m.%Y")
         enddate=
         test $ARG_ENDTS -ne -1 && enddate=$(date -r $ARG_ENDTS "+%d.%m.%Y")
         date=
         test "$startdate" != "" && date="$startdate"
         test "$enddate" != "$startdate" && date="$date - $enddate"
 
         html_title "$ARG_TITLE" "$date"
         for file in $FLIST
         do
                 tn="${file}.tn.jpg"
                 imglink="${file}.html"
                 html_tn $tn $imglink
         done
         echo "<div class='clear'></div>"          echo "<div class='clear'></div>"
         echo "<div class='c'>$ARG_TITLE $ARG_COPYRIGHT</div>"          echo "<div class='c'>$ARG_TITLE $ARG_COPYRIGHT</div>"
         html_footer          html_footer
Removed from v.1.18  
changed lines
  Added in v.1.19