From 53a7490fcaf7a94892f22d4e301a105249fcc28f Mon Sep 17 00:00:00 2001
From: Roelf Wichertjes <contact@roelf.org>
Date: Tue, 22 Mar 2022 15:30:22 +0100
Subject: [PATCH] Further tweak scripts.

---
 Dockerfile    |  3 ++-
 entrypoint.sh | 21 +++++++++++++++++++++
 mover.sh      | 34 ++++++++++++++++++----------------
 3 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100755 entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index fdaa264..b0540cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,5 +19,6 @@ USER ab
 WORKDIR /home/ab
 
 COPY mover.sh /home/ab/mover.sh
+COPY entrypoint.sh /home/ab/entrypoint.sh
 
-ENTRYPOINT [ "/tini", "--" ]
+ENTRYPOINT [ "/tini", "--", "/home/ab/entrypoint.sh" ]
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 0000000..0b190b8
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -exuo pipefail
+
+# https://stackoverflow.com/a/2173421
+trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+
+export SHARED_WARCS_DIR="${SHARED_WARCS_DIR:-/data/}"
+
+export INCOMING="${INCOMING:-${SHARED_WARCS_DIR}/incoming/}"
+export UPLOAD_QUEUE="${UPLOAD_QUEUE:-${SHARED_WARCS_DIR}/upload-queue/}"
+
+mkdir -pv "${INCOMING}"
+mkdir -pv "${UPLOAD_QUEUE}"
+
+case "$1" in
+	"mover")
+		./mover.sh
+		;;
+
+esac
+
diff --git a/mover.sh b/mover.sh
index 4b49957..22a497a 100755
--- a/mover.sh
+++ b/mover.sh
@@ -2,22 +2,24 @@
 
 set -euo pipefail
 
-INCOMING="${INCOMING:-/data/incoming/}"
-UPLOAD_QUEUE="${UPLOAD_QUEUE:-/data/upload-queue/}"
+export INCOMING="${INCOMING:-/data/incoming/}"
+export UPLOAD_QUEUE="${UPLOAD_QUEUE:-/data/upload-queue/}"
 
-# find every .warc.gz in the rsync directory
-find "${INCOMING}" -type f -not -name ".*"\
-| while read filename
-do
-  # skip partial uploads
-  if [[ $filename =~ rsync-tmp ]]
-  then
-    continue
-  fi
+while [[ 1 ]] ; do
+	# find every .warc.gz in the rsync directory
+	find "${INCOMING}" -type f -not -name ".*"\
+	| while read filename
+	do
+		# skip partial uploads
+		if [[ $filename =~ rsync-tmp ]]
+		then
+			continue
+		fi
+		echo "Moving ${filename}"
+		mkdir -vp "${UPLOAD_QUEUE}"
+		echo mv -v "${filename}" "${UPLOAD_QUEUE}/"
+	done
 
-  echo "Moving ${filename}"
-  mkdir -vp "${UPLOAD_QUEUE}"
-  mv -v "${filename}" "${UPLOAD_QUEUE}/"
+	echo "Sleeping 30 seconds..."
+	sleep 30
 done
-
-