From 4dd3cb0f54f5c64c5a0263635e5f7c8085dbd3df Mon Sep 17 00:00:00 2001
From: Kumi <git@kumi.email>
Date: Mon, 12 Sep 2022 16:55:01 +0000
Subject: [PATCH] Fix error check

---
 worker.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/worker.py b/worker.py
index 14f8e0a..fd63d0c 100644
--- a/worker.py
+++ b/worker.py
@@ -19,11 +19,10 @@ courses = dict()
 mbzre = re.compile(r"course_(?P<courseid>\d+)_(?P<categoryid>\d+)_(?P<timestamp>\d+).mbz")
 
 def call_php(courseid: int, categoryid: int, timestamp: int):
-    try:
-        subprocess.run(["php", config["IMPORTER"]["PHPScript"], f"--courseid={courseid}", f"--categoryid={categoryid}", f"--timestamp={timestamp}"], cwd=Path(config["IMPORTER"]["PHPScript"]).parent, check=True)
-        return True
-    except subprocess.CalledProcessError:
-        return False
+    response = subprocess.run(["php", config["IMPORTER"]["PHPScript"], f"--courseid={courseid}", f"--categoryid={categoryid}", f"--timestamp={timestamp}"], cwd=Path(config["IMPORTER"]["PHPScript"]).parent, capture_output=True, encoding="utf8")
+    print(response.stdout)
+    print(response.stderr)
+    return (not response.stderr) and  (not "!!!" in response.stdout)
 
 
 for mbz in source.glob("course_*_*_*.mbz"):