|
|
|
@ -1,23 +1,63 @@
|
|
|
|
|
#include "processinvoker.hpp"
|
|
|
|
|
|
|
|
|
|
#include <QMessageBox>
|
|
|
|
|
#include <QProcess>
|
|
|
|
|
#include <QStringList>
|
|
|
|
|
#include <QString>
|
|
|
|
|
#include <QFileInfo>
|
|
|
|
|
#include <QFile>
|
|
|
|
|
#include <QDir>
|
|
|
|
|
#include <QDebug>
|
|
|
|
|
|
|
|
|
|
Process::ProcessInvoker::ProcessInvoker()
|
|
|
|
|
Process::ProcessInvoker::ProcessInvoker(QWidget *parent)
|
|
|
|
|
{
|
|
|
|
|
mProcess = new QProcess(this);
|
|
|
|
|
|
|
|
|
|
mName = QString();
|
|
|
|
|
mArguments = QStringList();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Process::ProcessInvoker::~ProcessInvoker()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//void Process::ProcessInvoker::setProcessName(const QString &name)
|
|
|
|
|
//{
|
|
|
|
|
// mName = name;
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
//void Process::ProcessInvoker::setProcessArguments(const QStringList &arguments)
|
|
|
|
|
//{
|
|
|
|
|
// mArguments = arguments;
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
QProcess* Process::ProcessInvoker::getProcess()
|
|
|
|
|
{
|
|
|
|
|
return mProcess;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//QString Process::ProcessInvoker::getProcessName()
|
|
|
|
|
//{
|
|
|
|
|
// return mName;
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
//QStringList Process::ProcessInvoker::getProcessArguments()
|
|
|
|
|
//{
|
|
|
|
|
// return mArguments;
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
bool Process::ProcessInvoker::startProcess(const QString &name, const QStringList &arguments, bool detached)
|
|
|
|
|
{
|
|
|
|
|
// mProcess = new QProcess(this);
|
|
|
|
|
|
|
|
|
|
connect(mProcess, SIGNAL(error(QProcess::ProcessError)),
|
|
|
|
|
this, SLOT(processError(QProcess::ProcessError)));
|
|
|
|
|
|
|
|
|
|
connect(mProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
|
|
|
|
|
this, SLOT(processFinished(int,QProcess::ExitStatus)));
|
|
|
|
|
|
|
|
|
|
mName = name;
|
|
|
|
|
mArguments = arguments;
|
|
|
|
|
|
|
|
|
|
QString path(name);
|
|
|
|
|
#ifdef Q_OS_WIN
|
|
|
|
|
path.append(QLatin1String(".exe"));
|
|
|
|
@ -28,7 +68,6 @@ bool Process::ProcessInvoker::startProcess(const QString &name, const QStringLis
|
|
|
|
|
path.prepend(QLatin1String("./"));
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
QProcess process;
|
|
|
|
|
QFileInfo info(path);
|
|
|
|
|
|
|
|
|
|
if (!info.exists()) {
|
|
|
|
@ -57,7 +96,7 @@ bool Process::ProcessInvoker::startProcess(const QString &name, const QStringLis
|
|
|
|
|
|
|
|
|
|
// Start the executable
|
|
|
|
|
if (detached) {
|
|
|
|
|
if (!process.startDetached(path, arguments)) {
|
|
|
|
|
if (!mProcess->startDetached(path, arguments)) {
|
|
|
|
|
QMessageBox msgBox;
|
|
|
|
|
msgBox.setWindowTitle(tr("Error starting executable"));
|
|
|
|
|
msgBox.setIcon(QMessageBox::Critical);
|
|
|
|
@ -65,30 +104,70 @@ bool Process::ProcessInvoker::startProcess(const QString &name, const QStringLis
|
|
|
|
|
msgBox.setText(tr("<html><head/><body><p><b>Could not start %1</b></p> \
|
|
|
|
|
<p>An error occurred while starting %1.</p> \
|
|
|
|
|
<p>Press \"Show Details...\" for more information.</p></body></html>").arg(info.fileName()));
|
|
|
|
|
msgBox.setDetailedText(process.errorString());
|
|
|
|
|
msgBox.setDetailedText(mProcess->errorString());
|
|
|
|
|
msgBox.exec();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
process.start(path, arguments);
|
|
|
|
|
if (!process.waitForFinished()) {
|
|
|
|
|
mProcess->start(path, arguments);
|
|
|
|
|
|
|
|
|
|
// if (!mProcess->waitForFinished()) {
|
|
|
|
|
// QMessageBox msgBox;
|
|
|
|
|
// msgBox.setWindowTitle(tr("Error starting executable"));
|
|
|
|
|
// msgBox.setIcon(QMessageBox::Critical);
|
|
|
|
|
// msgBox.setStandardButtons(QMessageBox::Ok);
|
|
|
|
|
// msgBox.setText(tr("<html><head/><body><p><b>Could not start %1</b></p> \
|
|
|
|
|
// <p>An error occurred while starting %1.</p> \
|
|
|
|
|
// <p>Press \"Show Details...\" for more information.</p></body></html>").arg(info.fileName()));
|
|
|
|
|
// msgBox.setDetailedText(mProcess->errorString());
|
|
|
|
|
// msgBox.exec();
|
|
|
|
|
|
|
|
|
|
// return false;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// if (mProcess->exitCode() != 0 || mProcess->exitStatus() == QProcess::CrashExit) {
|
|
|
|
|
// QString error(mProcess->readAllStandardError());
|
|
|
|
|
// error.append(tr("\nArguments:\n"));
|
|
|
|
|
// error.append(arguments.join(" "));
|
|
|
|
|
|
|
|
|
|
// QMessageBox msgBox;
|
|
|
|
|
// msgBox.setWindowTitle(tr("Error running executable"));
|
|
|
|
|
// msgBox.setIcon(QMessageBox::Critical);
|
|
|
|
|
// msgBox.setStandardButtons(QMessageBox::Ok);
|
|
|
|
|
// msgBox.setText(tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
|
|
|
|
|
// <p>An error occurred while running %1.</p> \
|
|
|
|
|
// <p>Press \"Show Details...\" for more information.</p></body></html>").arg(info.fileName()));
|
|
|
|
|
// msgBox.setDetailedText(error);
|
|
|
|
|
// msgBox.exec();
|
|
|
|
|
|
|
|
|
|
// return false;
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Process::ProcessInvoker::processError(QProcess::ProcessError error)
|
|
|
|
|
{
|
|
|
|
|
QMessageBox msgBox;
|
|
|
|
|
msgBox.setWindowTitle(tr("Error starting executable"));
|
|
|
|
|
msgBox.setWindowTitle(tr("Error running executable"));
|
|
|
|
|
msgBox.setIcon(QMessageBox::Critical);
|
|
|
|
|
msgBox.setStandardButtons(QMessageBox::Ok);
|
|
|
|
|
msgBox.setText(tr("<html><head/><body><p><b>Could not start %1</b></p> \
|
|
|
|
|
<p>An error occurred while starting %1.</p> \
|
|
|
|
|
<p>Press \"Show Details...\" for more information.</p></body></html>").arg(info.fileName()));
|
|
|
|
|
msgBox.setDetailedText(process.errorString());
|
|
|
|
|
msgBox.setText(tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
|
|
|
|
|
<p>An error occurred while running %1.</p> \
|
|
|
|
|
<p>Press \"Show Details...\" for more information.</p></body></html>").arg(mName));
|
|
|
|
|
msgBox.setDetailedText(mProcess->errorString());
|
|
|
|
|
msgBox.exec();
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (process.exitCode() != 0 || process.exitStatus() == QProcess::CrashExit) {
|
|
|
|
|
QString error(process.readAllStandardError());
|
|
|
|
|
void Process::ProcessInvoker::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
|
|
|
|
|
{
|
|
|
|
|
if (exitCode != 0 || exitStatus == QProcess::CrashExit) {
|
|
|
|
|
QString error(mProcess->readAllStandardError());
|
|
|
|
|
error.append(tr("\nArguments:\n"));
|
|
|
|
|
error.append(arguments.join(" "));
|
|
|
|
|
error.append(mArguments.join(" "));
|
|
|
|
|
|
|
|
|
|
QMessageBox msgBox;
|
|
|
|
|
msgBox.setWindowTitle(tr("Error running executable"));
|
|
|
|
@ -96,14 +175,8 @@ bool Process::ProcessInvoker::startProcess(const QString &name, const QStringLis
|
|
|
|
|
msgBox.setStandardButtons(QMessageBox::Ok);
|
|
|
|
|
msgBox.setText(tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
|
|
|
|
|
<p>An error occurred while running %1.</p> \
|
|
|
|
|
<p>Press \"Show Details...\" for more information.</p></body></html>").arg(info.fileName()));
|
|
|
|
|
<p>Press \"Show Details...\" for more information.</p></body></html>").arg(mName));
|
|
|
|
|
msgBox.setDetailedText(error);
|
|
|
|
|
msgBox.exec();
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|