]> 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
* Add support for bounding box based image resize
[bpgallery.git] / bpgallery.sh
diff --git a/bpgallery.sh b/bpgallery.sh
index 50c3b72b0a6d5a5fcf5e5ab7c6b920fb54d2b371..ade52a50b24560969197a672a272c720d5582f56 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -19,7 +19,7 @@
 
 set -f
 
 
 set -f
 
-VERSION="1.1.0"
+VERSION="1.1.1+arch"
 
 function bpgallery_default_head() {
 cat <<END
 
 function bpgallery_default_head() {
 cat <<END
@@ -28,7 +28,7 @@ cat <<END
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
        <title>${TITLE}</title>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
        <title>${TITLE}</title>
-       <link rel="stylesheet" href="style.css" type="text/css" />
+       <link rel="stylesheet" href="${BASEURL}style.css" type="text/css" />
 </head>
 <body>
 END
 </head>
 <body>
 END
@@ -52,7 +52,7 @@ else
        caption_alt=$caption
 fi
 cat << END
        caption_alt=$caption
 fi
 cat << END
-<div class="thumbnail"><a href="$link"><img src="icons/$filename" alt="$caption_alt" /></a><div class="caption">$caption</div></div>
+<div class="thumbnail"><a href="$link"><img src="${ICONSDIRECTORY}/$filename" alt="$caption_alt" /></a><div class="caption">$caption</div></div>
 END
 }
 
 END
 }
 
@@ -133,7 +133,7 @@ function bpgallery_default_page() {
 <h1>${caption}</h1>
 <div class="navigation">
        <ul>
 <h1>${caption}</h1>
 <div class="navigation">
        <ul>
-               <li><a href='${INDEXDOCUMENT}'>Thumbnails</a></li>
+               <li><a href='${BASEURL}${INDEXDOCUMENT}'>Thumbnails</a></li>
 END
        if [[ ! -z $previouspage ]]; then
                $ECHOCOMMAND "<li><a href='${previouspage}'>Previous</a></li>"
 END
        if [[ ! -z $previouspage ]]; then
                $ECHOCOMMAND "<li><a href='${previouspage}'>Previous</a></li>"
@@ -176,6 +176,24 @@ function bpgallery_escape_url() {
        $ECHOCOMMAND $temp
 }
 
        $ECHOCOMMAND $temp
 }
 
