-2007-05-14 18:09:30 GMT Brett Parker <iDunno@sommitrealweird.co.uk>
- Add in pages directory support through PAGESDIRECTORY variable
- Up'd version number to be +arch as this is still in development
+2007-05-14 Brett Parker <iDunno@sommitrealweird.co.uk>
+ * Add in pages directory support through PAGESDIRECTORY variable
+ * Up'd version number to be +arch as this is still in development
+ * Add in options for ICONDIRECTORY and MEDIUMDIRECTORY so that they're no
+ longer hardcoded
-2007-05-14 00:29:30 GMT Brett Parker <arch@sommitrealweird.co.uk> patch-9
+2007-05-14 Brett Parker <arch@sommitrealweird.co.uk>
- Summary:
- Up version for release
- Revision:
- bpgallery--mainline--1.1--patch-9
+ * Fix caption generation code
+ * Released version 1.1.1
- Up version number for release
-
+2007-05-13 Brett Parker <arch@sommitrealweird.co.uk>
- modified files:
- bpgallery.sh
+ * Fix medium sized page generation code
+ * Fix index page generation
+ * Released version 1.1.0
+2007-05-12 Brett Parker <arch@sommitrealweird.co.uk>
-2007-05-14 00:28:15 GMT Brett Parker <arch@sommitrealweird.co.uk> patch-8
+ * Exit on failure of being able to write medium sized images
+ * Fix up README to contain the new variables for medium sized images
+ * Change --replace to -I {} so that the xargs commands work in a BSD
+ environment.
- Summary:
- Fix caption generation code
- Revision:
- bpgallery--mainline--1.1--patch-8
+2006-05-22 Brett Parker <arch@sommitrealweird.co.uk>
- * Fixes captions
- * Removes silly logging
-
- modified files:
- bpgallery.sh
-
-
-2007-05-13 10:53:09 GMT Brett Parker <arch@sommitrealweird.co.uk> patch-7
-
- Summary:
- Update version number for release
- Revision:
- bpgallery--mainline--1.1--patch-7
-
- Update version number for release
-
- modified files:
- bpgallery.sh
-
-
-2007-05-13 10:28:17 GMT Brett Parker <arch@sommitrealweird.co.uk> patch-6
-
- Summary:
- Fix medium sized page generation
- Revision:
- bpgallery--mainline--1.1--patch-6
-
- Declare the function even if we're not generating fullsize pages.
-
- modified files:
- TODO bpgallery.sh
-
-
-2007-05-13 09:15:20 GMT Brett Parker <arch@sommitrealweird.co.uk> patch-5
-
- Summary:
- Fix index page generation code
- Revision:
- bpgallery--mainline--1.1--patch-5
-
-
- modified files:
- TODO bpgallery.sh
-
-
-2007-05-12 14:20:31 GMT Brett Parker <arch@sommitrealweird.co.uk> patch-4
-
- Summary:
- Update TODO list
- Revision:
- bpgallery--mainline--1.1--patch-4
-
- Update TODO list and remove things that are already done.
-
- modified files:
- TODO
-
-
-2007-05-12 14:11:14 GMT Brett Parker <arch@sommitrealweird.co.uk> patch-3
-
- Summary:
- Exit on failure of being able to write medium sized images
- Revision:
- bpgallery--mainline--1.1--patch-3
-
- * Exit on failure of being able to write medium sized images
- * Fix up README to contain the new variables for medium sized images
-
-
- modified files:
- README bpgallery.sh
-
-
-2006-06-12 19:09:07 GMT Brett Parker <arch@sommitrealweird.co.uk> patch-2
-
- Summary:
- Fix xargs for a BSD environment
- Revision:
- bpgallery--mainline--1.1--patch-2
-
- Change --replace to -I {} so that the xargs commands work in a BSD environment.
-
-
- modified files:
- bpgallery.sh
-
-
-2006-05-22 19:20:34 GMT Brett Parker <arch@sommitrealweird.co.uk> patch-1
-
- Summary:
- Preliminary addition of Medium Sized images and pages
- Revision:
- bpgallery--mainline--1.1--patch-1
-
- * First draft attempt at medium sized images and the pages to go with it.
-
- modified files:
- bpgallery.sh
+ * Start of 1.1 release development
+ * Generate medium sized pages
caption_alt=$caption
fi
cat << END
-<div class="thumbnail"><a href="$link"><img src="
icons/$filename" alt="$caption_alt" /></a><div class="caption">$caption</div></div>
+<div class="thumbnail"><a href="$link"><img src="
${ICONSDIRECTORY}/$filename" alt="$caption_alt" /></a><div class="caption">$caption</div></div>
END
}
$ECHOCOMMAND $temp
}
+function bpgallery_cleanup_directory_name() {
+ temp=$1
+ temp=${temp//\%/_}
+ temp=${temp//:/_}
+ temp=${temp//;/_}
+ temp=${temp// /_}
+ temp=${temp//$/_}
+ temp=${temp//&/_}
+ temp=${temp//+/_}
+ temp=${temp//,/_}
+ temp=${temp//\//_}
+ temp=${temp//=/_}
+ temp=${temp//\?/_}
+ temp=${temp//@/_}
+ temp=${temp//\"/_}
+ $ECHOCOMMAND $temp
+}
+
declare -rf bpgallery_escape_url
if [[ ! -z ${BPGALLERY_THEME} ]] ; then
if [[ -z $PAGESDIRECTORY ]]; then
PAGESDIRECTORY=""
else
- temp=${PAGESDIRECTORY:${#PAGESDIRECTORY}-1:1}
- if [[ "x$temp" != "x/" ]] && [[ "x$temp" != "x\\" ]]; then
- PAGESDIRECTORY=${PAGESDIRECTORY}/
- fi
+ removetrailingslashes=${PAGESDIRECTORY%/}
+ temp=$removetrailingslashes
+ while [[ $removetrailingslashes != $temp ]]; do
+ temp=$removetrailingslashes
+ removetrailingslashes=${temp%/}
+ done
+ PAGESDIRECTORY=$(bpgallery_escape_url "${PAGESDIRECTORY}")
fi
if [[ -z $MEDIUMWIDTH ]]; then
INDEXDOCUMENT=index.html
fi
+if [[ -z $MEDIUMDIRECTORY ]]; then
+ MEDIUMDIRECTORY=medium
+else
+ # Strip out anything that might be broken
+ MEDIUMDIRECTORY=$(bpgallery_cleanup_directory_name "$MEDIUMDIRECTORY")
+fi
+
+if [[ -z $ICONSDIRECTORY ]]; then
+ ICONSDIRECTORY=icons
+else
+ # Strip out anything that might be broken
+ ICONSDIRECTORY=$(bpgallery_cleanup_directory_name "$ICONSDIRECTORY")
+fi
+
if declare -F "bpgallery_${BPGALLERY_THEME}_page" > /dev/null ; then
BPGALLERY_PAGE_FUNCTION="bpgallery_${BPGALLERY_THEME}_page"
else
}
function generate_thumbs() {
- generate_resized_images $WIDTH icons
+ generate_resized_images $WIDTH $ICONSDIRECTORY
}
function generate_medium() {
- generate_resized_images $MEDIUMWIDTH medium
+ generate_resized_images $MEDIUMWIDTH $MEDIUMDIRECTORY
}
function generate_pages() {
}
function generate_medium_pages() {
- generate_pages __medium medium
+ generate_pages __${MEDIUMDIRECTORY} ${MEDIUMDIRECTORY}
}
function generate_general_page() {
caption=""
fi
- $BPGALLERY_PAGE_FUNCTION > "${PAGESDIRECTORY}$currentpage"
+ $BPGALLERY_PAGE_FUNCTION > "${UNIXPAGESDIRECTORY}$currentpage"
}
if [[ $OUTPUTHTML != 0 ]]; then
$ECHOCOMMAND "Can't write to $PAGESDIRECTORY directory, exiting"
exit 16
fi
+ UNIXPAGESDIRECTORY=$PAGESDIRECTORY/
+ PAGESDIRECTORY=$(bpgallery_escape_url $PAGESDIRECTORY)/
BASEURL="../"
+else
+ BASEURL=""
+ UNIXPAGESDIRECTORY=""
fi
if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then
if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
- generate_pages __medium
+ generate_pages __${MEDIUMDIRECTORY}
else
generate_pages
fi
extra=""
if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
- extra=__medium
+ extra=__${MEDIUMDIRECTORY}
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 [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then link=${PAGESDIRECTORY}$(bpgallery_escape_url "${filename}${extra}.html"); elif [ $GENERATEPAGESFORFULLSIZE != 0 ]; then link=${PAGESDIRECTORY}$(bpgallery_escape_url "${filename}.html"); else link=$(bpgallery_escape_url "$filename"); fi; filename=$(bpgallery_escape_url "$filename"); $BPGALLERY_THUMBSLINE_FUNCTION; done >> ${INDEXDOCUMENT}
$ECHOCOMMAND "Finished generating the page"
$ECHOCOMMAND "Generating stylesheet"
-cd icons
+cd $ICONSDIRECTORY
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)
projects / bpgallery.git / commitdiff