]> 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
Start theme support
[bpgallery.git] / bpgallery.sh
diff --git a/bpgallery.sh b/bpgallery.sh
index 3d82851af18eda185945a7ef19878a06875483cb..7a6f9d255e336d0cbf6333cc0a42bda798221003 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -1,6 +1,6 @@
 #!/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
@@ -21,32 +21,89 @@ set -f
 
 VERSION="0.9.2"
 
+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_thumbsline() {
+cat << END
+<div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a></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: 12pt;
+}
+
+div.thumbnail {
+        float: left;
+        padding: 20px;
+        border: 0px;
+        width: ${WIDTH}px;
+        height: ${MAXHEIGHT}px;
+}
+
+a {
+        border: 0px;
+}
+
+img {
+        border: 0px;
+}
+END
+}
+
 if [[ -z $TITLE ]]; then 
        TITLE="Photo Gallery"
 fi
 
 if [[ -z $CONVERTTOOL ]]; then
-       CONVERTTOOL="/usr/bin/convert"
+       CONVERTTOOL=convert
 fi
 
 if [[ -z $FINDCOMMAND ]]; then
-       FINDCOMMAND=/usr/bin/find
+       FINDCOMMAND=find
 fi
 
 if [[ -z $XARGSCOMMAND ]]; then
-       XARGSCOMMAND=/usr/bin/xargs
+       XARGSCOMMAND=xargs
 fi
 
 if [[ -z $ECHOCOMMAND ]]; then
-       ECHOCOMMAND=/bin/echo
+       ECHOCOMMAND=echo
 fi
 
 if [[ -z $SORTCOMMAND ]]; then
-       SORTCOMMAND=/usr/bin/sort
+       SORTCOMMAND=sort
 fi
 
 if [[ -z $IDENTIFYCOMMAND ]]; then
-       IDENTIFYCOMMAND=/usr/bin/identify
+       IDENTIFYCOMMAND=identify
+fi
+
+if [[ -z $HEADCOMMAND ]]; then
+       HEADCOMMAND=head
 fi
 
 if [[ -z $WIDTH ]]; then
@@ -57,6 +114,10 @@ if [[ -z $IMAGEEXTENSIONS ]]; then
        IMAGEEXTENSIONS="jpeg jpg gif png";
 fi
 
+if [[ -z $WCCOMMAND ]]; then
+       WCCOMMAND="wc -l"
+fi
+
 FINDIMAGESOPTIONS=""
 
 for imageext in $IMAGEEXTENSIONS; do
@@ -65,8 +126,8 @@ done
 
 FINDIMAGESOPTIONS=${FINDIMAGESOPTIONS## -o }
 
-usage() {
-       cat <<END
+function usage() {
+cat <<END
 Usage:
   $0 [--help|--version|<path to images>]
 
@@ -78,8 +139,8 @@ Usage:
 END
 }
 
-version() {
-       cat <<END
+function version() {
+cat <<END
 Version: $VERSION
 END
 }
@@ -120,33 +181,24 @@ else
        exit 3
 fi
 
-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}'
+totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace echo {} | $WCCOMMAND);
+currentimage=0
 
-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
+$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
 
-$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
+bpgallery_default_head > index.html
 
-cat <<END >> index.html
-</body>
-</html>
-END
+$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; bpgallery_default_thumbsline $filename; done >> index.html
 
+bpgallery_default_tail >> index.html
 
 cd icons
 
 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 | head -n 1)
+               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
@@ -156,28 +208,5 @@ done
 cd ..
 
 
-cat <<END > style.css
-body {
-        background: white;
-        color: black;
-        font-family: sans-serif;
-        font-size: 12pt;
-}
-
-div.thumbnail {
-        float: left;
-        padding: 20px;
-        border: 0px;
-        width: ${WIDTH}px;
-        height: ${MAXHEIGHT}px;
-}
-
-a {
-        border: 0px;
-}
-
-img {
-        border: 0px;
-}
-END
+bpgallery_default_stylesheet > style.css
 
A simple gallery script in bash