make process not blocking

onProcessFinished callback takes care of resetting env and command args

Author: noisecode3

requirements.txt

@@ -3,4 +3,3 @@ pillow
 cryptography
 pycurl
 tqdm
-git+https://github.com/ueber-devel/ueberzug.git

src/File.cpp

@@ -0,0 +1,12 @@
+/* TombRaiderLinuxLauncher
+ * Martin Bångens Copyright (C) 2025
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */

src/File.hpp

@@ -0,0 +1,24 @@
+/* TombRaiderLinuxLauncher
+ * Martin Bångens Copyright (C) 2025
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef SRC_FILE_HPP_
+#define SRC_FILE_HPP_
+
+#include <QString>
+#include <QFileInfo>
+#include <QFile>
+#include <QDir>
+
+class File {
+};
+
+#endif  // SRC_FILE_HPP_

src/FileManager.cpp

@@ -20,7 +20,7 @@
 #include <QByteArray>
 #include <QDataStream>
 #include "../src/GameFileTree.hpp"
-#include "../miniz/miniz.h"
+#include "../miniz/miniz.h"  // IWYU pragma: keep
 #include "../miniz/miniz_zip.h"
 #include "../src/gameFileTreeData.hpp"
 #include "../src/binary.hpp"

src/Runner.cpp

@@ -19,6 +19,21 @@
 Runner::Runner() : m_env(QProcessEnvironment::systemEnvironment()) {
     m_status = 0;
     m_setupFlag = false;
+
+    // Merge stderr into stdout
+    m_process.setProcessChannelMode(QProcess::MergedChannels);
+
+    // Connect single output handler
+    QObject::connect(&m_process, &QProcess::readyReadStandardOutput,
+                     this,       &Runner::handleOutput);
+
+
+    // Connect to clean up and singnal View function
+    QObject::connect(
+            &m_process,
+            QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
+            this,
+            &Runner::onProcessFinished);
 }
 
 Runner::Runner(const QString& cmd)
@@ -47,47 +62,41 @@ void Runner::setWorkingDirectory(const QString& cwd) {
     m_process.setWorkingDirectory(cwd);
 }
 
-
 void Runner::toggleSetupFlag() {
     m_setupFlag = !m_setupFlag;
 }
 
 void Runner::run() {
-    int status = 1;
-
     m_process.setProcessEnvironment(m_env);
     m_process.setProgram(m_command);
+
     if (m_setupFlag) {
         m_arguments << "-setup";
     }
     m_process.setArguments(m_arguments);
 
-    // Merge stderr into stdout
-    m_process.setProcessChannelMode(QProcess::MergedChannels);
-
-    // Connect single output handler
-    QObject::connect(&m_process, &QProcess::readyReadStandardOutput,
-                     this,       &Runner::handleOutput);
-
     m_process.start();
-    bool hasStarted = m_process.waitForStarted();
-
-    if (hasStarted) {
-        bool finished = false;
-        finished = m_process.waitForFinished();
-        if (finished) {
-            status = 0;
-        }
+    if (!m_process.waitForStarted()) {
+        qWarning() << "Process failed to start!";
+        qWarning() << "Error: " << m_process.errorString();
+        m_status = 1;
     }
+}
 
-    if (status != 0) {
-        qWarning() << "Failed to start or finish process!";
+void Runner::onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus) {
+    if (exitStatus == QProcess::NormalExit) {
+        qDebug() << "Process exited normally with code:" << exitCode;
+        m_status = exitCode;
+    } else {
+        qWarning() << "Process crashed or was killed!";
+        m_status = 1;
     }
 
     m_env.clear();
+    m_env.insert(QProcessEnvironment::systemEnvironment());
+
     m_arguments.clear();
     m_setupFlag = false;
-    m_status = status;
 }
 
 void Runner::handleOutput() {

src/Runner.hpp

@@ -35,9 +35,8 @@ class Runner : public QObject {
     void clearArguments();
     void toggleSetupFlag();
 
- signals:
-    void started();
-    void stopped();
+ private slots:
+    void onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
 
  private:
     void handleOutput();