+function bpgallery_cleanup_directory_name() {
+       temp=$1
+       temp=${temp//\%/_}
+       temp=${temp//:/_}
+       temp=${temp//;/_}
+       temp=${temp// /_}
+       temp=${temp//$/_}
+       temp=${temp//&/_}
+       temp=${temp//+/_}
+       temp=${temp//,/_}
+       temp=${temp//\//_}
+       temp=${temp//=/_}
+       temp=${temp//\?/_}
+       temp=${temp//@/_}
+       temp=${temp//\"/_}
+       $ECHOCOMMAND $temp
+}
+
 declare -rf bpgallery_escape_url
 
 if [[ ! -z ${BPGALLERY_THEME} ]] ; then
 declare -rf bpgallery_escape_url
 
 if [[ ! -z ${BPGALLERY_THEME} ]] ; then
@@ -222,39 +240,140 @@ if [[ -z $TITLE ]]; then
 fi
 
 if [[ -z $CONVERTTOOL ]]; then
 fi
 
 if [[ -z $CONVERTTOOL ]]; then
-       CONVERTTOOL=convert
+       hash convert
+       if [[ $? != 0 ]]; then
+               echo "Can't find convert, exiting"
+               exit 3
+       fi
+       CONVERTTOOL=$(hash -t convert)
+else
+       if [[ ! -x $CONVERTTOOL ]]; then
+               echo "Can't find convert at location $CONVERTTOOL, exiting"
+               exit 3
+       fi
 fi
 
 if [[ -z $FINDCOMMAND ]]; then
 fi
 
 if [[ -z $FINDCOMMAND ]]; then
-       FINDCOMMAND=find
+       hash find
+       if [[ $? != 0 ]]; then
+               echo "Can't find find, exiting"
+               exit 3
+       fi
+       FINDCOMMAND=$(hash -t find)
+else
+       if [[ ! -x $FINDCOMMAND ]]; then
+               echo "Can't find find at $FINDCOMMAND, exiting"
+               exit 3
+       fi
 fi
 
 if [[ -z $XARGSCOMMAND ]]; then
 fi
 
 if [[ -z $XARGSCOMMAND ]]; then
-       XARGSCOMMAND=xargs
+       hash xargs
+       if [[ $? != 0 ]]; then
+               echo "Can't find xargs, exiting"
+               exit 3
+       fi
+       XARGSCOMMAND=$(hash -t xargs)
+else
+       if [[ ! -x $XARGSCOMMAND ]]; then
+               echo "Can't find xargs at $XARGSCOMMAND, exiting"
+               exit 3
+       fi
 fi
 
 if [[ -z $ECHOCOMMAND ]]; then
        ECHOCOMMAND=echo
 fi
 
 if [[ -z $ECHOCOMMAND ]]; then
        ECHOCOMMAND=echo
+else
+       if [[ ! -x $ECHOCOMMAND ]]; then
+               echo "Can't find echo at $ECHOCOMMAND, exiting"
+               exit 3
+       fi
 fi
 
 if [[ -z $SORTCOMMAND ]]; then
 fi
 
 if [[ -z $SORTCOMMAND ]]; then
-       SORTCOMMAND=sort
+       hash sort
+       if [[ $? != 0 ]]; then
+               echo "Can't find sort, exiting"
+               exit 3
+       fi
+       SORTCOMMAND=$(hash -t sort)
+else
+       if [[ ! -x $SORTCOMMAND ]]; then
+               echo "Can't find sort, exiting"
+               exit 3
+       fi
 fi
 
 if [[ -z $IDENTIFYCOMMAND ]]; then
 fi
 
 if [[ -z $IDENTIFYCOMMAND ]]; then
-       IDENTIFYCOMMAND=identify
+       hash identify
+       if [[ $? != 0 ]]; then
+               echo "Can't find indentify, exiting"
+               exit 3
+       fi
+       IDENTIFYCOMMAND=$(hash -t identify)
+else
+       if [[ ! -x $IDENTIFYCOMMAND ]]; then
+               echo "Can't find identify at $IDENTIFYCOMMAND, exiting"
+               exit 3
+       fi
 fi
 
 if [[ -z $HEADCOMMAND ]]; then
 fi
 
 if [[ -z $HEADCOMMAND ]]; then
-       HEADCOMMAND=head
+       hash head
+       if [[ $? != 0 ]]; then
+               echo "Can't find head, exiting"
+               exit 3
+       fi
+       HEADCOMMAND=$(hash -t head)
+else
+       if [[ ! -x $HEADCOMMAND ]]; then
+               echo "Can't find head at $HEADCOMMAND, exiting"
+               exit 3
+       fi
 fi
 
 if [[ -z $GREPCOMMAND ]]; then
 fi
 
 if [[ -z $GREPCOMMAND ]]; then
-       GREPCOMMAND=grep
+       hash grep
+       if [[ $? != 0 ]]; then
+               echo "Can't find grep, exiting"
+               exit 3
+       fi
+       GREPCOMMAND=$(hash -t grep)
+else
+       if [[ ! -x $GREPCOMMAND ]]; then
+               echo "Can't find grep at $GREPCOMMAND, exiting"
+               exit 3
+       fi
 fi
 
 if [[ -z $SEDCOMMAND ]]; then
 fi
 
 if [[ -z $SEDCOMMAND ]]; then
-       SEDCOMMAND=sed
+       hash sed
+       if [[ $? != 0 ]]; then
+               echo "Can't find sed, exiting"
+               exit 3
+       fi
+       SEDCOMMAND=$(hash -t sed)
+else
+       if [[ ! -x $SEDCOMMAND ]]; then
+               echo "Can't find sed at $SEDCOMMAND, exiting"
+               exit 3
+       fi
+fi
+
+if [[ -z $WCCOMMAND ]]; then
+       hash wc
+       if [[ $? != 0 ]]; then
+               echo "Can't find wc, exiting"
+               exit 3
+       fi
+       WCCOMMAND=$(hash -t wc)
+       WCCOMMAND="$WCCOMMAND -l"
+else
+       if [[ ! -x $WCCOMMAND ]]; then
+               echo "Can't find wc at $WCCOMMAND, exiting"
+               exit 3
+       fi
+       WCCOMMAND="$WCCOMMAND -l"
 fi
 
 if [[ -z $WIDTH ]]; then
 fi
 
 if [[ -z $WIDTH ]]; then
@@ -265,10 +384,6 @@ if [[ -z $IMAGEEXTENSIONS ]]; then
        IMAGEEXTENSIONS="jpeg jpg gif png";
 fi
 
        IMAGEEXTENSIONS="jpeg jpg gif png";
 fi
 
-if [[ -z $WCCOMMAND ]]; then
-       WCCOMMAND="wc -l"
-fi
-
 if [[ -z $CAPTIONHEIGHT ]]; then
        CAPTIONHEIGHT=75
 fi
 if [[ -z $CAPTIONHEIGHT ]]; then
        CAPTIONHEIGHT=75
 fi
@@ -285,6 +400,18 @@ if [[ -z $GENERATEPAGESFORMEDIUMSIZE ]]; then
        GENERATEPAGESFORMEDIUMSIZE=1
 fi
 
        GENERATEPAGESFORMEDIUMSIZE=1
 fi
 
+if [[ -z $PAGESDIRECTORY ]]; then
+       PAGESDIRECTORY=""
+else
+       removetrailingslashes=${PAGESDIRECTORY%/}
+       temp=$removetrailingslashes
+       while [[ $removetrailingslashes != $temp ]]; do
+               temp=$removetrailingslashes
+               removetrailingslashes=${temp%/}
+       done
+       PAGESDIRECTORY=$(bpgallery_escape_url "${PAGESDIRECTORY}")
+fi
+
 if [[ -z $MEDIUMWIDTH ]]; then
        MEDIUMWIDTH=400
 fi
 if [[ -z $MEDIUMWIDTH ]]; then
        MEDIUMWIDTH=400
 fi
@@ -293,6 +420,20 @@ if [[ -z $INDEXDOCUMENT ]]; then
        INDEXDOCUMENT=index.html
 fi
 
        INDEXDOCUMENT=index.html
 fi
 
+if [[ -z $MEDIUMDIRECTORY ]]; then
+       MEDIUMDIRECTORY=medium
+else
+       # Strip out anything that might be broken
+       MEDIUMDIRECTORY=$(bpgallery_cleanup_directory_name "$MEDIUMDIRECTORY")
+fi
+
+if [[ -z $ICONSDIRECTORY ]]; then
+       ICONSDIRECTORY=icons
+else
+       # Strip out anything that might be broken
+       ICONSDIRECTORY=$(bpgallery_cleanup_directory_name "$ICONSDIRECTORY")
+fi
+
 if declare -F "bpgallery_${BPGALLERY_THEME}_page" > /dev/null ; then
        BPGALLERY_PAGE_FUNCTION="bpgallery_${BPGALLERY_THEME}_page"
 else
 if declare -F "bpgallery_${BPGALLERY_THEME}_page" > /dev/null ; then
        BPGALLERY_PAGE_FUNCTION="bpgallery_${BPGALLERY_THEME}_page"
 else
@@ -426,11 +567,19 @@ function generate_resized_images() {
 }
 
 function generate_thumbs() {
 }
 
 function generate_thumbs() {
-       generate_resized_images $WIDTH icons
+       if [[ ! -z $HEIGHT ]]; then
+               generate_resized_images "${WIDTH}x${HEIGHT}" $ICONSDIRECTORY
+       else
+       generate_resized_images $WIDTH $ICONSDIRECTORY
+       fi
 }
 
 function generate_medium() {
 }
 
 function generate_medium() {
-       generate_resized_images $MEDIUMWIDTH medium
+       if [[ ! -z $MEDIUMHEIGHT ]]; then
+               generate_resized_images "${WIDTH}x${HEIGHT}" $MEDIUMDIRECTORY
+       else
+               generate_resized_images $MEDIUMWIDTH $MEDIUMDIRECTORY
+       fi
 }
 
 function generate_pages() {
 }
 
 function generate_pages() {
@@ -484,7 +633,12 @@ function generate_pages() {
                else
                        nextpage=${nextimage}.html
                fi
                else
                        nextpage=${nextimage}.html
                fi
-               filename=${extradir}${currentimage}
+
+               if [[ "x$PAGESDIRECTORY" != "x" ]]; then
+                       filename=../${extradir}${currentimage}
+               else
+                       filename=${extradir}${currentimage}
+               fi
                if [ "x$currentpage" != "x" ]; then
                        generate_general_page "$previouspage" "$currentpage" "$nextpage" $addlink
                fi
                if [ "x$currentpage" != "x" ]; then
                        generate_general_page "$previouspage" "$currentpage" "$nextpage" $addlink
                fi
@@ -503,8 +657,12 @@ function generate_pages() {
                else
                        addlink=${currentpage}
                fi
                else
                        addlink=${currentpage}
                fi
-
-               filename=${extradir}${currentpage}
+               
+               if [[ "x$PAGESDIRECTORY" != "x" ]]; then
+                       filename=../${extradir}${currentpage}
+               else
+                       filename=${extradir}${currentpage}
+               fi
                if [[ $addlinks == 1 ]]; then
                        currentpage=${currentpage}${extra}.html
                        previouspage=${previouspage}${extra}.html
                if [[ $addlinks == 1 ]]; then
                        currentpage=${currentpage}${extra}.html
                        previouspage=${previouspage}${extra}.html
@@ -518,7 +676,7 @@ function generate_pages() {
 }
 
 function generate_medium_pages() {
 }
 
 function generate_medium_pages() {
-       generate_pages __medium medium
+       generate_pages __${MEDIUMDIRECTORY} ${MEDIUMDIRECTORY}
 }
 
 function generate_general_page() {
 }
 
 function generate_general_page() {
@@ -547,7 +705,7 @@ function generate_general_page() {
                caption=""
        fi
        
                caption=""
        fi
        
-       $BPGALLERY_PAGE_FUNCTION > "$currentpage"
+       $BPGALLERY_PAGE_FUNCTION > "${UNIXPAGESDIRECTORY}$currentpage"
 }
 
 if [[ $OUTPUTHTML != 0 ]]; then
 }
 
 if [[ $OUTPUTHTML != 0 ]]; then
@@ -600,6 +758,24 @@ fi
 
 generate_thumbs
 
 
 generate_thumbs
 
+if [[ "x$PAGESDIRECTORY" != "x" ]]; then
+       if [ ! -d $PAGESDIRECTORY ]; then
+               mkdir -p $PAGESDIRECTORY
+       fi
+
+       if [ ! -w $PAGESDIRECTORY ]; then
+               $ECHOCOMMAND "Can't write to $PAGESDIRECTORY directory, exiting"
+               exit 16
+       fi
+       UNIXPAGESDIRECTORY=$PAGESDIRECTORY/     
+       PAGESDIRECTORY=$(bpgallery_escape_url $PAGESDIRECTORY)/
+
+       BASEURL="../"
+else
+       BASEURL=""
+       UNIXPAGESDIRECTORY=""
+fi
+
 if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
        generate_medium
        generate_medium_pages
 if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
        generate_medium
        generate_medium_pages
@@ -607,7 +783,7 @@ fi
 
 if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then
        if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
 
 if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then
        if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
-               generate_pages __medium
+               generate_pages __${MEDIUMDIRECTORY}
        else
                generate_pages
        fi
        else
                generate_pages
        fi
@@ -619,6 +795,7 @@ else
        DESCRIPTION=""
 fi
 
        DESCRIPTION=""
 fi
 
+BASEURL=""
 
 $ECHOCOMMAND "Starting to generate page"
 
 
 $ECHOCOMMAND "Starting to generate page"
 
@@ -629,16 +806,16 @@ $ECHOCOMMAND "Adding Captions"
 
 extra=""
 if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
 
 extra=""
 if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
-       extra=__medium
+       extra=__${MEDIUMDIRECTORY}
 fi
 
 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}
+$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=${PAGESDIRECTORY}$(bpgallery_escape_url "${filename}${extra}.html"); elif [ $GENERATEPAGESFORFULLSIZE != 0 ]; then link=${PAGESDIRECTORY}$(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 >> ${INDEXDOCUMENT}
 
 $ECHOCOMMAND "Finished generating the page"
 $ECHOCOMMAND "Generating stylesheet"
 
 $BPGALLERY_TAIL_FUNCTION >> ${INDEXDOCUMENT}
 
 $ECHOCOMMAND "Finished generating the page"
 $ECHOCOMMAND "Generating stylesheet"
-cd icons
+cd $ICONSDIRECTORY
 
 MAXHEIGHT=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%h\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
 MAXWIDTH=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%w\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
 
 MAXHEIGHT=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%h\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
 MAXWIDTH=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%w\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
A simple gallery script in bash