summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArun Persaud <arun@nubati.net>2012-06-03 08:27:42 -0700
committerArun Persaud <arun@nubati.net>2012-06-03 08:30:45 -0700
commit98f9d1ee3a154e0b29b34188702dc798414fdd86 (patch)
tree3836f2384869d794a5afd977f777fb2bc6f31461
parentd5cea90a3819cc20f9dedf6ed61d3ad4b6ab4a3b (diff)
downloadphoto-tags-98f9d1ee3a154e0b29b34188702dc798414fdd86.tar.gz
photo-tags-98f9d1ee3a154e0b29b34188702dc798414fdd86.tar.bz2
photo-tags-98f9d1ee3a154e0b29b34188702dc798414fdd86.zip
removed some trailing whitespace
-rw-r--r--.htaccess_template6
-rwxr-xr-xcreate_thumbnails.sh10
-rwxr-xr-xf-spot-db-reduce.sh12
3 files changed, 14 insertions, 14 deletions
diff --git a/.htaccess_template b/.htaccess_template
index f5e86c5..2e94f89 100644
--- a/.htaccess_template
+++ b/.htaccess_template
@@ -6,10 +6,10 @@ RewriteBase /<insert web base url here>
# make the url nice and clean; the comments shows an url that should be matched
-# web_base/tag/me+berlin/pic/id
+# web_base/tag/me+berlin/pic/id
RewriteRule tag/([-_\s,a-zA-Z0-9+]*)/pic/([0-9]*) index.php?tag=$1&pic=$2 [L]
-# web_base/tag/tag1+tag2/page/4
+# web_base/tag/tag1+tag2/page/4
RewriteRule tag/([-_\s,a-zA-Z0-9+]*)/page/([0-9]*) index.php?tag=$1&page=$2 [L]
# web_base/tag/tag1+tag2
@@ -18,7 +18,7 @@ RewriteRule tag/([-_\s,a-zA-Z0-9+]*) index.php?tag=$1 [L]
# web_base/pic/17
RewriteRule pic/([0-9]*) index.php?pic=$1 [L]
-# web_base/page/4
+# web_base/page/4
RewriteRule page/([0-9]*) index.php?page=$1 [L]
</IfModule>
diff --git a/create_thumbnails.sh b/create_thumbnails.sh
index a1c460e..15cae68 100755
--- a/create_thumbnails.sh
+++ b/create_thumbnails.sh
@@ -5,7 +5,7 @@ NICE="nice -19"
# init some variables
removemeta=0
-# parse ini file
+# parse ini file
CONFIG_FILE="config.ini"
# copied and modified from http://mark.aufflick.com/blog/2007/11/08/parsing-ini-files-with-sed
@@ -60,7 +60,7 @@ while [ $done -lt 100 ] ; do
echo "skipping $offset pics, getting 50 new pics to work on..."
# handle white space in filename correctly
FILES=`$NICE sqlite3 $LOCALDB "select replace(base_uri||'/'||filename,' ','%20') from photos limit $offset,100"`
-
+
if [ "x$FILES" != "x" ] ; then
#found some files, process them
for file in $FILES; do
@@ -69,7 +69,7 @@ while [ $done -lt 100 ] ; do
file=${file//\%20/ }
dir=`dirname "$file"`
base=`basename "$file"`
-
+
if [ ! -s "Photos-tiny/$dir/$base" ] ; then
mkdir -p Photos-tiny/$dir
$NICE convert "$dirprefix/$file" -auto-orient -resize x100 -quality 80% "Photos-tiny/$dir/$base"
@@ -80,7 +80,7 @@ while [ $done -lt 100 ] ; do
$NICE jhead -q -se -cl "This photo belongs to $admin and was taken from $webbase. If you want to use this photo, please contact him." "Photos-tiny/$dir/$base"
fi
done=$((done+1))
- fi
+ fi
if [ ! -s "Photos-small/$dir/$base" ] ; then
mkdir -p Photos-small/$dir
$NICE convert "$dirprefix/$file" -auto-orient -resize x600 -quality 80% "Photos-small/$dir/$base"
@@ -91,7 +91,7 @@ while [ $done -lt 100 ] ; do
$NICE jhead -q -se -cl "This photo belongs to $admin and was taken from $webbase. If you want to use this photo, please contact him." "Photos-small/$dir/$base"
fi
done=$((done+1))
- fi
+ fi
echo -n -e "$((done/2)) \r"
done
diff --git a/f-spot-db-reduce.sh b/f-spot-db-reduce.sh
index fc421fe..436e6b1 100755
--- a/f-spot-db-reduce.sh
+++ b/f-spot-db-reduce.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# parse ini file
+# parse ini file
CONFIG_FILE="config.ini"
# copied and modified from http://mark.aufflick.com/blog/2007/11/08/parsing-ini-files-with-sed
@@ -27,12 +27,12 @@ CL_INCLUDE=""
CL_EXCLUDE=""
for i in "$@"; do
- case $i in
+ case $i in
--include=*)
- CL_INCLUDE=${i#*=}
+ CL_INCLUDE=${i#*=}
;;
--exclude=*)
- CL_EXCLUDE=${i#*=}
+ CL_EXCLUDE=${i#*=}
;;
-h|--help)
usage
@@ -69,7 +69,7 @@ fi
# test if localdb already exist:
# yes:
# see if photo-db is newer? yes: merge them; no: do nothing
-# no:
+# no:
# create it
cp $REMOTEDB $LOCALDB
@@ -93,7 +93,7 @@ delete from tags where id not in (select distinct tag_id from photo_tags asc);
delete from rolls where id not in (select distinct roll_id from photos asc);
drop table rmphotoids;
-drop table jobs;
+drop table jobs;
drop table exports;
vacuum;