]> git.sommitrealweird.co.uk Git - bpgallery.git/blobdiff - bpgallery.sh
projects / bpgallery.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix index page generation code
[bpgallery.git] / bpgallery.sh
diff --git a/bpgallery.sh b/bpgallery.sh
index f8605d6f5dc2c8176f59f4a1e424df42928fe090..d98805fca0ffc237afe89510c9cfbe5b52513c93 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.3"
+VERSION="1.1+arch"
 
 function bpgallery_default_head() {
 cat <<END
 
 function bpgallery_default_head() {
 cat <<END
@@ -91,14 +92,13 @@ div.caption {
 }
 
 div.navigation {
 }
 
 div.navigation {
-       width: 100%;
-       margin: 2em;
-       text-align: center;
+       margin: 0;
 }
 
 div.navigation ul {
 }
 
 div.navigation ul {
-       width: 100%;
        display: inline;
        display: inline;
+       margin: 0;
+       padding: 0;
        text-align: center;
 }
 
        text-align: center;
 }
 
@@ -121,28 +121,37 @@ declare -rf bpgallery_default_stylesheet
 
 function bpgallery_default_page() {
        $BPGALLERY_HEAD_FUNCTION
 
 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>
        cat <<END
 <h1>${caption}</h1>
 <div class="navigation">
        <ul>
-               <li><a href='index.html'>Thumbnails</a></li>
+               <li><a href='${INDEXDOCUMENT}'>Thumbnails</a></li>
 END
        if [[ ! -z $previouspage ]]; then
 END
        if [[ ! -z $previouspage ]]; then
-               echo "<li><a href='${previouspage}'>Previous</a></li>"
+               $ECHOCOMMAND "<li><a href='${previouspage}'>Previous</a></li>"
        else
        else
-               echo "<li>Previous</li>"
+               $ECHOCOMMAND "<li>Previous</li>"
        fi
 
        if [[ ! -z $nextpage ]]; then
        fi
 
        if [[ ! -z $nextpage ]]; then
-               echo "<li><a href='${nextpage}'>Next</a></li>"
+               $ECHOCOMMAND "<li><a href='${nextpage}'>Next</a></li>"
        else
        else
-               echo "<li>Next</li>"
+               $ECHOCOMMAND "<li>Next</li>"
        fi
 cat <<END
        </ul>
 </div>
 <div class="mainimage">
        fi
 cat <<END
        </ul>
 </div>
 <div class="mainimage">
-       <img src="${filename}" alt="${caption}" />
+       ${linkstart}<img src="${filename}" alt="${caption}" />${linkend}
 </div>
 END
        $BPGALLERY_TAIL_FUNCTION
 </div>
 END
        $BPGALLERY_TAIL_FUNCTION
@@ -273,6 +282,18 @@ if [[ -z $GENERATEPAGESFORFULLSIZE ]]; then
        GENERATEPAGESFORFULLSIZE=0
 fi
 
        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 [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then
        if declare -F "bpgallery_${BPGALLERY_THEME}_page" > /dev/null ; then
                BPGALLERY_PAGE_FUNCTION="bpgallery_${BPGALLERY_THEME}_page"
 if [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then
        if declare -F "bpgallery_${BPGALLERY_THEME}_page" > /dev/null ; then
                BPGALLERY_PAGE_FUNCTION="bpgallery_${BPGALLERY_THEME}_page"
@@ -329,7 +350,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
 }
 
@@ -339,24 +392,48 @@ 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() {
 }
 
 function generate_pages() {
@@ -367,32 +444,87 @@ function generate_pages() {
        previousimage=""
        currentimage=""
        nextimage=""
        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 | \
        $FINDCOMMAND . $FINDIMAGESOPTIONS | \
-       $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | \
+       $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | \
        $SORTCOMMAND -g | \
        while read imagefilename; do
                previousimage=$currentimage
                currentimage=$nextimage
        $SORTCOMMAND -g | \
        while read imagefilename; do
                previousimage=$currentimage
                currentimage=$nextimage
-               nextimage=$imagefilename
+               nextimage=${imagefilename#./}
+               addlink=""
+               
+               if [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then
+                       addlink=${currentimage}${extra}.html
+               else
+                       addlink=${currentimage}
+               fi
+
+               if [[ $addlinks == 1 ]]; then
+                       addlink=${currentimage}.html
+               else
+                       addlink=${currentimage}${extra}.html
+               fi
+
                previouspage=$currentpage
                currentpage=$nextpage
                previouspage=$currentpage
                currentpage=$nextpage
-               nextpage=${imagefilename}.html
-               filename=${currentimage}
-               generate_general_page "$previouspage" "$currentpage" "$nextpage"
-               echo $nextimage
+               if [[ $addlinks == 1 ]]; then
+                       nextpage=${nextimage}${extra}.html
+               else
+                       nextpage=${nextimage}.html
+               fi
+               filename=${extradir}${currentimage}
+               generate_general_page "$previouspage" "$currentpage" "$nextpage" $addlink
+               $ECHOCOMMAND $nextimage
        done | tail -n 2 | (
                read previouspage
                read currentpage
        done | tail -n 2 | (
                read previouspage
                read currentpage
-               filename=${currentpage}
-               currentpage=${currentpage}.html
-               previouspage=${previouspage}.html
+               addlink=""
+
+               if [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then
+                       addlink=${currentpage}.html
+               else
+                       addlink=${currentpage}
+               fi
+
+               if [[ $addlinks == 1 ]]; then
+                       addlink=${currentpage}.html
+               else
+                       addlink=${currentpage}${extra}.html
+               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=""
                nextpage=""
-               generate_general_page "$previouspage" "$currentpage" ""
+               generate_general_page "$previouspage" "$currentpage" "" $addlink
        )
 }
 
        )
 }
 
-
+function generate_medium_pages() {
+       generate_pages __medium medium
+}
 
 function generate_general_page() {
 
 
 function generate_general_page() {
 
@@ -409,13 +541,17 @@ function generate_general_page() {
                nextpage=""
        fi
 
                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
        if [ -r captions.txt ]; then
                caption=$($GREPCOMMAND -E "^${filename}   " captions.txt); caption=${caption#*    }
        else
                caption=""
        fi
-
-       $BPGALLERY_PAGE_FUNCTION > $currentpage
+       
+       $BPGALLERY_PAGE_FUNCTION > "$currentpage"
 }
 
 if [[ $OUTPUTHTML != 0 ]]; then
 }
 
 if [[ $OUTPUTHTML != 0 ]]; then
@@ -456,8 +592,8 @@ if [ ! -w . ]; then
        exit 8
 fi
 
        exit 8
 fi
 
-if [ -e index.html ] && [ ! -w index.html ]; then
-       $ECHOCOMMAND "Can't write index.html, exiting"
+if [ -e ${INDEXDOCUMENT} ] && [ ! -w ${INDEXDOCUMENT} ]; then
+       $ECHOCOMMAND "Can't write ${INDEXDOCUMENT}, exiting"
        exit 8
 fi
 
        exit 8
 fi
 
@@ -466,19 +602,19 @@ if [ -e style.css ] && [ ! -w style.css ]; then
        exit 8
 fi
 
        exit 8
 fi
 
-if [ ! -d icons ]; then
-       mkdir icons
-fi
+generate_thumbs
 
 
-if [ ! -w icons ]; then
-       $ECHOCOMMAND "Can't write to icons directory, exiting"
-       exit 16
+if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
+       generate_medium
+       generate_medium_pages
 fi
 
 fi
 
-generate_thumbs
-
 if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then
 if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then
-       generate_pages
+       if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
+               generate_pages __medium
+       else
+               generate_pages
+       fi
 fi
 
 if [ -r description.txt ] ; then
 fi
 
 if [ -r description.txt ] ; then
@@ -490,14 +626,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; if [ $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 >> 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"
A simple gallery script in bash