1 files changed, 39 insertions, 7 deletions
diff --git a/sources/pyside-tools/deploy_lib/commands.py b/sources/pyside-tools/deploy_lib/commands.py
index 2733dd4c1..53ad633ea 100644
--- a/sources/pyside-tools/deploy_lib/commands.py
+++ b/sources/pyside-tools/deploy_lib/commands.py
@@ -4,29 +4,61 @@
 import subprocess
 import sys
 import logging
+from typing import List
+
+import json
+from pathlib import Path
 
 """
 All utility functions for deployment
 """
 
 
-def run_command(command, dry_run: bool):
+def run_command(command, dry_run: bool, fetch_output: bool = False):
     command_str = " ".join([str(cmd) for cmd in command])
+    output = None
+    is_windows = (sys.platform == "win32")
     try:
         if not dry_run:
-            subprocess.check_call(command, shell=(sys.platform == "win32"))
+            if fetch_output:
+                output = subprocess.check_output(command, shell=is_windows)
+            else:
+                subprocess.check_call(command, shell=is_windows)
         else:
             print(command_str + "\n")
     except FileNotFoundError as error:
-        logging.exception(f"[DEPLOY]: {error.filename} not found")
+        logging.exception(f"[DEPLOY] {error.filename} not found")
         raise
     except subprocess.CalledProcessError as error:
         logging.exception(
-             f"[DEPLOY]: Command {command_str} failed with error {error} and return_code"
-             f"{error.returncode}"
+            f"[DEPLOY] Command {command_str} failed with error {error} and return_code"
+            f"{error.returncode}"
         )
         raise
     except Exception as error:
-        logging.exception(f"[DEPLOY]: Command {command_str} failed with error {error}")
+        logging.exception(f"[DEPLOY] Command {command_str} failed with error {error}")
         raise
-    return command_str
+    return command_str, output
+
+
+def run_qmlimportscanner(qml_files: List[Path], dry_run: bool):
+    """
+        Runs pyside6-qmlimportscanner to find all the imported qml modules
+    """
+    if not qml_files:
+        return []
+
+    qml_modules = []
+    cmd = ["pyside6-qmlimportscanner", "-qmlFiles"]
+    cmd.extend([str(qml_file) for qml_file in qml_files])
+
+    if dry_run:
+        run_command(command=cmd, dry_run=True)
+
+    # we need to run qmlimportscanner during dry_run as well to complete the
+    # command being run by nuitka
+    _, json_string = run_command(command=cmd, dry_run=False, fetch_output=True)
+    json_string = json_string.decode("utf-8")
+    json_array = json.loads(json_string)
+    qml_modules = [item['name'] for item in json_array if item['type'] == "module"]
+    return qml_modules