X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/4e9ad17280e911da8026f21269285aed622de238..bf5a247c00c45a5f672702fdb8e246059f9e3046:/bpgallery.sh?ds=sidebyside diff --git a/bpgallery.sh b/bpgallery.sh index f6fdfed..cb6a81e 100755 --- a/bpgallery.sh +++ b/bpgallery.sh @@ -19,7 +19,7 @@ set -f -VERSION="1.0.2+arch" +VERSION="1.0.3.1" function bpgallery_default_head() { cat <$caption_alt
$caption
+
$caption_alt
$caption
END } @@ -70,18 +70,18 @@ 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} @@ -150,7 +198,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 +265,22 @@ 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 @@ -292,6 +359,69 @@ function generate_thumbs() { $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
 	$ECHOCOMMAND "No path given"
 	usage
@@ -321,12 +451,36 @@ if ( ! $FINDCOMMAND . $FINDIMAGESOPTIONS > /dev/null 2>/dev/null ); then
 	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
 fi
 
+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
@@ -334,13 +488,19 @@ else
 fi
 
 
+$ECHOCOMMAND "Starting to generate page"
+
 $BPGALLERY_HEAD_FUNCTION > index.html
 $BPGALLERY_DESCRIPTION_FUNCTION >> 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
+$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; 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)
@@ -353,3 +513,8 @@ MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
+$ECHOCOMMAND "All done"
+
+if [[ $OUTPUTHTML != 0 ]]; then
+	$ECHOCOMMAND "
" +fi