From b6af6845830f2efae3fac007159df4808af29e3f Mon Sep 17 00:00:00 2001
From: Jeffrey Crowell <github@crowell.biz>
Date: Thu, 21 Jul 2022 19:12:43 -0400
Subject: [PATCH] allow roms with spaces to be extracted (#868)

using subprocess instead of os.system() is a little safer, and allows
for roms with spaces to be extraced.

i've noticed this is somewhat common in people reporting issues on
discord.
---
 OTRExporter/extract_assets.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/OTRExporter/extract_assets.py b/OTRExporter/extract_assets.py
index 6862fb074..407760b8f 100755
--- a/OTRExporter/extract_assets.py
+++ b/OTRExporter/extract_assets.py
@@ -5,6 +5,7 @@ import shutil
 from rom_info import Z64Rom
 import rom_chooser
 import struct
+import subprocess
 
 def BuildOTR(xmlPath, rom):
     shutil.copytree("assets", "Extract/assets")
@@ -13,11 +14,13 @@ def BuildOTR(xmlPath, rom):
     with open("Extract/version", "wb") as f:
         f.write(struct.pack('<L', checksum))
 
-    execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
-    execStr += " ed -i %s -b %s -fl CFG/filelists -o placeholder -osf placeholder -gsf 1 -rconf CFG/Config.xml -se OTR" % (xmlPath, rom)
+    zapd_exe = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
+    exec_cmd = [zapd_exe, "ed", "-i", xmlPath, "-b", rom, "-fl", "CFG/filelists",
+            "-o", "placeholder", "-osf", "placeholder", "-gsf", "1",
+            "-rconf", "CFG/Config.xml", "-se", "OTR"]
 
-    print(execStr)
-    exitValue = os.system(execStr)
+    print(exec_cmd)
+    exitValue = subprocess.call(exec_cmd)
     if exitValue != 0:
         print("\n")
         print("Error when building the OTR file...", file=os.sys.stderr)