mirror sql file movement

conf/teatrade/push

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-[ ! -d /var/src/teatrader ] && \
-	cd /var/src && \
-	git clone git@git.engler-labs.root64.de:fabolous005/teatrader.git && \
-	return 1;
-cd /var/src/teatrader
-
-git pull
-
-cargo build --release
-
-rsync -av ./static ./templates ./.env /var/lib/teatrader-edge/
-cp ./target/release/teatrade /var/lib/teatrader-edge/teatrade-edge
-
-killall teatrade-edge
-
-cd /var/lib/teatrader-edge/
-
-exec teatrade-edge

conf/teatrade/release

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-[ ! -d /var/src/teatrader ] && \
-	cd /var/src && \
-	git clone git@git.engler-labs.root64.de:fabolous005/teatrader.git && \
-	return 1;
-cd /var/src/teatrader
-
-tag=$(curl -s $GITEA/api/v1/repos/$OWNER/$REPO/releases/latest \
-  | jq -r .tag_name)
-
-git checkout "$tag"
-
-cargo build --release
-
-rsync -av ./static ./templates ./.env /var/lib/teatrader-stable/
-cp ./target/release/teatrade /var/lib/teatrader-stable/teatrade-stable
-
-killall teatrade-stable
-
-cd /var/lib/teatrader-stable/
-
-exec teatrade-stable

conf/teatrader/push

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+[ ! -d /var/src/teatrader ] && \
+	cd /var/src && \
+	git clone git@git.engler-labs.root64.de:fabolous005/teatrader.git && \
+	return 1;
+cd /var/src/teatrader
+mkdir /var/lib/teatrader-edge
+mkdir /tmp/teatrader/
+
+cp ./sql/teatrader.sql /tmp/teatrader/teatrader.sql
+
+git checkout main
+git pull
+
+if ! diff -q /tmp/teatrader/teatrader.sql ./sql/teatrader.sql >/dev/null; then
+	./renew_sql.sh
+fi
+
+cargo build --release
+
+rsync -av --delete ./Rocket.toml ./static ./templates ./.env /var/lib/teatrader-edge/
+
+killall -s 9 teatrader-edge
+cp ./target/release/teatrader /var/lib/teatrader-edge/teatrader-edge
+
+cd /var/lib/teatrader-edge/
+
+ROCKET_PROFILE=edge ./teatrader-edge &
+
+exit 0

conf/teatrader/release

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+[ ! -d /var/src/teatrader ] && \
+	cd /var/src && \
+	git clone git@git.engler-labs.root64.de:fabolous005/teatrader.git && \
+	return 1;
+cd /var/src/teatrader
+mkdir /var/lib/teatrader-testing
+mkdir /tmp/teatrader/
+
+cp ./teatrader.sql /tmp/teatrader/teatrader.sql
+
+
+tag=$(curl -s -H "Authorization: token $(cat ~/.webbump-secret)" \
+	https://git.engler-labs.root64.de/api/v1/repos/fabolous005/teatrader/releases/latest |\
+	jq -r .tag_name)
+
+git checkout "$tag"
+
+if ! diff -q /tmp/teatrader/teatrader.sql ./teatrader.sql >/dev/null; then
+	./renew_sql.sh
+fi
+
+cargo build --release
+
+rsync -av --delete ./Rocket.toml ./static ./templates ./.env /var/lib/teatrader-testing/
+
+killall -s 9 teatrader-testing
+cp ./target/release/teatrader /var/lib/teatrader-testing/teatrader-testing
+
+cd /var/lib/teatrader-testing/
+
+ROCKET_PROFILE=testing ./teatrader-testing &
+
+exit 0

main.py

@@ -58,7 +58,7 @@ def gitea_webhook():
     try:
         subprocess.run([script_path, *args], check=True)
     except subprocess.CalledProcessError as e:
-        logger.error(repo_name + " " + script_name + " script failed with exit code: " + e)
+        logger.error(f"{repo_name} {event_type} script failed with exit code: {e}")
         return jsonify({"error": f"Script failed: {e}"}), 500
 
     logger.info("Script executed successfully")