From 6eb31bcf7e0cc950db40b389086bfface03f111f Mon Sep 17 00:00:00 2001
From: root <root@fotobox>
Date: Sun, 11 Feb 2018 15:41:22 +0100
Subject: [PATCH] Verzeichnisse werden nun zur Laufzeit immer wieder angelegt

---
 photobox.py      | 23 ++++++++++-------------
 upload-daemon.sh | 39 ++++++++++++++++++---------------------
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/photobox.py b/photobox.py
index 7d123a0..f0585b8 100755
--- a/photobox.py
+++ b/photobox.py
@@ -74,19 +74,6 @@ session_start	= monotonic_time()
 
 
 
-# CREATE DIRECTORIES
-try:
-	os.makedirs(IMAGES_ORIGINAL)
-except OSError:
-	pass
-
-try:
-	os.makedirs(IMAGES_TODO)
-except OSError:
-	pass
-
-
-
 # INIT GPIO
 GPIO.setmode(GPIO.BOARD)
 GPIO.setwarnings(False)
@@ -342,6 +329,16 @@ def saveImages(choices):
 	local = datetime.datetime.now()
 	session_age = (monotonic_time() - session_start)
 	
+	try:
+		os.makedirs(IMAGES_ORIGINAL)
+	except OSError:
+		pass
+	
+	try:
+		os.makedirs(IMAGES_TODO)
+	except OSError:
+		pass
+	
 	print("saving images...")
 	for i in range(0, SHOT_COUNT):
 		if choices[i] > 0:
diff --git a/upload-daemon.sh b/upload-daemon.sh
index 6a4386e..68af5e0 100755
--- a/upload-daemon.sh
+++ b/upload-daemon.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
 
+DIRNAME=$(dirname "$0")
+REALPATH=$(realpath "$DIRNAME")
+
 INTERVAL="10"
 FAILURE_PAUSE="10"
-LOCAL_FILES="images/0-CURRENT"
+IMAGE_PATH="$REALPATH/images/0-CURRENT"
 
 BASE_URL="https://fotobox.online/upload"
 #BASE_URL="http://fotobox.online:8888/upload"
@@ -11,39 +14,34 @@ BASE_URL="https://fotobox.online/upload"
 FOTOBOX_ID="B8:27:EB:AA:C9:8F"
 FOTOBOX_KEY="eDAOMohrcJY3"
 
-
-cd $(dirname "$0")
-cd "$LOCAL_FILES"
-
-mkdir "todo"   2> /dev/null
-mkdir "upload" 2> /dev/null
-mkdir "lowres" 2> /dev/null
-
 while true; do
 	date=$(date +'%Y-%m-%d %H:%M:%S')
 	
-	cd "todo"
-	todos="$(ls ./)"
+	cd "$IMAGE_PATH"
+	mkdir "todo"   2> /dev/null
+	mkdir "upload" 2> /dev/null
+	mkdir "lowres" 2> /dev/null
+	
+	cd "$IMAGE_PATH/todo"
+	todos="$(find . -maxdepth 1 -type f -name '*.jpg')"
 	if [ "$todos" != "" ]; then
-		echo "$date: uploading files:"
+		echo "$date: converting:"
 		for todo in $todos; do
-			echo "converting..."
-			convert "$todo" -resize 1000x -quality 0.7 "../lowres/$todo"  && cp "../lowres/$todo" "../upload/$todo"  &&  rm -f "$todo"
+			echo -n " - '$todo' ... "
+			( convert "$todo" -resize 1000x -quality 0.7 "../lowres/$todo"  && cp "../lowres/$todo" "../upload/$todo"  &&  rm -f "$todo" && echo "OK" ) || echo "ERROR"
 		done
 		echo ""
 	fi
-	cd ..
 	
-	cd "upload"
-	uploads="$(ls ./)"
+	cd "$IMAGE_PATH/upload"
+	uploads="$(find . -maxdepth 1 -type f -name '*.jpg')"
 	if [ "$uploads" != "" ]; then
-		echo "$date: uploading files:"
+		echo "$date: uploading:"
 		for upload in $uploads; do
-			echo "uploading..."
+			echo -n " - '$upload' ... "
 			timestamp_fotobox=$(date +'%Y-%m-%dT%H:%M:%S.%N%z')
 			timestamp_shot=$(basename "$upload" | sed 's|.jpg||g')
 			url="$BASE_URL/$FOTOBOX_ID/$FOTOBOX_KEY/$timestamp_fotobox/$timestamp_shot/"
-			echo "$url"
 			result=$(curl -s --form "image=@$upload" "$url" 2>&1)
 			echo "$result"
 			if [ "$result" == "OK" ]; then
@@ -54,7 +52,6 @@ while true; do
 		done
 		echo ""
 	fi
-	cd ..
 	
 	# SLEEP
 	sleep $INTERVAL