Update version number for release

[bpgallery.git] / bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 631582116c871e8a26e6cb4bd9bcb7db93288f4d..247e5a590fc126d4f5dc019e960980054c109fa9 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -17,9 +17,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

+set -e

 set -f
 
 set -f
 

-VERSION="1.0.2+arch"
+VERSION="1.1.0"

 
 function bpgallery_default_head() {
 cat <<END
 
 function bpgallery_default_head() {
 cat <<END


@@ -52,7 +53,7 @@ else
        caption_alt=$caption
 fi
 cat << END
        caption_alt=$caption
 fi
 cat << END

-<div class="thumbnail"><a href="$filename"><img src="icons/$filename" alt="$caption_alt" /></a><div class="caption">$caption</div></div>
+<div class="thumbnail"><a href="$link"><img src="icons/$filename" alt="$caption_alt" /></a><div class="caption">$caption</div></div>

 END
 }
 
 END
 }
 


@@ -90,6 +91,22 @@ div.caption {
        font-weight: bold;
 }
 
        font-weight: bold;
 }
 

+div.navigation {
+       margin: 0;
+}
+
+div.navigation ul {
+       display: inline;
+       margin: 0;
+       padding: 0;
+       text-align: center;
+}
+
+div.navigation ul li {
+       display: inline;
+       margin: 2em;
+}
+

 a {
        border: 0px;
 }
 a {
        border: 0px;
 }


@@ -102,6 +119,46 @@ END
 
 declare -rf bpgallery_default_stylesheet
 
 
 declare -rf bpgallery_default_stylesheet
 

