set -f
-VERSION="0.9.2+arch"
+VERSION="1.0.1+arch"
function bpgallery_default_head() {
cat <<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() {
+if [[ -z $caption ]]; then
+ caption_alt=Unknown
+else
+ caption_alt=$caption
+fi
cat << END
-<div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a></div>
+<div class="thumbnail"><a href="$filename"><img src="icons/$filename" alt="$caption_alt" /></a><div class="caption">$caption</div></div>
END
}
+declare -rf bpgallery_default_thumbsline
+
function bpgallery_default_tail() {
cat << END
</body>
END
}
+declare -rf bpgallery_default_tail
+
function bpgallery_default_stylesheet() {
cat <<END
body {
background: white;
color: black;
font-family: sans-serif;
- font-size: 12pt;
+ font-size: 10pt;
}
div.thumbnail {
height: ${MAXHEIGHT}px;
}
+div.caption {
+ width: 100%;
+ text-align: center;
+ font-weight: bold;
+}
+
a {
border: 0px;
}
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}
+ $ECHOCOMMAND $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
+ . /usr/local/etc/bpgallery/config 2>/dev/null
fi
if [[ -e /etc/bpgallery/config ]] ; then
- . /etc/bpgallery/config
+ . /etc/bpgallery/config 2>/dev/null
fi
if [[ -e $HOME/.bpgallery.rc ]]; then
- . $HOME/.bpgallery.rc
+ . $HOME/.bpgallery.rc 2>/dev/null
fi
if [[ -z ${BPGALLERY_THEME} ]]; then
fi
if [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then
- . $HOME/.bpgallery.themes/${BPGALLERY_THEME}
+ . $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}
+ . /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} 2>/dev/null
elif [[ -e /etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then
- . /etc/bpgallery/themes/${BPGALLERY_THEME}
+ . /etc/bpgallery/themes/${BPGALLERY_THEME} 2>/dev/null
fi
if [[ -z $TITLE ]]; then
HEADCOMMAND=head
fi
+if [[ -z $GREPCOMMAND ]]; then
+ GREPCOMMAND=grep
+fi
+
+if [[ -z $SEDCOMMAND ]]; then
+ SEDCOMMAND=sed
+fi
+
if [[ -z $WIDTH ]]; then
WIDTH=100
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
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 }
+FINDIMAGESOPTIONS='-maxdepth 1 '${FINDIMAGESOPTIONS}
function usage() {
cat <<END
END
}
+function generate_thumbs() {
+ $ECHOCOMMAND "Generating Thumbnails"
+ 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)
+
+ if [ $totalimages -eq $imagestoupdate ]; then
+ $ECHOCOMMAND "Regenerating all thumbnails"
+ elif [ $imagestoupdate -eq 0 ]; then
+ $ECHOCOMMAND "No Updated Thumbs, not regenerating"
+ return
+ else
+ $ECHOCOMMAND "Generating $imagestoupdate of $totalimages thumbnails"
+ 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
+ $ECHOCOMMAND done: $imagestoupdate/$imagestoupdate images
+ $ECHOCOMMAND "Completed generating thumbs for $totalimages images"
+}
+
if [[ -z $1 ]]; then
- echo "No path given"
+ $ECHOCOMMAND "No path given"
usage
exit 1
fi
fi
if [[ ! -d $1 ]]; then
- echo "$1 is not a directory"
+ $ECHOCOMMAND "$1 is not a directory"
usage
exit 2
fi
cd "$1"
if ( ! $FINDCOMMAND . $FINDIMAGESOPTIONS > /dev/null 2>/dev/null ); then
- echo "$1 does not contain any images. Quitting."
+ $ECHOCOMMAND "$1 does not contain any images. Quitting."
exit 4
fi
if [ ! -d icons ]; then
mkdir icons
-else
- echo "$1 already contains an icons folder, stopping"
- exit 3
fi
-totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace echo {} | $WCCOMMAND);
-currentimage=0
+generate_thumbs
-$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
+if [ -r description.txt ] ; then
+ DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/<p>/; }; /^$/ { s,$,</p><p>,; }; $ { s,$,</p>, };' description.txt)
+else
+ DESCRIPTION=""
+fi
-echo done: $totalimages/$totalimages images
$BPGALLERY_HEAD_FUNCTION > index.html
+$BPGALLERY_DESCRIPTION_FUNCTION >> index.html
-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; $BPGALLERY_THUMBSLINE_FUNCTION; done >> 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
-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 ..
+# add a bit to the maxheight for the size of the caption
+MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
$BPGALLERY_STYLESHEET_FUNCTION > style.css
projects / bpgallery.git / blobdiff