X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/8dd6afbdfc214b076c60f3fdc0e611a529f01240..45211626bfa6edab803ddb4a80a29c1fa2890c34:/bpgallery.sh?ds=sidebyside diff --git a/bpgallery.sh b/bpgallery.sh index f1dcee7..1650485 100755 --- a/bpgallery.sh +++ b/bpgallery.sh @@ -19,7 +19,7 @@ set -f -VERSION="1.0.0+arch" +VERSION="1.0.2+arch" function bpgallery_default_head() { cat </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 @@ -210,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 @@ -268,8 +279,32 @@ Version: $VERSION 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 "
"
+fi
+
 if [[ -z $1 ]]; then
-	echo "No path given"
+	$ECHOCOMMAND "No path given"
 	usage
 	exit 1
 fi
@@ -285,7 +320,7 @@ if [[ "$1" == "--version" || "$1" == "-v" ]]; then
 fi
 
 if [[ ! -d $1 ]]; then
-	echo "$1 is not a directory"
+	$ECHOCOMMAND "$1 is not a directory"
 	usage
 	exit 2
 fi
@@ -293,33 +328,16 @@ 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
-
-	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."
-
-	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)
-
-	echo "images to update: $imagestoupdate"
-	
-	
-	currentimage=0
-
-	$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
 
+generate_thumbs
+
 if [ -r description.txt ] ; then
 	DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/
/; }; /^$/ { s,$,
,; }; $ { s,$,
, };' description.txt)
 else
@@ -327,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)
@@ -346,3 +370,8 @@ MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
+$ECHOCOMMAND "All done"
+
+if [[ $OUTPUTHTML != 0 ]]; then
+	$ECHOCOMMAND "
" +fi