]> git.sommitrealweird.co.uk Git - bpgallery.git/blobdiff - bpgallery.sh
projects / bpgallery.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update version number, ready for release
[bpgallery.git] / bpgallery.sh
diff --git a/bpgallery.sh b/bpgallery.sh
index 6d38f0f630c1fab67e4e7cafe59f4c2d5902c8d8..27bbdc44ff15a557005964a7a1a9054c2f8d2915 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
 #!/usr/bin/env bash
 
-# makegallery.sh - builds a simple 'gallery' from a collection of images
+# bpgallery.sh - builds a simple 'gallery' from a collection of images
 # Copyright (C) 2004 Brett Parker <iDunno@sommitrealweird.co.uk>
 #
 # This program is free software; you can redistribute it and/or modify
 # Copyright (C) 2004 Brett Parker <iDunno@sommitrealweird.co.uk>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -19,38 +19,136 @@
 
 set -f
 
 
 set -f
 
-VERSION="0.9.2"
+VERSION="1.0.0"
+
+function bpgallery_default_head() {
+cat <<END
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+       <title>${TITLE}</title>
+       <link rel="stylesheet" href="style.css" type="text/css" />
+</head>
+<body>
+END
+}
+
+function bpgallery_default_description() {
+cat <<END
+       <h1>${TITLE}</h1>
+       ${DESCRIPTION}
+END
+}
+
+function bpgallery_default_thumbsline() {
+cat << END
+<div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a><div class="caption">$caption</div></div>
+END
+}
+
+function bpgallery_default_tail() {
+cat << END
+</body>
+</html>
+END
+}
+
+function bpgallery_default_stylesheet() {
+cat <<END
+body {
+        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;
+}
+
+div.caption {
+       width: 100%;
+       text-align: center;
+       font-weight: bold;
+}
+
+a {
+        border: 0px;
+}
+
+img {
+        border: 0px;
+}
+END
+}
+
+if [[ -e /usr/local/etc/bpgallery/config ]] ; then
+       . /usr/local/etc/bpgallery/config
+fi
+
+if [[ -e /etc/bpgallery/config ]] ; then
+       . /etc/bpgallery/config
+fi
+
+if [[ -e $HOME/.bpgallery.rc ]]; then
+       . $HOME/.bpgallery.rc
+fi
+
+if [[ -z ${BPGALLERY_THEME} ]]; then
+       BPGALLERY_THEME=default
+fi
+
+if [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then
+       . $HOME/.bpgallery.themes/${BPGALLERY_THEME}
+elif [[ -e /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then
+       . /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME}
+elif [[ -e /etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then
+       . /etc/bpgallery/themes/${BPGALLERY_THEME}
+fi
 
 if [[ -z $TITLE ]]; then 
        TITLE="Photo Gallery"
 fi
 
 if [[ -z $CONVERTTOOL ]]; then
 
 if [[ -z $TITLE ]]; then 
        TITLE="Photo Gallery"
 fi
 
 if [[ -z $CONVERTTOOL ]]; then
-       CONVERTTOOL="/usr/bin/convert"
+       CONVERTTOOL=convert
 fi
 
 if [[ -z $FINDCOMMAND ]]; then
 fi
 
 if [[ -z $FINDCOMMAND ]]; then
-       FINDCOMMAND=/usr/bin/find
+       FINDCOMMAND=find
 fi
 
 if [[ -z $XARGSCOMMAND ]]; then
 fi
 
 if [[ -z $XARGSCOMMAND ]]; then
-       XARGSCOMMAND=/usr/bin/xargs
+       XARGSCOMMAND=xargs
 fi
 
 if [[ -z $ECHOCOMMAND ]]; then
 fi
 
 if [[ -z $ECHOCOMMAND ]]; then
-       ECHOCOMMAND=/bin/echo
+       ECHOCOMMAND=echo
 fi
 
 if [[ -z $SORTCOMMAND ]]; then
 fi
 
 if [[ -z $SORTCOMMAND ]]; then
-       SORTCOMMAND=/usr/bin/sort
+       SORTCOMMAND=sort
 fi
 
 if [[ -z $IDENTIFYCOMMAND ]]; then
 fi
 
 if [[ -z $IDENTIFYCOMMAND ]]; then
-       IDENTIFYCOMMAND=/usr/bin/identify
+       IDENTIFYCOMMAND=identify
 fi
 
 if [[ -z $HEADCOMMAND ]]; then
 fi
 
 if [[ -z $HEADCOMMAND ]]; then
-       HEADCOMMAND=/usr/bin/head
+       HEADCOMMAND=head
+fi
+
+if [[ -z $GREPCOMMAND ]]; then
+       GREPCOMMAND=grep
+fi
+
+if [[ -z $SEDCOMMAND ]]; then
+       SEDCOMMAND=sed
 fi
 
 if [[ -z $WIDTH ]]; then
 fi
 
 if [[ -z $WIDTH ]]; then
@@ -61,6 +159,48 @@ if [[ -z $IMAGEEXTENSIONS ]]; then
        IMAGEEXTENSIONS="jpeg jpg gif png";
 fi
 
        IMAGEEXTENSIONS="jpeg jpg gif png";
 fi
 
+if [[ -z $WCCOMMAND ]]; then
+       WCCOMMAND="wc -l"
+fi
+
+if [[ -z $CAPTIONHEIGHT ]]; then
+       CAPTIONHEIGHT=75
+fi
+
+if [[ -z $DESCRIPTION ]]; then
+       DESCRIPTION=""
+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
+       BPGALLERY_THUMBSLINE_FUNCTION="bpgallery_default_thumbsline"
+fi
+
+if declare -F "bpgallery_${BPGALLERY_THEME}_tail" > /dev/null ; then
+       BPGALLERY_TAIL_FUNCTION="bpgallery_${BPGALLERY_THEME}_tail"
+else
+       BPGALLERY_TAIL_FUNCTION="bpgallery_default_tail"
+fi
+
+if declare -F "bpgallery_${BPGALLERY_THEME}_stylesheet" > /dev/null ; then
+       BPGALLERY_STYLESHEET_FUNCTION="bpgallery_${BPGALLERY_THEME}_stylesheet"
+else
+       BPGALLERY_STYLESHEET_FUNCTION="bpgallery_default_stylesheet"
+fi
+
 FINDIMAGESOPTIONS=""
 
 for imageext in $IMAGEEXTENSIONS; do
 FINDIMAGESOPTIONS=""
 
 for imageext in $IMAGEEXTENSIONS; do
@@ -69,8 +209,8 @@ done
 
 FINDIMAGESOPTIONS=${FINDIMAGESOPTIONS## -o }
 
 
 FINDIMAGESOPTIONS=${FINDIMAGESOPTIONS## -o }
 
-usage() {
-       cat <<END
+function usage() {
+cat <<END
 Usage:
   $0 [--help|--version|<path to images>]
 
 Usage:
   $0 [--help|--version|<path to images>]
 
@@ -82,8 +222,8 @@ Usage:
 END
 }
 
 END
 }
 
-version() {
-       cat <<END
+function version() {
+cat <<END
 Version: $VERSION
 END
 }
 Version: $VERSION
 END
 }
@@ -119,69 +259,50 @@ fi
 
 if [ ! -d icons ]; then
        mkdir icons
 
 if [ ! -d icons ]; then
        mkdir icons
-else
-       echo "$1 already contains an icons folder, stopping"
-       exit 3
-fi
 
 
-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $CONVERTTOOL -resize $WIDTH '{}' '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."
 
 
-cat <<END > index.html
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-       <title>${TITLE}</title>
-       <link rel="stylesheet" href="style.css" type="text/css" />
-</head>
-<body>
-END
+       imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do 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 {} |$SORTCOMMAND -g | sed -e 's#^./\(.*\)$#<div class="thumbnail"><a href="\1"><img src="icons/\1" /></a></div>#' >> index.html
+       $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do if [ ! -r "icons/$filename" ] || [ "$filename" -nt "icons/$filename" ] ; then $ECHOCOMMAND $filename; fi; done | $XARGSCOMMAND --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$imagestoupdate images; currentimage=$((currentimage+1)); done
+       echo done: $imagestoupdate/$imagestoupdate images
+fi
 
 
-cat <<END >> index.html
-</body>
-</html>
-END
+if [ -r description.txt ] ; then
+       DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/<p>/; }; /^$/ { s,$,</p><p>,; }; $ { s,$,</p>, };' description.txt)
+else
+       DESCRIPTION=""
+fi
 
 
 
 
-cd icons
+$BPGALLERY_HEAD_FUNCTION > index.html
+$BPGALLERY_DESCRIPTION_FUNCTION >> index.html
 
 
-for imageext in $IMAGEEXTENSIONS; do
-       if ( ls "*.$imageext" > /dev/null 2>/dev/null ); then
-               TEMPMAX=$($IDENTIFYCOMMAND *.$imageext | grep "Geometry:" | sed -r 's#^.*Geometry:.*?[0-9]+x([0-9]+)\+.*$#\1#' | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
-               if [[ $TEMPMAX -gt $MAXHEIGHT ]]; then
-                       MAXHEIGHT=$TEMPMAX
-               fi
-       fi
-done
+$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
 
 
-cd ..
+$BPGALLERY_TAIL_FUNCTION >> index.html
 
 
+cd icons
 
 
-cat <<END > style.css
-body {
-        background: white;
-        color: black;
-        font-family: sans-serif;
-        font-size: 12pt;
-}
+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)
 
 
-div.thumbnail {
-        float: left;
-        padding: 20px;
-        border: 0px;
-        width: ${WIDTH}px;
-        height: ${MAXHEIGHT}px;
-}
+cd ..
 
 
-a {
-        border: 0px;
-}
+# add a bit to the maxheight for the size of the caption
+MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 
 
-img {
-        border: 0px;
-}
-END
+$BPGALLERY_STYLESHEET_FUNCTION > style.css
 
 
A simple gallery script in bash