refactor: process execution #377

AntiMicroX · Feb 12, 2022 · 14a66d3 · 14a66d3
2 parents 74f08e1 + 61fda62
commit 14a66d3
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 41 deletions.
diff --git a/src/event.cpp b/src/event.cpp
@@ -32,6 +32,7 @@
 #include "eventhandlerfactory.h"
 #include "globalvariables.h"
 #include "joybutton.h"
+#include "logger.h"
 
 #if defined(Q_OS_UNIX)
     #if defined(WITH_X11)
@@ -95,38 +96,9 @@ void fakeAbsMouseCoordinates(double springX, double springY, int width, int heig
     finaly = (screenMidheight + (springY * destMidHeight) + deskRect.y());
 }
 
-// Create the event used by the operating system.
-void sendevent(JoyButtonSlot *slot, bool pressed)
-{
-    JoyButtonSlot::JoySlotInputAction device = slot->getSlotMode();
-
-    if (device == JoyButtonSlot::JoyKeyboard)
-    {
-        EventHandlerFactory::getInstance()->handler()->sendKeyboardEvent(slot, pressed);
-    } else if (device == JoyButtonSlot::JoyMouseButton)
-    {
-        EventHandlerFactory::getInstance()->handler()->sendMouseButtonEvent(slot, pressed);
-    } else if ((device == JoyButtonSlot::JoyTextEntry) && pressed && !slot->getTextData().isEmpty())
-    {
-        EventHandlerFactory::getInstance()->handler()->sendTextEntryEvent(slot->getTextData());
-    } else if ((device == JoyButtonSlot::JoyExecute) && pressed && !slot->getTextData().isEmpty())
-    {
-        QString argumentsString = "";
-        if (slot->getExtraData().canConvert<QString>())
-        {
-            argumentsString = slot->getExtraData().toString();
-            // QStringList argumentsTempList(PadderCommon::parseArgumentsString(argumentsString));
-        }
-
-        QString launched_command =
-            QString("%1 %2 %3").arg(detectedScriptExt(slot->getTextData())).arg(slot->getTextData()).arg(argumentsString);
-        qInfo() << "Executing command: " << launched_command;
-        bool success = QProcess::startDetached(launched_command);
-        if (!success)
-            qWarning() << "Command cannot be executed";
-    }
-}
-
+/**
+ * @brief detects executor for selected file (for .py files python, for .exe "" etc)
+ */
 QString detectedScriptExt(QString file)
 {
     QFileInfo fileinfo(file);
@@ -165,6 +137,51 @@ QString detectedScriptExt(QString file)
     return "";
 }
 
+// Create the event used by the operating system.
+void sendevent(JoyButtonSlot *slot, bool pressed)
+{
+    JoyButtonSlot::JoySlotInputAction device = slot->getSlotMode();
+
+    if (device == JoyButtonSlot::JoyKeyboard)
+    {
+        EventHandlerFactory::getInstance()->handler()->sendKeyboardEvent(slot, pressed);
+    } else if (device == JoyButtonSlot::JoyMouseButton)
+    {
+        EventHandlerFactory::getInstance()->handler()->sendMouseButtonEvent(slot, pressed);
+    } else if ((device == JoyButtonSlot::JoyTextEntry) && pressed && !slot->getTextData().isEmpty())
+    {
+        EventHandlerFactory::getInstance()->handler()->sendTextEntryEvent(slot->getTextData());
+    } else if ((device == JoyButtonSlot::JoyExecute) && pressed && !slot->getTextData().isEmpty())
+    {
+        QStringList argumentsTempList = {};
+        QString argumentsString = slot->getExtraData().toString();
+        if (slot->getExtraData().canConvert<QString>())
+        {
+            argumentsTempList = PadderCommon::parseArgumentsString(argumentsString);
+        }
+
+        QProcess process;
+        QString process_executor = detectedScriptExt(slot->getTextData());
+        if (process_executor.isEmpty())
+            process.setProgram(slot->getTextData());
+        else
+        {
+            process.setProgram(process_executor);
+            argumentsTempList.prepend(slot->getTextData());
+        }
+        process.setArguments(argumentsTempList);
+
+        process.setWorkingDirectory(QFileInfo(slot->getTextData()).absoluteDir().path());
+        qint64 pid = 0;
+        bool success = process.startDetached(&pid);
+        if (success)
+            qInfo() << "Command: " << slot->getTextData() << " " << argumentsString
+                    << " executed successfully with pid: " << pid;
+        else
+            qWarning() << "Command " << slot->getTextData() << " " << argumentsString << " cannot be executed, pid: " << pid;
+    }
+}
+
 // Create the relative mouse event used by the operating system.
 void sendevent(int code1, int code2) { EventHandlerFactory::getInstance()->handler()->sendMouseEvent(code1, code2); }
 

diff --git a/src/event.h b/src/event.h
@@ -26,16 +26,10 @@
 void sendevent(JoyButtonSlot *slot, bool pressed = true);
 void sendevent(int code1, int code2);
 void sendKeybEvent(JoyButtonSlot *slot, bool pressed = true);
-void sendSpringEventRefactor(PadderCommon::springModeInfo *fullSpring, PadderCommon::springModeInfo *relativeSpring = 0,
-                             int *const mousePosX = 0, int *const mousePos = 0);
 
 void sendSpringEvent(PadderCommon::springModeInfo *fullSpring, PadderCommon::springModeInfo *relativeSpring = 0,
                      int *const mousePosX = 0, int *const mousePos = 0);
 
-void fakeAbsMouseCoordinates(double springX, double springY, int width, int height, int &finalx, int &finaly,
-                             int screen = -1);
-
-QString detectedScriptExt(QString file);
 int X11KeySymToKeycode(QString key);
 QString keycodeToKeyString(int keycode, int alias = 0);
 int X11KeyCodeToX11KeySym(int keycode);

diff --git a/src/joybutton.cpp b/src/joybutton.cpp
@@ -170,7 +170,7 @@ void JoyButton::vdpadPassEvent(bool pressed, bool ignoresets)
 
 void JoyButton::joyEvent(bool pressed, bool ignoresets)
 {
-    if (Logger::isDebugLevel())
+    if (Logger::isDebugEnabled())
         DEBUG() << "Processing joyEvent for: " << getName();
 
     if ((m_vdpad != nullptr) && !pendingEvent)

diff --git a/src/logger.cpp b/src/logger.cpp
@@ -243,11 +243,20 @@ Logger *Logger::createInstance(QTextStream *stream, LogLevel outputLevel, QObjec
     return instance;
 }
 
-bool Logger::isDebugLevel()
+bool Logger::isDebugEnabled()
 {
     if (instance != nullptr)
     {
         return instance->outputLevel == LogLevel::LOG_DEBUG;
     }
     return false;
 }
+
+QString Logger::getCurrentLogFile()
+{
+    Q_ASSERT(instance != nullptr);
+    if (instance->outputFile.exists())
+        return instance->outputFile.fileName();
+    else
+        return "";
+}
diff --git a/src/logger.h b/src/logger.h
@@ -77,10 +77,11 @@ class Logger : public QObject
 
     static void setLogLevel(LogLevel level);
     LogLevel getCurrentLogLevel();
-    static bool isDebugLevel();
+    static bool isDebugEnabled();
 
     static void setCurrentStream(QTextStream *stream);
     static void setCurrentLogFile(QString filename);
+    static QString getCurrentLogFile();
     bool isWritingToFile();
     static QTextStream *getCurrentStream();