X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/e1cb8f570febbc032bb3538c32a9b7c2f25aaa67..d4d3b701b154f0e7ff24fd3894d323cb2abf08b2:/bpgallery.sh?ds=inline diff --git a/bpgallery.sh b/bpgallery.sh index dbb2bb2..f4aa372 100755 --- a/bpgallery.sh +++ b/bpgallery.sh @@ -19,7 +19,7 @@ set -f -VERSION="1.0.2+arch" +VERSION="1.1+arch" function bpgallery_default_head() { cat <$caption_alt
$caption
+
$caption_alt
$caption
END } @@ -90,6 +90,22 @@ div.caption { font-weight: bold; } +div.navigation { + margin: 0; +} + +div.navigation ul { + display: inline; + margin: 0; + padding: 0; + text-align: center; +} + +div.navigation ul li { + display: inline; + margin: 2em; +} + a { border: 0px; } @@ -102,6 +118,46 @@ END declare -rf bpgallery_default_stylesheet +function bpgallery_default_page() { + $BPGALLERY_HEAD_FUNCTION + + linkstart="" + linkend="" + + if [[ ! -z $linklocation ]]; then + linkstart="" + linkend="" + fi + + 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 < +
+
+ ${linkstart}${caption}${linkend} +
+END + $BPGALLERY_TAIL_FUNCTION +} + +declare -rf bpgallery_default_page + function bpgallery_escape_url() { temp=$1 temp=${temp//\%/%25} @@ -221,6 +277,30 @@ if [[ -z $OUTPUTHTML ]]; then OUTPUTHTML=0 fi +if [[ -z $GENERATEPAGESFORFULLSIZE ]]; then + GENERATEPAGESFORFULLSIZE=0 +fi + +if [[ -z $GENERATEPAGESFORMEDIUMSIZE ]]; then + GENERATEPAGESFORMEDIUMSIZE=1 +fi + +if [[ -z $MEDIUMWIDTH ]]; then + MEDIUMWIDTH=400 +fi + +if [[ -z $INDEXDOCUMENT ]]; then + INDEXDOCUMENT=index.html +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 @@ -279,24 +359,159 @@ Version: $VERSION END } -function generate_thumbs() { - $ECHOCOMMAND "Generating Thumbnails" +function generate_resized_images() { + $ECHOCOMMAND "Generating $2" 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) + totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | $WCCOMMAND); + imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | while read filename; do filename=${filename//\"/\\\"}; if [ ! -r "$2/$filename" ] || [ "$filename" -nt "$2/$filename" ] || [ $($IDENTIFYCOMMAND -format "%w" "$2/$filename") -ne $1 ]; then $ECHOCOMMAND $filename; fi; done | $WCCOMMAND) if [ $totalimages -eq $imagestoupdate ]; then - $ECHOCOMMAND "Regenerating all thumbnails" + $ECHOCOMMAND "Regenerating all $2" elif [ $imagestoupdate -eq 0 ]; then - $ECHOCOMMAND "No Updated Thumbs, not regenerating" + $ECHOCOMMAND "No Updated $2, not regenerating" return else - $ECHOCOMMAND "Generating $imagestoupdate of $totalimages thumbnails" + $ECHOCOMMAND "Generating $imagestoupdate of $totalimages $2" 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 + $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | while read filename; do tempfilename=${filename//\"/\\\"/}; if [ ! -r "$2/$tempfilename" ] || [ "$tempfilename" -nt "$2/$tempfilename" ] || [ $($IDENTIFYCOMMAND -format "%w" "$2/$filename") -ne $1 ]; then $ECHOCOMMAND -n $filename; $ECHOCOMMAND -n -e "\000"; fi; done | $XARGSCOMMAND -0 --verbose --max-procs=4 -I {} $CONVERTTOOL -resize $1 '{}' $2/'{}' 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" + $ECHOCOMMAND "Completed generating $2 for $totalimages images" +} + +function generate_thumbs() { + if [ ! -d icons ]; then + mkdir icons + fi + + if [ ! -w icons ]; then + $ECHOCOMMAND "Can't write to icons directory, exiting" + exit 16 + fi + + generate_resized_images $WIDTH icons +} + +function generate_medium() { + if [ ! -d medium ]; then + mkdir medium + fi + + if [ ! -w medium ]; then + $ECHOCOMMAND "Can't write to medium directory, exiting" + exit 32 + fi + + generate_resized_images $MEDIUMWIDTH medium +} + +function generate_pages() { + $ECHOCOMMAND "Generating Pages" + previouspage="" + currentpage="" + nextpage="" + previousimage="" + currentimage="" + nextimage="" + extra="" + extradir="" + addlinks=0 + + if [ ! -z $1 ]; then + extra=$1 + fi + + if [ ! -z $2 ]; then + extradir=$2/ + addlinks=1 + fi + + if [ -z $1 ] && [ -z $2 ] && [[ $GENERATEPAGESFORMEDIUMSIZE != 0 ]]; then + addlinks=2 + fi + + $FINDCOMMAND . $FINDIMAGESOPTIONS | \ + $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | \ + $SORTCOMMAND -g | \ + while read imagefilename; do + previousimage=$currentimage + currentimage=$nextimage + nextimage=${imagefilename#./} + addlink="" + + if [[ $addlinks == 1 ]]; then + if [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then + addlink=${currentimage}.html + else + addlink=${currentimage} + fi + fi + + if [[ $addlinks == 2 ]]; then + addlink=${currentimage}__medium.html + fi + + previouspage=$currentpage + currentpage=$nextpage + nextpage=${imagefilename}${extra}.html + filename=${extradir}${currentimage} + generate_general_page "$previouspage" "$currentpage" "$nextpage" $addlink + echo $nextimage + done | tail -n 2 | ( + read previouspage + read currentpage + addlink="" + + if [[ $addlinks == 1 ]]; then + if [[ $GENERATEPAGESFORFULLSIZE ]]; then + addlink=${currentpage}.html + else + addlink=${currentpage} + fi + fi + + if [[ $addlinks == 2 ]]; then + addlink=${nextimage}__medium.html + fi + + filename=${extradir}${currentpage} + currentpage=${currentpage}${extra}.html + previouspage=${previouspage}${extra}.html + nextpage="" + generate_general_page "$previouspage" "$currentpage" "" $addlink + ) +} + +function generate_medium_pages() { + generate_pages __medium medium +} + +function generate_general_page() { + + if [[ -z $1 ]]; then + previouspage="" + fi + + if [[ -z $2 ]]; then + currentpage="" + return + fi + + if [[ -z $3 ]]; then + nextpage="" + fi + + if [[ ! -z $4 ]]; then + linklocation=$4 + 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 @@ -337,8 +552,8 @@ if [ ! -w . ]; then exit 8 fi -if [ -e index.html ] && [ ! -w index.html ]; then - $ECHOCOMMAND "Can't write index.html, exiting" +if [ -e ${INDEXDOCUMENT} ] && [ ! -w ${INDEXDOCUMENT} ]; then + $ECHOCOMMAND "Can't write ${INDEXDOCUMENT}, exiting" exit 8 fi @@ -347,16 +562,16 @@ if [ -e style.css ] && [ ! -w style.css ]; then exit 8 fi -if [ ! -d icons ]; then - mkdir icons -fi +generate_thumbs -if [ ! -w icons ]; then - $ECHOCOMMAND "Can't write to icons directory, exiting" - exit 16 +if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then + generate_medium + generate_medium_pages fi -generate_thumbs +if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then + generate_pages +fi if [ -r description.txt ] ; then DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/

/; }; /^$/ { s,$,

,; }; $ { s,$,

, };' description.txt) @@ -367,14 +582,19 @@ fi $ECHOCOMMAND "Starting to generate page" -$BPGALLERY_HEAD_FUNCTION > index.html -$BPGALLERY_DESCRIPTION_FUNCTION >> index.html +$BPGALLERY_HEAD_FUNCTION > ${INDEXDOCUMENT} +$BPGALLERY_DESCRIPTION_FUNCTION >> ${INDEXDOCUMENT} $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 +extra="" +if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then + extra=__medium +fi + +$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $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}${extra}.html"); else link=$(bpgallery_escape_url "$filename"); fi; filename=$(bpgallery_escape_url "$filename"); $BPGALLERY_THUMBSLINE_FUNCTION; done >> ${INDEXDOCUMENT} -$BPGALLERY_TAIL_FUNCTION >> index.html +$BPGALLERY_TAIL_FUNCTION >> ${INDEXDOCUMENT} $ECHOCOMMAND "Finished generating the page" $ECHOCOMMAND "Generating stylesheet"