Escape image src and href URLs

[bpgallery.git] / bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 7a6f9d255e336d0cbf6333cc0a42bda798221003..ba71cc7edab3cefd248a2fedf758434f41b0ae22 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -19,7 +19,7 @@
 
 set -f
 
 
 set -f
 

-VERSION="0.9.2"
+VERSION="1.0.0+arch"

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


@@ -34,12 +34,25 @@ cat <<END
 END
 }
 
 END
 }
 

+declare -rf bpgallery_default_head
+
+function bpgallery_default_description() {
+cat <<END
+       <h1>${TITLE}</h1>
+       ${DESCRIPTION}
+END
+}
+
+declare -rf bpgallery_default_description
+

 function bpgallery_default_thumbsline() {
 cat << END
 function bpgallery_default_thumbsline() {
 cat << END

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

 END
 }
 
 END
 }
 

+declare -rf bpgallery_default_thumbsline
+

 function bpgallery_default_tail() {
 cat << END
 </body>
 function bpgallery_default_tail() {
 cat << END
 </body>


@@ -47,13 +60,15 @@ cat << END
 END
 }
 
 END
 }
 

+declare -rf bpgallery_default_tail
+

 function bpgallery_default_stylesheet() {
 cat <<END
 body {
         background: white;
         color: black;
         font-family: sans-serif;
 function bpgallery_default_stylesheet() {
 cat <<END
 body {
         background: white;
         color: black;
         font-family: sans-serif;

-        font-size: 12pt;
+        font-size: 10pt;

 }
 
 div.thumbnail {
 }
 
 div.thumbnail {


@@ -64,6 +79,12 @@ div.thumbnail {
         height: ${MAXHEIGHT}px;
 }
 
         height: ${MAXHEIGHT}px;
 }
 

+div.caption {
+       width: 100%;
+       text-align: center;
+       font-weight: bold;
+}
+

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


@@ -74,6 +95,60 @@ img {
 END
 }
 
 END
 }
 

+declare -rf bpgallery_default_stylesheet
+
+function bpgallery_escape_url() {
+       temp=$1
+       temp=${temp//\%/%25}
+       temp=${temp//:/%3A}
+       temp=${temp//;/%3B}
+       temp=${temp// /%20}
+       temp=${temp//$/%24}
+       temp=${temp//&/%26}
+       temp=${temp//+/%2B}
+       temp=${temp//,/%2C}
+       temp=${temp//\//%2F}
+       temp=${temp//=/%3D}
+       temp=${temp//\?/%3F}
+       temp=${temp//@/%40}
+       temp=${temp//\"/%22}
+       echo $temp
+}
+
+declare -rf bpgallery_escape_url
+
+if [[ ! -z ${BPGALLERY_THEME} ]] ; then
+       declare -r BPGALLERY_THEME
+fi
+
+if [[ ! -z ${TITLE} ]] ; then
+       declare -r TITLE
+fi
+
+if [[ -e /usr/local/etc/bpgallery/config ]] ; then
+       . /usr/local/etc/bpgallery/config 2>/dev/null
+fi
+
+if [[ -e /etc/bpgallery/config ]] ; then
+       . /etc/bpgallery/config 2>/dev/null
+fi
+
+if [[ -e $HOME/.bpgallery.rc ]]; then
+       . $HOME/.bpgallery.rc 2>/dev/null
+fi
+
+if [[ -z ${BPGALLERY_THEME} ]]; then
+       BPGALLERY_THEME=default
+fi
+
+if [[ -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
+elif [[ -e /etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then
+       . /etc/bpgallery/themes/${BPGALLERY_THEME} 2>/dev/null
+fi
+

 if [[ -z $TITLE ]]; then 
        TITLE="Photo Gallery"
 fi
 if [[ -z $TITLE ]]; then 
        TITLE="Photo Gallery"
 fi


@@ -106,6 +181,14 @@ if [[ -z $HEADCOMMAND ]]; then
        HEADCOMMAND=head
 fi
 
        HEADCOMMAND=head
 fi
 

+if [[ -z $GREPCOMMAND ]]; then
+       GREPCOMMAND=grep
+fi
+
+if [[ -z $SEDCOMMAND ]]; then
+       SEDCOMMAND=sed
+fi
+

 if [[ -z $WIDTH ]]; then
        WIDTH=100
 fi
 if [[ -z $WIDTH ]]; then
        WIDTH=100
 fi


@@ -118,13 +201,48 @@ if [[ -z $WCCOMMAND ]]; then
        WCCOMMAND="wc -l"
 fi
 
        WCCOMMAND="wc -l"
 fi
 

+if [[ -z $CAPTIONHEIGHT ]]; then
+       CAPTIONHEIGHT=75
+fi
+
+if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /dev/null ; then
+       BPGALLERY_HEAD_FUNCTION="bpgallery_${BPGALLERY_THEME}_head"
+else
+       BPGALLERY_HEAD_FUNCTION="bpgallery_default_head"
+fi
+
+if declare -F "bpgallery_${BPGALLERY_THEME}_description" > /dev/null ; then
+       BPGALLERY_DESCRIPTION_FUNCTION="bpgallery_${BPGALLERY_THEME}_description"
+else
+       BPGALLERY_DESCRIPTION_FUNCTION="bpgallery_default_description"
+fi
+
+if declare -F "bpgallery_${BPGALLERY_THEME}_thumbsline" > /dev/null ; then
+       BPGALLERY_THUMBSLINE_FUNCTION="bpgallery_${BPGALLERY_THEME}_thumbsline"
+else
+       BPGALLERY_THUMBSLINE_FUNCTION="bpgallery_default_thumbsline"
+fi
+
+if declare -F "bpgallery_${BPGALLERY_THEME}_tail" > /dev/null ; then
+       BPGALLERY_TAIL_FUNCTION="bpgallery_${BPGALLERY_THEME}_tail"
+else
+       BPGALLERY_TAIL_FUNCTION="bpgallery_default_tail"
+fi
+
+if declare -F "bpgallery_${BPGALLERY_THEME}_stylesheet" > /dev/null ; then
+       BPGALLERY_STYLESHEET_FUNCTION="bpgallery_${BPGALLERY_THEME}_stylesheet"
+else
+       BPGALLERY_STYLESHEET_FUNCTION="bpgallery_default_stylesheet"
+fi
+

 FINDIMAGESOPTIONS=""
 
 for imageext in $IMAGEEXTENSIONS; do
 FINDIMAGESOPTIONS=""
 
 for imageext in $IMAGEEXTENSIONS; do

-       FINDIMAGESOPTIONS=$FINDIMAGESOPTIONS' -o -type f -maxdepth 1 -iname '*.$imageext' -print0'
+       FINDIMAGESOPTIONS=$FINDIMAGESOPTIONS' -o -type f -iname '*.$imageext' -print0'

 done
 
 FINDIMAGESOPTIONS=${FINDIMAGESOPTIONS## -o }
 done
 
 FINDIMAGESOPTIONS=${FINDIMAGESOPTIONS## -o }

+FINDIMAGESOPTIONS='-maxdepth 1 '${FINDIMAGESOPTIONS}

 
 function usage() {
 cat <<END
 
 function usage() {
 cat <<END


@@ -176,37 +294,50 @@ fi
 
 if [ ! -d icons ]; then
        mkdir icons
 
 if [ ! -d icons ]; then
        mkdir icons

+
+       totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace echo {} | $WCCOMMAND);
+       currentimage=0
+       
+       $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$totalimages images; currentimage=$((currentimage+1)); done
+       
+       echo done: $totalimages/$totalimages images

 else
 else

-       echo "$1 already contains an icons folder, stopping"
-       exit 3
-fi
+       echo "$1 already contains an icons folder, updating."

 
 

-totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace echo {} | $WCCOMMAND);
-currentimage=0
+       imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do filename=${filename//\"/\\\"}; if [ ! -r "icons/$filename" ] || [ "$filename" -nt "icons/$filename" ]; then $ECHOCOMMAND $filename; fi; done | $WCCOMMAND)

 
 

-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do echo done: $currentimage/$totalimages images; currentimage=$((currentimage+1)); done
+       echo "images to update: $imagestoupdate"
+       
+       
+       currentimage=0

 
 

-echo done: $totalimages/$totalimages images
+       $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do tempfilename=${filename//\"/\\\"/}; if [ ! -r "icons/$tempfilename" ] || [ "$tempfilename" -nt "icons/$tempfilename" ] ; 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; echo $throwout; currentimage=$((currentimage+1)); done
+       echo done: $imagestoupdate/$imagestoupdate images
+fi
+
+if [ -r description.txt ] ; then
+       DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/<p>/; }; /^$/ { s,$,</p><p>,; }; $ { s,$,</p>, };' description.txt)
+else
+       DESCRIPTION=""
+fi

 
 

-bpgallery_default_head > index.html

 
 

-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; bpgallery_default_thumbsline $filename; done >> index.html
+$BPGALLERY_HEAD_FUNCTION > index.html
+$BPGALLERY_DESCRIPTION_FUNCTION >> index.html

 
 

-bpgallery_default_tail >> index.html
+$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
+
+$BPGALLERY_TAIL_FUNCTION >> index.html

 
 cd icons
 
 
 cd icons
 

-for imageext in $IMAGEEXTENSIONS; do
-       if ( ls "*.$imageext" > /dev/null 2>/dev/null ); then
-               TEMPMAX=$($IDENTIFYCOMMAND *.$imageext | grep "Geometry:" | sed -r 's#^.*Geometry:.*?[0-9]+x([0-9]+)\+.*$#\1#' | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
-               if [[ $TEMPMAX -gt $MAXHEIGHT ]]; then
-                       MAXHEIGHT=$TEMPMAX
-               fi
-       fi
-done
+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)

 
 cd ..
 
 
 cd ..
 

+# add a bit to the maxheight for the size of the caption
+MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))

 
 

-bpgallery_default_stylesheet > style.css
+$BPGALLERY_STYLESHEET_FUNCTION > style.css