patrick/Fotobox1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Verzeichnisse werden nun zur Laufzeit immer wieder angelegt

Browse Source
This commit is contained in:
root 2018-02-11 15:41:22 +01:00
parent 245158b039
commit 6eb31bcf7e
2 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
photobox.py
View File

@ -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 # INIT GPIO
GPIO.setmode(GPIO.BOARD) GPIO.setmode(GPIO.BOARD)
GPIO.setwarnings(False) GPIO.setwarnings(False)
@ -342,6 +329,16 @@ def saveImages(choices):
local = datetime.datetime.now() local = datetime.datetime.now()
session_age = (monotonic_time() - session_start) 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...") print("saving images...")
for i in range(0, SHOT_COUNT): for i in range(0, SHOT_COUNT):
if choices[i] > 0: if choices[i] > 0:

39
upload-daemon.sh
View File

@ -1,8 +1,11 @@
#!/bin/bash #!/bin/bash
DIRNAME=$(dirname "$0")
REALPATH=$(realpath "$DIRNAME")
INTERVAL="10" INTERVAL="10"
FAILURE_PAUSE="10" FAILURE_PAUSE="10"
LOCAL_FILES="images/0-CURRENT" IMAGE_PATH="$REALPATH/images/0-CURRENT"
BASE_URL="https://fotobox.online/upload" BASE_URL="https://fotobox.online/upload"
#BASE_URL="http://fotobox.online:8888/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_ID="B8:27:EB:AA:C9:8F"
FOTOBOX_KEY="eDAOMohrcJY3" 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 while true; do
date=$(date +'%Y-%m-%d %H:%M:%S') date=$(date +'%Y-%m-%d %H:%M:%S')
cd "todo" cd "$IMAGE_PATH"
todos="$(ls ./)" 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 if [ "$todos" != "" ]; then
echo "$date: uploading files:" echo "$date: converting:"
for todo in $todos; do for todo in $todos; do
echo "converting..." echo -n " - '$todo' ... "
convert "$todo" -resize 1000x -quality 0.7 "../lowres/$todo" && cp "../lowres/$todo" "../upload/$todo" && rm -f "$todo" ( convert "$todo" -resize 1000x -quality 0.7 "../lowres/$todo" && cp "../lowres/$todo" "../upload/$todo" && rm -f "$todo" && echo "OK" ) || echo "ERROR"
done done
echo "" echo ""
fi fi
cd ..
cd "upload" cd "$IMAGE_PATH/upload"
uploads="$(ls ./)" uploads="$(find . -maxdepth 1 -type f -name '*.jpg')"
if [ "$uploads" != "" ]; then if [ "$uploads" != "" ]; then
echo "$date: uploading files:" echo "$date: uploading:"
for upload in $uploads; do for upload in $uploads; do
echo "uploading..." echo -n " - '$upload' ... "
timestamp_fotobox=$(date +'%Y-%m-%dT%H:%M:%S.%N%z') timestamp_fotobox=$(date +'%Y-%m-%dT%H:%M:%S.%N%z')
timestamp_shot=$(basename "$upload" | sed 's|.jpg||g') timestamp_shot=$(basename "$upload" | sed 's|.jpg||g')
url="$BASE_URL/$FOTOBOX_ID/$FOTOBOX_KEY/$timestamp_fotobox/$timestamp_shot/" url="$BASE_URL/$FOTOBOX_ID/$FOTOBOX_KEY/$timestamp_fotobox/$timestamp_shot/"
echo "$url"
result=$(curl -s --form "image=@$upload" "$url" 2>&1) result=$(curl -s --form "image=@$upload" "$url" 2>&1)
echo "$result" echo "$result"
if [ "$result" == "OK" ]; then if [ "$result" == "OK" ]; then
@ -54,7 +52,6 @@ while true; do
done done
echo "" echo ""
fi fi
cd ..
# SLEEP # SLEEP
sleep $INTERVAL sleep $INTERVAL