X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/4e9ad17280e911da8026f21269285aed622de238..45211626bfa6edab803ddb4a80a29c1fa2890c34:/bpgallery.sh?ds=inline

diff --git a/bpgallery.sh b/bpgallery.sh
index f6fdfed..1650485 100755
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -70,18 +70,18 @@ declare -rf bpgallery_default_tail
 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 {
@@ -91,11 +91,11 @@ div.caption {
 }
 
 a {
-        border: 0px;
+	border: 0px;
 }
 
 img {
-        border: 0px;
+	border: 0px;
 }
 END
 }
@@ -150,7 +150,10 @@ 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
@@ -214,6 +217,10 @@ if [[ -z $CAPTIONHEIGHT ]]; then
 	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
@@ -292,6 +299,10 @@ function generate_thumbs() {
 	$ECHOCOMMAND "Completed generating thumbs for $totalimages images"
 }
 
+if [[ $OUTPUTHTML != 0 ]]; then
+	$ECHOCOMMAND "<pre>"
+fi
+
 if [[ -z $1 ]]; then
 	$ECHOCOMMAND "No path given"
 	usage
@@ -334,13 +345,19 @@ 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)
@@ -353,3 +370,8 @@ MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
+$ECHOCOMMAND "All done"
+
+if [[ $OUTPUTHTML != 0 ]]; then
+	$ECHOCOMMAND "</pre>"
+fi