From f01e2d9a40bf3b038680f8b874ce7fba52ad6138 Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Wed, 20 Apr 2022 05:13:48 -0400 Subject: [PATCH] Fix some ideas from import testing (#2093) * Add some local changes that didn't make it into the previous PR * Works on #2087 --- CTFd/utils/exports/__init__.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CTFd/utils/exports/__init__.py b/CTFd/utils/exports/__init__.py index 27f05b77..8743f8df 100644 --- a/CTFd/utils/exports/__init__.py +++ b/CTFd/utils/exports/__init__.py @@ -437,9 +437,18 @@ def import_ctf(backup, erase=True): def background_import_ctf(backup): + # Empty out import status trackers + cache.set("import_start_time", value=None) + cache.set("import_end_time", value=None) + cache.set("import_status", value=None) + cache.set("import_error", value=None) + # The manage.py script will delete the backup for us f = tempfile.NamedTemporaryFile(delete=False) + + # Store the backup file in our tempfile backup.save(f.name) + python = sys.executable # Get path of Python interpreter manage_py = Path(app.root_path).parent / "manage.py" # Path to manage.py subprocess.Popen( # nosec B603