Merge pull request #15545 from mcgratta/master

Python: Add optional argument for smokeview image renderer

Author: mcgratta

Utilities/Python/scripts/make_smv_images.py

@@ -1,11 +1,18 @@
 
-# Make Smokeview images for the FDS Manuals
+# Make Smokeview images for the FDS Manuals.
+# The script uses the command "smokeview" unless you provide an optional name.
 
 import pandas as pd
 import os
 import subprocess
 import shutil
 import platform
+import argparse
+
+parser = argparse.ArgumentParser(description="A script to generate Smokeview images")
+parser.add_argument("message", nargs="?", default="smokeview", help="Optional smokeview name")
+args = parser.parse_args()
+shell_command = args.message
 
 os_name = platform.system()
 
@@ -21,13 +28,19 @@
 folder = df[0].values
 case = df[1].values
 
-smokeview_path = shutil.which('smokeview')
+if os_name == "Linux":
+    result = subprocess.run(["bash", "-i", "-c", f"alias {shell_command} 2>/dev/null | sed -E \"s/alias {shell_command}='(.*)'/\\1/\""],
+                            capture_output=True, text=True)
+    smokeview_path=result.stdout.strip()
+else:
+    smokeview_path = shutil.which(shell_command)
 
 for i in range(len(folder)):
+    print(case[i])
     os.chdir(outdir + folder[i])
     if os_name == "Linux":
-        subprocess.run(['xvfb-run',smokeview_path,'-runscript',case[i]])
+        subprocess.run(['xvfb-run',smokeview_path,'-runscript',case[i]], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     else:
-        subprocess.run([smokeview_path,'-runscript',case[i]])
+        subprocess.run([smokeview_path,'-runscript',case[i]], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     os.chdir(original_dir)