monitor_upload.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-INTERVAL="10"
-
-while true; do
-	uploads="$(find "$(dirname "$0")/images/0-CURRENT/upload" -maxdepth 1 -type f -name '*.jpg')"
-	if [ "$uploads" != "" ]; then
-		scp $uploads root@10.17.0.2:/root/monitor/images && rm -f $uploads
-	fi
-	sleep $INTERVAL
-done

photobox.py

@@ -74,7 +74,6 @@ THUMB_HEIGHT	= int(THUMB_WIDTH / 1.333)
 
 IMAGES_ORIGINAL	= os.path.join(IMAGE_DIR, "original")
 IMAGES_TODO		= os.path.join(IMAGE_DIR, "todo")
-IMAGES_UPLOAD	= os.path.join(IMAGE_DIR, "upload")
 
 
 
@@ -232,8 +231,8 @@ def waitForBegin():
 	
 	# wait
 	pos = waitForTouch()
-	# if pos[0] > 720 and pos[1] > 400:
+	if pos[0] > 720 and pos[1] > 400:
-	# 	maintainance()
+		maintainance()
 
 
 
@@ -257,7 +256,7 @@ def makePhotos():
 	camera.vflip = False
 	camera.hflip = True
 	camera.resolution = (2592, 1944)
-	camera.rotation = 0
+	camera.rotation = 90
 	camera.start_preview()
 	
 	# COUNTDOWN
@@ -302,7 +301,7 @@ def chooseImages():
 		img	= pygame.transform.scale(img, (THUMB_WIDTH, THUMB_HEIGHT))
 		rect	= img.get_rect()
 		rect.x  = x
-		rect.y  = 120
+		rect.y  = 146
 		
 		img_tmp.append(img)
 		rect_tmp.append(rect)
@@ -338,7 +337,7 @@ def chooseImages():
 				(img, rect) = gfx["no"]
 			
 			rect.x = x + (THUMB_WIDTH - rect.width) / 2
-			rect.y = 300
+			rect.y = 340
 			screen.blit(img, rect)
 			
 			x = x + THUMB_WIDTH + BORDER
@@ -348,13 +347,13 @@ def chooseImages():
 		
 		# wait for new event (touch screen / mouse / keyboard)
 		pos = waitForTouch()
-		if pos[1] < 400:
+		if pos[1] > 140:
 			# toggle image
 			i = int(floor((pos[0] - BORDER / 2) / (THUMB_WIDTH + BORDER)))
 			if i >= 0 and i < SHOT_COUNT:
 				choices[i] = (choices[i] + 1) % 2
 			
-		elif pos[1] > 420:
+		elif pos[1] < 100:
 			# top menu buttons
 			if pos[0] > 0 and pos[0] < 266:
 				cancel = True
@@ -385,11 +384,6 @@ def saveImages(choices):
 	except OSError:
 		pass
 	
-	try:
-		os.makedirs(IMAGES_UPLOAD)
-	except OSError:
-		pass
-	
 	print("saving images...")
 	for i in range(0, SHOT_COUNT):
 		if choices[i] > 0:
@@ -400,11 +394,9 @@ def saveImages(choices):
 			path_tmp = "tmp%s.jpg" % i
 			path_original = os.path.join(IMAGES_ORIGINAL, filename)
 			path_todo = os.path.join(IMAGES_TODO, filename)
-			path_upload = os.path.join(IMAGES_UPLOAD, filename)
 			
 			os.rename(path_tmp, path_original)
 			copyfile(path_original, path_todo)
-			os.rename(path_todo, path_upload)
 
 
 

printer.py

@@ -1,9 +0,0 @@
-#!/usr/bin/python
-
-from escpos.printer import Serial
-
-printer = Serial(devfile='/dev/usb/lp0', baudrate=9600)
-
-printer.text("Test")
-printer.qr("https://fotobox.online/")
-printer.cut()

upload-daemon.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+DIRNAME=$(dirname "$0")
+REALPATH=$(realpath "$DIRNAME")
+
+INTERVAL="10"
+FAILURE_PAUSE="10"
+IMAGE_PATH="$REALPATH/images/0-CURRENT"
+
+BASE_URL="https://fotobox.online/upload"
+#BASE_URL="http://fotobox.online:8888/upload"
+#BASE_URL="http://10.50.0.30:8888/upload"
+
+FOTOBOX_ID="B8:27:EB:AA:C9:8F"
+FOTOBOX_KEY="eDAOMohrcJY3"
+
+while true; do
+	date=$(date +'%Y-%m-%d %H:%M:%S')
+	
+	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: converting:"
+		for todo in $todos; do
+			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 "$IMAGE_PATH/upload"
+	uploads="$(find . -maxdepth 1 -type f -name '*.jpg')"
+	if [ "$uploads" != "" ]; then
+		echo "$date: uploading:"
+		for upload in $uploads; do
+			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/"
+			result=$(curl -s --form "image=@$upload" "$url" 2>&1)
+			echo "$result"
+			if [ "$result" == "OK" ]; then
+				rm -f "$upload"
+			else
+				sleep $FAILURE_PAUSE
+			fi
+		done
+		echo ""
+	fi
+	
+	# SLEEP
+	sleep $INTERVAL
+done

upload.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-DIRECTORY="/data0/FotoboxSync/0-CURRENT/"
-
-cd "$(dirname "$0")" || exit 1
-
-while true; do
-
-    list="$(ls images/0-CURRENT/upload/* 2>/dev/null)"
-    
-    if [ "$list" != "" ]; then
-        ssh media@10.0.0.50 mkdir -p $DIRECTORY
-        
-        count=$(echo "$list" | wc -l)
-        echo "found $count files"
-
-        sync
-        sleep 3
-        sync
-    
-        echo "$list" | while read file; do
-        
-            echo "Uploading:"
-            echo "$file"
-            
-            scp "$file" media@10.0.0.50:"$DIRECTORY"
-            success="$?"
-            
-            if [ "$success" == "0" ]; then
-                echo "OK"
-                rm -f "$file"
-            else
-                echo "FAIL"
-            fi
-            
-            echo ""
-        
-            sleep 1
-        
-        done
-        
-    fi
-    
-    sleep 60
-    
-done