Merge pull request #80 from oblivioncth/cross_platform_bider

Make ProcessBider cross platform
oblivioncth · Nov 19, 2023 · 8672255 · 8672255
2 parents 53794f0 + 1588793
commit 8672255
Show file tree

Hide file tree

Showing 8 changed files with 349 additions and 229 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -57,6 +57,9 @@ set(CLIFP_SOURCE
     tools/mounter_qmp.cpp
     tools/mounter_router.h
     tools/mounter_router.cpp
+    tools/processbider_p.h
+    tools/processbider.h
+    tools/processbider.cpp
     frontend/message.h
     frontend/statusrelay.h
     frontend/statusrelay.cpp
@@ -90,8 +93,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
         task/t-exec_win.cpp
         task/t-bideprocess.h
         task/t-bideprocess.cpp
-        tools/processbider.h
-        tools/processbider.cpp
+        tools/processbider_p_win.cpp
     )
 
     list(APPEND CLIFP_LINKS
@@ -106,6 +108,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
         task/t-awaitdocker.h
         task/t-awaitdocker.cpp
         task/t-exec_linux.cpp
+        tools/processbider_p_linux.cpp
     )
     list(APPEND CLIFP_LINKS
         PRIVATE

diff --git a/app/src/task/t-bideprocess.cpp b/app/src/task/t-bideprocess.cpp
@@ -1,29 +1,6 @@
 // Unit Include
 #include "t-bideprocess.h"
 
-//===============================================================================================================
-// TBideProcessError
-//===============================================================================================================
-
-//-Constructor-------------------------------------------------------------
-//Private:
-TBideProcessError::TBideProcessError(Type t, const QString& s) :
-    mType(t),
-    mSpecific(s)
-{}
-
-//-Instance Functions-------------------------------------------------------------
-//Public:
-bool TBideProcessError::isValid() const { return mType != NoError; }
-QString TBideProcessError::specific() const { return mSpecific; }
-TBideProcessError::Type TBideProcessError::type() const { return mType; }
-
-//Private:
-Qx::Severity TBideProcessError::deriveSeverity() const { return Qx::Err; }
-quint32 TBideProcessError::deriveValue() const { return mType; }
-QString TBideProcessError::derivePrimary() const { return ERR_STRINGS.value(mType); }
-QString TBideProcessError::deriveSecondary() const { return mSpecific; }
-
 //===============================================================================================================
 // TBideProcess
 //===============================================================================================================
@@ -32,9 +9,10 @@ QString TBideProcessError::deriveSecondary() const { return mSpecific; }
 //Public:
 TBideProcess::TBideProcess(QObject* parent) :
     Task(parent),
-    mProcessBider(nullptr, STANDARD_GRACE)
+    mProcessBider(nullptr)
 {
     // Setup bider
+    mProcessBider.setRespawnGrace(STANDARD_GRACE);
     connect(&mProcessBider, &ProcessBider::statusChanged, this,  [this](QString statusMessage){
         emit eventOccurred(NAME, statusMessage);
     });
@@ -61,16 +39,17 @@ void TBideProcess::setProcessName(QString processName) { mProcessName = processN
 void TBideProcess::perform()
 {
     // Start bide
-    mProcessBider.start(mProcessName);
+    mProcessBider.setProcessName(mProcessName);
+    mProcessBider.start();
 }
 
 void TBideProcess::stop()
 {
     if(mProcessBider.isRunning())
     {
         emit eventOccurred(NAME, LOG_EVENT_STOPPING_BIDE_PROCESS);
-        if(!mProcessBider.closeProcess())
-            emit errorOccurred(NAME, TBideProcessError(TBideProcessError::CantClose));
+        if(ProcessBiderError err = mProcessBider.closeProcess(); err.isValid())
+            emit errorOccurred(NAME, err);
     }
 }
 

diff --git a/app/src/task/t-bideprocess.h b/app/src/task/t-bideprocess.h
@@ -1,53 +1,10 @@
 #ifndef TBIDEPROCESS_H
 #define TBIDEPROCESS_H
 
-// Qx Includes
-#include <qx/utility/qx-macros.h>
-
 // Project Includes
 #include "task/task.h"
 #include "tools/processbider.h"
 
-class QX_ERROR_TYPE(TBideProcessError, "TBideProcessError", 1251)
-{
-    friend class TBideProcess;
-    //-Class Enums-------------------------------------------------------------
-public:
-    enum Type
-    {
-        NoError = 0,
-        CantClose = 1,
-    };
-
-    //-Class Variables-------------------------------------------------------------
-private:
-    static inline const QHash<Type, QString> ERR_STRINGS{
-        {NoError, u""_s},
-        {CantClose, u"Could not automatically end the running title! It will have to be closed manually."_s},
-    };
-
-    //-Instance Variables-------------------------------------------------------------
-private:
-    Type mType;
-    QString mSpecific;
-
-    //-Constructor-------------------------------------------------------------
-private:
-    TBideProcessError(Type t = NoError, const QString& s = {});
-
-    //-Instance Functions-------------------------------------------------------------
-public:
-    bool isValid() const;
-    Type type() const;
-    QString specific() const;
-
-private:
-    Qx::Severity deriveSeverity() const override;
-    quint32 deriveValue() const override;
-    QString derivePrimary() const override;
-    QString deriveSecondary() const override;
-};
-
 class TBideProcess : public Task
 {
     Q_OBJECT;