From ed2ccef269ac7ce0f0bc9c6b4e0532092876484a Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 4 Jul 2013 02:14:48 +0400
Subject: [PATCH] more fixes to scripts...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 scripts/process-archive.sh | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/scripts/process-archive.sh b/scripts/process-archive.sh
index 0e4da1bf..7c173464 100755
--- a/scripts/process-archive.sh
+++ b/scripts/process-archive.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ $1 ] ; then
+if [ "$1" ] ; then
 	ARCHIVE_ROOT="$1"
 else
 	ARCHIVE_ROOT="."
@@ -34,12 +34,12 @@ JSON_NAME="%-:1d/${METADATA_DIR}/%f.json"
 #		-srcfile "$PROCESSED_PREVIEW_NAME" -overwrite_original \
 # XXX keep file dates...
 
-exiftool -if '$jpgfromraw' -b -jpgfromraw -w "$PREVIEW_NAME" \
-	-execute -if '$previewimage' -b -previewimage -w "$PREVIEW_NAME" \
-	-execute '-FileModifyDate<DateTimeOriginal' -tagsfromfile @ \
-		-srcfile "$PREVIEW_NAME" -overwrite_original \
-	-execute -j -w "$JSON_NAME" \
-	-common_args --ext jpg -r "$ARCHIVE_ROOT" -progress
+##exiftool -if '$jpgfromraw' -b -jpgfromraw -w "$PREVIEW_NAME" \
+##	-execute -if '$previewimage' -b -previewimage -w "$PREVIEW_NAME" \
+##	-execute '-FileModifyDate<DateTimeOriginal' -tagsfromfile @ \
+##		-srcfile "$PREVIEW_NAME" -overwrite_original \
+##	-execute -j -w "$JSON_NAME" \
+##	-common_args --ext jpg -r "./$ARCHIVE_ROOT" -progress
 
 
 SIZE=900
@@ -85,13 +85,24 @@ makepreview(){
 
 # XXX use find...
 
-cd "${ARCHIVE_ROOT}"
+cd "./${ARCHIVE_ROOT}"
 
-for FROM in */DCIM/hi-res\ \(RAW\)/*jpg ; do
-	TO="${FROM/hi-res\ /preview }"
+# XXX this is ugly but it works...
+if [[ $ARCHIVE_ROOT == "." ]] ; then
+	for FROM in */DCIM/hi-res\ \(RAW\)/*jpg ; do
+		TO="${FROM/hi-res\ /preview }"
+
+		# XXX do different-sized previews...
+		makepreview "$SIZE" "./$FROM" "./$TO"
+	done
+else
+	for FROM in ./DCIM/hi-res\ \(RAW\)/*jpg ; do
+		TO="${FROM/hi-res\ /preview }"
+
+		# XXX do different-sized previews...
+		makepreview "$SIZE" "./$FROM" "./$TO"
+	done
+fi
 
-	# XXX do different-sized previews...
-	makepreview "$SIZE" "./$FROM" "./$TO"
-done
 
 # vim:set nowrap nospell :