From 85a7066ecc7a250931c4cfc784742f9ba55a1c74 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Wed, 8 May 2019 18:23:19 +0200
Subject: [PATCH] move php calls from python to shell script

---
 process/accept-orders.py | 10 ++--------
 process/orders-accept    | 27 ++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/process/accept-orders.py b/process/accept-orders.py
index 8dd088c40..5a7124d43 100755
--- a/process/accept-orders.py
+++ b/process/accept-orders.py
@@ -55,9 +55,6 @@ sendmail = True
 maxfiles = 30
 # write headers to file?
 writeheaders = True
-# write received files to database?
-tooldir = os.path.join(rootdir, 'orders-php')
-writedb = os.path.exists(tooldir)
 # reject all html email?
 rejecthtml = True
 
@@ -306,11 +303,8 @@ def accept(game, locale, stream, extend=None):
         warning = " (" + messages["warning-" + locale] + ")"
         msg = msg + formatpar(messages["nodate-" + locale], 76, 2) + "\n"
 
-    if writedb:
-        dirname, basename = os.path.split(filename)
-        cli = os.path.join(tooldir, 'cli.php');
-        dbname = os.path.join(dirname, 'orders.db')
-        subprocess.call(['php', cli, '-d', dbname, 'insert', basename, email])
+    print('ACCEPT_MAIL=' + email)
+    print('ACCEPT_FILE="' + filename + '"')
 
     if not text_ok:
         warning = " (" + messages["error-" + locale] + ")"
diff --git a/process/orders-accept b/process/orders-accept
index 33b3d5ecc..0873352e0 100755
--- a/process/orders-accept
+++ b/process/orders-accept
@@ -1,8 +1,25 @@
 #!/bin/sh
-SCRIPT=$(readlink -f $0)
-cd $(dirname $SCRIPT)
+# example: orders-accept 2 de < mail.txt
 
-lockfile -r3 -l120 orders.queue.lock
-python accept-orders.py "$@"
-rm -f orders.queue.lock
+game="$1"
 
+[ -z "$ERESSEA" ] && ERESSEA="$HOME/eressea"
+SCRIPT=$(readlink -f "$0")
+BIN=$(dirname "$SCRIPT")
+
+LOCKFILE="$ERESSEA/game-$game/orders.queue.lock"
+set -e
+trap 'rm -f "$LOCKFILE"' EXIT
+
+cd "$ERESSEA/game-$game"
+mkdir -p orders.dir
+cd orders.dir
+lockfile -r3 -l120 "$LOCKFILE"
+eval "$(python "$BIN/accept-orders.py" "$@")"
+filename=$(basename "$ACCEPT_FILE")
+email="$ACCEPT_MAIL"
+if [ -d "$ERESSEA/orders-php" ]
+then
+  php "$ERESSEA/orders-php/cli.php" insert "$filename" "$email"
+fi
+rm -f "$LOCKFILE"