set -f
-VERSION="1.0.1+arch"
+VERSION="1.0.2+arch"
function bpgallery_default_head() {
cat <<END
function bpgallery_default_stylesheet() {
cat <<END
body {
- background: white;
- color: black;
- font-family: sans-serif;
- font-size: 10pt;
+ background: white;
+ color: black;
+ font-family: sans-serif;
+ font-size: 10pt;
}
div.thumbnail {
- float: left;
- padding: 20px;
- border: 0px;
- width: ${WIDTH}px;
- height: ${MAXHEIGHT}px;
+ float: left;
+ padding: 20px;
+ border: 0px;
+ width: ${WIDTH}px;
+ height: ${MAXHEIGHT}px;
}
div.caption {
}
a {
- border: 0px;
+ border: 0px;
}
img {
- border: 0px;
+ border: 0px;
}
END
}
temp=${temp//\?/%3F}
temp=${temp//@/%40}
temp=${temp//\"/%22}
- echo $temp
+ $ECHOCOMMAND $temp
}
declare -rf bpgallery_escape_url
. $HOME/.bpgallery.rc 2>/dev/null
fi
+if [[ -e $1 && -d $1 && -e $1/.bpgallery.rc ]]; then
+ . $1/.bpgallery.rc 2>/dev/null
+fi
+
if [[ -z ${BPGALLERY_THEME} ]]; then
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
CAPTIONHEIGHT=75
fi
+if [[ -z $OUTPUTHTML ]]; then
+ OUTPUTHTML=0
+fi
+
if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /dev/null ; then
BPGALLERY_HEAD_FUNCTION="bpgallery_${BPGALLERY_THEME}_head"
else
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 [[ $OUTPUTHTML != 0 ]]; then
+ $ECHOCOMMAND "<pre>"
+fi
+
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
+if [ ! -w . ]; then
+ $ECHOCOMMAND "Can't write to images directory, exiting"
+ exit 8
+fi
- 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
- echo "$1 already contains an icons folder, updating."
+if [ -e index.html ] && [ ! -w index.html ]; then
+ $ECHOCOMMAND "Can't write index.html, exiting"
+ exit 8
+fi
- 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 [ -e style.css ] && [ ! -w style.css ]; then
+ $ECHOCOMMAND "Can't write style.css, exiting"
+ exit 8
+fi
- echo "images to update: $imagestoupdate"
-
-
- currentimage=0
+if [ ! -d icons ]; then
+ mkdir icons
+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
- echo done: $imagestoupdate/$imagestoupdate images
+if [ ! -w icons ]; then
+ $ECHOCOMMAND "Can't write to icons directory, exiting"
+ exit 16
fi
+generate_thumbs
+
if [ -r description.txt ] ; then
DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/<p>/; }; /^$/ { s,$,</p><p>,; }; $ { s,$,</p>, };' description.txt)
else
fi
+$ECHOCOMMAND "Starting to generate page"
+
$BPGALLERY_HEAD_FUNCTION > index.html
$BPGALLERY_DESCRIPTION_FUNCTION >> index.html
+$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
$BPGALLERY_TAIL_FUNCTION >> index.html
+$ECHOCOMMAND "Finished generating the page"
+$ECHOCOMMAND "Generating stylesheet"
cd icons
MAXHEIGHT=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%h\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
$BPGALLERY_STYLESHEET_FUNCTION > style.css
+$ECHOCOMMAND "All done"
+
+if [[ $OUTPUTHTML != 0 ]]; then
+ $ECHOCOMMAND "</pre>"
+fi
projects / bpgallery.git / blobdiff