X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/657a5a1384747ed03979162ea282e5653a790acc..c757ab6dcdf959f0bb5fcf5fe23c7e94a4c6b819:/bpgallery.sh?ds=sidebyside diff --git a/bpgallery.sh b/bpgallery.sh index 0d2009e..e6c6f9f 100755 --- a/bpgallery.sh +++ b/bpgallery.sh @@ -19,7 +19,7 @@ set -f -VERSION="0.9.3+arch" +VERSION="1.0.2+arch" function bpgallery_default_head() { cat <${TITLE} + ${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 -
$caption
+
$caption_alt
$caption
END } +declare -rf bpgallery_default_thumbsline + function bpgallery_default_tail() { cat << END @@ -47,21 +65,23 @@ cat << END END } +declare -rf bpgallery_default_tail + function bpgallery_default_stylesheet() { cat <${caption} +
+
    +
  • Thumbnails
    • +END + if [[ ! -z $previouspage ]]; then + echo "
  • Previous
    • " + else + echo "
  • Previous
    • " + fi + + if [[ ! -z $nextpage ]]; then + echo "
  • Next
    • " + else + echo "
  • Next
    • " + fi +cat < +
+
+ ${caption} +
+END + $BPGALLERY_TAIL_FUNCTION +} + +declare -rf bpgallery_default_page + +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 [[ -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 - . $HOME/.bpgallery.themes/${BPGALLERY_THEME} +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} + . /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 @@ -140,6 +245,10 @@ if [[ -z $GREPCOMMAND ]]; then GREPCOMMAND=grep fi +if [[ -z $SEDCOMMAND ]]; then + SEDCOMMAND=sed +fi + if [[ -z $WIDTH ]]; then WIDTH=100 fi @@ -156,12 +265,34 @@ if [[ -z $CAPTIONHEIGHT ]]; then CAPTIONHEIGHT=75 fi +if [[ -z $OUTPUTHTML ]]; then + OUTPUTHTML=0 +fi + +if [[ -z $GENERATEPAGESFORFULLSIZE ]]; then + GENERATEPAGESFORFULLSIZE=0 +fi + +if [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then + if declare -F "bpgallery_${BPGALLERY_THEME}_page" > /dev/null ; then + BPGALLERY_PAGE_FUNCTION="bpgallery_${BPGALLERY_THEME}_page" + else + BPGALLERY_PAGE_FUNCTION="bpgallery_default_page" + fi +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 @@ -183,10 +314,11 @@ fi 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 <&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" +} + +function generate_pages() { + $ECHOCOMMAND "Generating Pages" + previouspage="" + currentpage="" + nextpage="" + previousimage="" + currentimage="" + nextimage="" + + $FINDCOMMAND . $FINDIMAGESOPTIONS | \ + $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | \ + $SORTCOMMAND -g | \ + while read imagefilename; do + previousimage=$currentimage + currentimage=$nextimage + nextimage=$imagefilename + previouspage=$currentpage + currentpage=$nextpage + nextpage=${imagefilename}.html + filename=${currentimage} + generate_general_page "$previouspage" "$currentpage" "$nextpage" + echo $nextimage + done | tail -n 2 | ( + read previouspage + read currentpage + filename=${currentpage} + currentpage=${currentpage}.html + previouspage=${previouspage}.html + nextpage="" + generate_general_page "$previouspage" "$currentpage" "" + ) +} + + + +function generate_general_page() { + + if [[ -z $1 ]]; then + previouspage="" + fi + + if [[ -z $2 ]]; then + currentpage="" + return + fi + + if [[ -z $3 ]]; then + nextpage="" + fi + + if [ -r captions.txt ]; then + caption=$($GREPCOMMAND -E "^${filename} " captions.txt); caption=${caption#* } + else + caption="" + fi + + $BPGALLERY_PAGE_FUNCTION > $currentpage +} + +if [[ $OUTPUTHTML != 0 ]]; then + $ECHOCOMMAND "
"
+fi
+
 if [[ -z $1 ]]; then
-	echo "No path given"
+	$ECHOCOMMAND "No path given"
 	usage
 	exit 1
 fi
@@ -224,7 +439,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
@@ -232,33 +447,64 @@ 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 [ ! -w . ]; then
+	$ECHOCOMMAND "Can't write to images directory, exiting"
+	exit 8
+fi
+
+if [ -e index.html ] && [ ! -w index.html ]; then
+	$ECHOCOMMAND "Can't write index.html, exiting"
+	exit 8
+fi
+
+if [ -e style.css ] && [ ! -w style.css ]; then
+	$ECHOCOMMAND "Can't write style.css, exiting"
+	exit 8
+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
+if [ ! -w icons ]; then
+	$ECHOCOMMAND "Can't write to icons directory, exiting"
+	exit 16
+fi
+
+generate_thumbs
+
+if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then
+	generate_pages
+fi
+
+if [ -r description.txt ] ; then
+	DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/
/; }; /^$/ { s,$,
,; }; $ { s,$,
, };' description.txt)
+else
+	DESCRIPTION=""
+fi
 
-$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 done: $totalimages/$totalimages images
+$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; $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; if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then link=$(bpgallery_escape_url "${filename}.html"); else link=$(bpgallery_escape_url "$filename"); 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)
+MAXWIDTH=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%w\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
 
 cd ..
 
@@ -267,3 +513,8 @@ MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
+$ECHOCOMMAND "All done"
+
+if [[ $OUTPUTHTML != 0 ]]; then
+	$ECHOCOMMAND "
" +fi