+function bpgallery_default_page() {
+       $BPGALLERY_HEAD_FUNCTION
+
+       linkstart=""
+       linkend=""
+
+       if [[ ! -z $linklocation ]]; then
+               linkstart="<a href='$linklocation'>"
+               linkend="</a>"
+       fi
+       
+       cat <<END
+<h1>${caption}</h1>
+<div class="navigation">
+       <ul>
+               <li><a href='${INDEXDOCUMENT}'>Thumbnails</a></li>
+END
+       if [[ ! -z $previouspage ]]; then
+               $ECHOCOMMAND "<li><a href='${previouspage}'>Previous</a></li>"
+       else
+               $ECHOCOMMAND "<li>Previous</li>"
+       fi
+
+       if [[ ! -z $nextpage ]]; then
+               $ECHOCOMMAND "<li><a href='${nextpage}'>Next</a></li>"
+       else
+               $ECHOCOMMAND "<li>Next</li>"
+       fi
+cat <<END
+       </ul>
+</div>
+<div class="mainimage">
+       ${linkstart}<img src="${filename}" alt="${caption}" />${linkend}
+</div>
+END
+       $BPGALLERY_TAIL_FUNCTION
+}
+
+declare -rf bpgallery_default_page
+

 function bpgallery_escape_url() {
        temp=$1
        temp=${temp//\%/%25}
 function bpgallery_escape_url() {
        temp=$1
        temp=${temp//\%/%25}


@@ -150,7 +207,10 @@ if [[ -z ${BPGALLERY_THEME} ]]; then
        BPGALLERY_THEME=default
 fi
 
        BPGALLERY_THEME=default
 fi
 

-if [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then
+if [[ ! -z ${BPGALLERY_THEME_DIR} ]] && \
+       [[ -e ${BPGALLERY_THEME_DIR}/${BPGALLERY_THEME} ]]; then
+       . ${BPGALLERY_THEME_DIR}/${BPGALLERY_THEME} 2>/dev/null
+elif [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then

        . $HOME/.bpgallery.themes/${BPGALLERY_THEME} 2>/dev/null
 elif [[ -e /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then
        . /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} 2>/dev/null
        . $HOME/.bpgallery.themes/${BPGALLERY_THEME} 2>/dev/null
 elif [[ -e /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then
        . /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} 2>/dev/null


@@ -214,6 +274,32 @@ if [[ -z $CAPTIONHEIGHT ]]; then
        CAPTIONHEIGHT=75
 fi
 
        CAPTIONHEIGHT=75
 fi
 

+if [[ -z $OUTPUTHTML ]]; then
+       OUTPUTHTML=0
+fi
+
+if [[ -z $GENERATEPAGESFORFULLSIZE ]]; then
+       GENERATEPAGESFORFULLSIZE=0
+fi
+
+if [[ -z $GENERATEPAGESFORMEDIUMSIZE ]]; then
+       GENERATEPAGESFORMEDIUMSIZE=1
+fi
+
+if [[ -z $MEDIUMWIDTH ]]; then
+       MEDIUMWIDTH=400
+fi
+
+if [[ -z $INDEXDOCUMENT ]]; then
+       INDEXDOCUMENT=index.html
+fi
+
+if declare -F "bpgallery_${BPGALLERY_THEME}_page" > /dev/null ; then
+       BPGALLERY_PAGE_FUNCTION="bpgallery_${BPGALLERY_THEME}_page"
+else
+       BPGALLERY_PAGE_FUNCTION="bpgallery_default_page"
+fi
+

 if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /dev/null ; then
        BPGALLERY_HEAD_FUNCTION="bpgallery_${BPGALLERY_THEME}_head"
 else
 if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /dev/null ; then
        BPGALLERY_HEAD_FUNCTION="bpgallery_${BPGALLERY_THEME}_head"
 else


@@ -262,7 +348,39 @@ Usage:
         displays this help screen
     --version
         displays the version and exits
         displays this help screen
     --version
         displays the version and exits

-       
+
+This can also takes some environment variables, these will use defaults if not
+set.
+
+        TITLE
+            the title of the gallery
+
+        WIDTH
+            the width to make the icons
+
+        MEDIUMWIDTH
+            set the width of images in the medium size pages
+
+        BPGALLERY_THEME
+            set the theme to use (described below)
+
+        BPGALLERY_THEME_DIR
+            set an extra location to look for themes
+
+        OUTPUTHTML
+            sets the script output to be wrapped in a <pre> block
+
+        GENERATEPAGESFORMEDIUMSIZE
+            generate medium sized images and pages
+
+        GENERATEPAGESFORFULLSIZE
+            decide wether to generate pages for the full size images or not
+
+        INDEXDOCUMENT
+            name of the index page (e.g. index.html)
+
+Example:
+       TITLE="My Funky Gallery" WIDTH=200 INDEXDOCUMENT="welcome.html" GENERATEPAGESFORFULLSIZE=1 GENERATEPAGESFORMEDIUMSIZE=1 MEDIUMWIDTH=400 $0 /path/to/image/folder

 END
 }
 
 END
 }
 


@@ -272,26 +390,173 @@ Version: $VERSION
 END
 }
 
 END
 }
 

-function generate_thumbs() {
-       $ECHOCOMMAND "Generating Thumbnails"
+function generate_resized_images() {
+       $ECHOCOMMAND "Generating $2"

        currentimage=0
        currentimage=0

-       totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | $WCCOMMAND);
-       imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do filename=${filename//\"/\\\"}; if [ ! -r "icons/$filename" ] || [ "$filename" -nt "icons/$filename" ] || [ $($IDENTIFYCOMMAND -format "%w" "icons/$filename") -ne $WIDTH ]; then $ECHOCOMMAND $filename; fi; done | $WCCOMMAND)
+       totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | $WCCOMMAND);
+       imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | while read filename; do filename=${filename//\"/\\\"}; if [ ! -r "$2/$filename" ] || [ "$filename" -nt "$2/$filename" ] || [ $($IDENTIFYCOMMAND -format "%w" "$2/$filename") -ne $1 ]; then $ECHOCOMMAND $filename; fi; done | $WCCOMMAND)

        
        

+       if [ $totalimages -eq 0 ]; then
+               # might as well exit at this point - there are no pictures
+               $ECHOCOMMAND "No images for the gallery - exiting."
+               exit 64
+       else
+               # check if the directory exists and create it other wise
+               if [ ! -d $2 ]; then
+                       mkdir $2
+               fi
+
+               if [ ! -w $2 ]; then
+                       $ECHOCOMMAND "Can't write to $2 directory, exiting"
+                       exit 16
+               fi
+       fi
+

        if [ $totalimages -eq $imagestoupdate ]; then
        if [ $totalimages -eq $imagestoupdate ]; then

-               $ECHOCOMMAND "Regenerating all thumbnails"
+               $ECHOCOMMAND "Regenerating all $2"

        elif [ $imagestoupdate -eq 0 ]; then
        elif [ $imagestoupdate -eq 0 ]; then

-               $ECHOCOMMAND "No Updated Thumbs, not regenerating"
+               $ECHOCOMMAND "No Updated $2, not regenerating"

                return
        else
                return
        else

-               $ECHOCOMMAND "Generating $imagestoupdate of $totalimages thumbnails"
+               $ECHOCOMMAND "Generating $imagestoupdate of $totalimages $2"

        fi
        
        fi
        

-       $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do tempfilename=${filename//\"/\\\"/}; if [ ! -r "icons/$tempfilename" ] || [ "$tempfilename" -nt "icons/$tempfilename" ] || [ $($IDENTIFYCOMMAND -format "%w" "icons/$filename") -ne $WIDTH ]; then $ECHOCOMMAND -n $filename; $ECHOCOMMAND -n -e "\000"; fi; done | $XARGSCOMMAND -0 --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$imagestoupdate images; currentimage=$((currentimage+1)); done
+       $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | while read filename; do tempfilename=${filename//\"/\\\"/}; if [ ! -r "$2/$tempfilename" ] || [ "$tempfilename" -nt "$2/$tempfilename" ] || [ $($IDENTIFYCOMMAND -format "%w" "$2/$filename") -ne $1 ]; then $ECHOCOMMAND -n $filename; $ECHOCOMMAND -n -e "\000"; fi; done | $XARGSCOMMAND -0 --verbose --max-procs=4 -I {} $CONVERTTOOL -resize $1 '{}' $2/'{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$imagestoupdate images; currentimage=$((currentimage+1)); done

        $ECHOCOMMAND done: $imagestoupdate/$imagestoupdate images
        $ECHOCOMMAND done: $imagestoupdate/$imagestoupdate images

-       $ECHOCOMMAND "Completed generating thumbs for $totalimages images"
+       $ECHOCOMMAND "Completed generating $2 for $totalimages images"
+}
+
+function generate_thumbs() {
+       generate_resized_images $WIDTH icons

 }
 
 }
 

+function generate_medium() {
+       generate_resized_images $MEDIUMWIDTH medium
+}
+
+function generate_pages() {
+       $ECHOCOMMAND "Generating Pages"
+       previouspage=""
+       currentpage=""
+       nextpage=""
+       previousimage=""
+       currentimage=""
+       nextimage=""
+       extra=""
+       extradir=""
+       addlinks=0
+       
+       if [ ! -z $1 ]; then
+               extra=$1
+       fi
+
+       if [ ! -z $2 ]; then
+               extradir=$2/
+               addlinks=1
+       fi
+
+       if [ -z $2 ] && [[ $GENERATEPAGESFORMEDIUMSIZE != 0 ]]; then
+               addlinks=2
+       fi
+       
+       $FINDCOMMAND . $FINDIMAGESOPTIONS | \
+       $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | \
+       $SORTCOMMAND -g | \
+       while read imagefilename; do
+               previousimage=$currentimage
+               currentimage=$nextimage
+               nextimage=${imagefilename#./}
+               addlink=""
+               
+               if [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then
+                       if [[ $addlinks == 1 ]]; then
+                               addlink=${currentimage}.html
+                       else
+                               addlink=${currentimage}${extra}.html
+                       fi
+               else
+                       addlink=${currentimage}
+               fi
+
+               previouspage=$currentpage
+               currentpage=$nextpage
+               if [[ $addlinks == 1 ]]; then
+                       nextpage=${nextimage}${extra}.html
+               else
+                       nextpage=${nextimage}.html
+               fi
+               filename=${extradir}${currentimage}
+               echo "'$previouspage' '$currentpage' '$nextpage' '$addlink'" >> /tmp/bpgallery-tmp.log
+               if [ "x$currentpage" != "x" ]; then
+                       generate_general_page "$previouspage" "$currentpage" "$nextpage" $addlink
+               fi
+               $ECHOCOMMAND $nextimage
+       done | tail -n 2 | (
+               read previouspage
+               read currentpage
+               addlink=""
+
+               if [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then
+                       if [[ $addlinks == 1 ]]; then
+                               addlink=${currentpage}.html
+                       else
+                               addlink=${currentpage}${extra}.html
+                       fi
+               else
+                       addlink=${currentpage}
+               fi
+
+               filename=${extradir}${currentpage}
+               if [[ $addlinks == 1 ]]; then
+                       currentpage=${currentpage}${extra}.html
+                       previouspage=${previouspage}${extra}.html
+               else
+                       currentpage=${currentpage}.html
+                       previouspage=${previouspage}.html
+               fi
+               nextpage=""
+               generate_general_page "$previouspage" "$currentpage" "" $addlink
+       )
+}
+
+function generate_medium_pages() {
+       generate_pages __medium medium
+}
+
+function generate_general_page() {
+
+       echo 'Generating the page...' >> /tmp/bpgallery-tmp.log
+
+       if [[ -z $1 ]]; then
+               previouspage=""
+       fi
+
+       if [[ -z $2 ]]; then
+               currentpage=""
+               return
+       fi
+
+       if [[ -z $3 ]]; then
+               nextpage=""
+       fi
+
+       if [[ ! -z $4 ]]; then
+               linklocation=$4
+       fi
+
+       if [ -r captions.txt ]; then
+               caption=$($GREPCOMMAND -E "^${filename}   " captions.txt); caption=${caption#*    }
+       else
+               caption=""
+       fi
+       
+       $BPGALLERY_PAGE_FUNCTION > "$currentpage"
+}
+
+if [[ $OUTPUTHTML != 0 ]]; then
+       $ECHOCOMMAND "<pre>"
+fi
+

 if [[ -z $1 ]]; then
        $ECHOCOMMAND "No path given"
        usage
 if [[ -z $1 ]]; then
        $ECHOCOMMAND "No path given"
        usage


@@ -321,12 +586,36 @@ if ( ! $FINDCOMMAND . $FINDIMAGESOPTIONS > /dev/null 2>/dev/null ); then
        exit 4
 fi
 
        exit 4
 fi
 

-if [ ! -d icons ]; then
-       mkdir icons
+if [ ! -w . ]; then
+       $ECHOCOMMAND "Can't write to images directory, exiting"
+       exit 8
+fi
+
+if [ -e ${INDEXDOCUMENT} ] && [ ! -w ${INDEXDOCUMENT} ]; then
+       $ECHOCOMMAND "Can't write ${INDEXDOCUMENT}, exiting"
+       exit 8
+fi
+
+if [ -e style.css ] && [ ! -w style.css ]; then
+       $ECHOCOMMAND "Can't write style.css, exiting"
+       exit 8

 fi
 
 generate_thumbs
 
 fi
 
 generate_thumbs
 

+if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
+       generate_medium
+       generate_medium_pages
+fi
+
+if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then
+       if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
+               generate_pages __medium
+       else
+               generate_pages
+       fi
+fi
+

 if [ -r description.txt ] ; then
        DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/<p>/; }; /^$/ { s,$,</p><p>,; }; $ { s,$,</p>, };' description.txt)
 else
 if [ -r description.txt ] ; then
        DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/<p>/; }; /^$/ { s,$,</p><p>,; }; $ { s,$,</p>, };' description.txt)
 else


@@ -336,14 +625,19 @@ fi
 
 $ECHOCOMMAND "Starting to generate page"
 
 
 $ECHOCOMMAND "Starting to generate page"
 

-$BPGALLERY_HEAD_FUNCTION > index.html
-$BPGALLERY_DESCRIPTION_FUNCTION >> index.html
+$BPGALLERY_HEAD_FUNCTION > ${INDEXDOCUMENT}
+$BPGALLERY_DESCRIPTION_FUNCTION >> ${INDEXDOCUMENT}

 
 $ECHOCOMMAND "Adding Captions"
 
 
 $ECHOCOMMAND "Adding Captions"
 

-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; if [ -r captions.txt ]; then caption=$($GREPCOMMAND -E "^$filename  " captions.txt); caption=${caption#*    }; else caption=""; fi; filename=$(bpgallery_escape_url "$filename"); $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html
+extra=""
+if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
+       extra=__medium
+fi
+
+$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | $SORTCOMMAND -g | while read filename; do filename=${filename#./}; if [ -r captions.txt ]; then caption=$($GREPCOMMAND -E "^$filename     " captions.txt); caption=${caption#*    }; else caption=""; fi; if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then link=$(bpgallery_escape_url "${filename}${extra}.html"); elif [ $GENERATEPAGESFORFULLSIZE != 0 ]; then link=$(bpgallery_escape_url "${filename}.html"); else link=$(bpgallery_escape_url "$filename"); fi; filename=$(bpgallery_escape_url "$filename"); $BPGALLERY_THUMBSLINE_FUNCTION; done >> ${INDEXDOCUMENT}

 
 

-$BPGALLERY_TAIL_FUNCTION >> index.html
+$BPGALLERY_TAIL_FUNCTION >> ${INDEXDOCUMENT}

 
 $ECHOCOMMAND "Finished generating the page"
 $ECHOCOMMAND "Generating stylesheet"
 
 $ECHOCOMMAND "Finished generating the page"
 $ECHOCOMMAND "Generating stylesheet"


@@ -360,3 +654,7 @@ MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
 $ECHOCOMMAND "All done"
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
 $ECHOCOMMAND "All done"

+
+if [[ $OUTPUTHTML != 0 ]]; then
+       $ECHOCOMMAND "</pre>"
+fi