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\d+)_(?P\d+)_(?P\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"):