Plugin::Template: modify destory

Author: KangLin

Plugins/FtpServer/PluginFtpServer.cpp

@@ -23,7 +23,7 @@ CPluginFtpServer::~CPluginFtpServer()
 
 const CPlugin::TYPE CPluginFtpServer::Type() const
 {
-    return TYPE::Service;
+    return TYPE::Server;
 }
 
 const QString CPluginFtpServer::Protocol() const

Plugins/SftpServer/PluginSftpServer.cpp

@@ -21,7 +21,7 @@ CPluginSftpServer::~CPluginSftpServer()
 
 const CPlugin::TYPE CPluginSftpServer::Type() const
 {
-    return CPlugin::TYPE::Service;
+    return CPlugin::TYPE::Server;
 }
 
 const QString CPluginSftpServer::Protocol() const
@@ -74,8 +74,8 @@ const QString CPluginSftpServer::Details() const
 COperate *CPluginSftpServer::OnCreateOperate(const QString &szId)
 {
     if(szId != Id()) {
-        qCritical(log) << "Invalid ID";
+        qCritical(log) << "Invalid ID:" << szId;
         return nullptr;
     }
     return new COperateSftpServer(this);
-}
+}

Plugins/Template/Base/BackendTemplateBase.cpp

@@ -13,6 +13,22 @@ CBackendTemplateBase::~CBackendTemplateBase()
     qDebug(log) << Q_FUNC_INFO;
 }
 
+/*!
+ * \~chinese 初始化
+ * \return
+ * \li OnInitReturnValue::Fail: 错误
+ * \li OnInitReturnValue::Success/OnInitReturnValue::UseOnProcess: 使用 OnProcess() (非 Qt 事件循环)
+ * \li OnInitReturnValue::NotUseOnProcess: 不使用 OnProcess() (qt 事件循环)
+ *
+ * \~english Initialization
+ * \return CBackend::OnInitReturnValue
+ * \li OnInitReturnValue::Fail: error
+ * \li OnInitReturnValue::Success/OnInitReturnValue::UseOnProcess: Use OnProcess() (non-Qt event loop)
+ * \li OnInitReturnValue::NotUseOnProcess: Don't use OnProcess() (qt event loop)
+ *
+ * \~
+ * \see Start()
+ */
 CBackend::OnInitReturnValue CBackendTemplateBase::OnInit()
 {
     OnInitReturnValue ret = OnInitReturnValue::NotUseOnProcess;
@@ -26,6 +42,7 @@ int CBackendTemplateBase::OnClean()
 {
     int nRet = 0;
     // TODO: Modify clean
+
     emit sigFinished();
     return nRet;
-}
+}

Plugins/Template/Base/OperateTemplateBase.cpp

@@ -14,13 +14,22 @@ COperateTemplateBase::COperateTemplateBase(CPlugin *plugin)
     : COperate(plugin)
     , m_pPara(nullptr)
     , m_pViewer(nullptr)
+    , m_pThread(nullptr)
 {
     qDebug(log) << Q_FUNC_INFO;
 }
 
 COperateTemplateBase::~COperateTemplateBase()
 {
     qDebug(log) << Q_FUNC_INFO;
+    QString szClass = this->metaObject()->className();
+    QString szWhat;
+    szWhat += "Please call ";
+    szWhat += szClass;
+    szWhat += "::Stop() first";
+    Q_ASSERT_X(!m_pThread && !m_pPara && !m_pViewer,
+               szClass.toStdString().c_str(), szWhat.toStdString().c_str());
+
 }
 
 CParameterTemplateBase* COperateTemplateBase::GetParameter() const
@@ -113,7 +122,8 @@ int COperateTemplateBase::Initial()
 
     // TODO: add initial
 
-    m_Menu.addAction(m_pActionSettings);
+    if(m_pActionSettings)
+        m_Menu.addAction(m_pActionSettings);
     return nRet;
 }
 

Plugins/Template/Base/PluginTemplateBase.cpp

@@ -64,8 +64,8 @@ const QString CPluginTemplateBase::Details() const
 COperate *CPluginTemplateBase::OnCreateOperate(const QString &szId)
 {
     if(szId != Id()) {
-        qCritical(log) << "Invalid ID";
+        qCritical(log) << "Invalid ID:" << szId;
         return nullptr;
     }
     return new COperateTemplateBase(this);
-}
+}

Plugins/Template/Desktop/BackendTemplateDesktop.cpp

@@ -15,10 +15,27 @@ CBackendTemplateDesktop::~CBackendTemplateDesktop()
     qDebug(log) << Q_FUNC_INFO;
 }
 
+/*!
+ * \~chinese 初始化
+ * \return
+ * \li OnInitReturnValue::Fail: 错误
+ * \li OnInitReturnValue::Success/OnInitReturnValue::UseOnProcess: 使用 OnProcess() (非 Qt 事件循环)
+ * \li OnInitReturnValue::NotUseOnProcess: 不使用 OnProcess() (qt 事件循环)
+ *
+ * \~english Initialization
+ * \return CBackend::OnInitReturnValue
+ * \li OnInitReturnValue::Fail: error
+ * \li OnInitReturnValue::Success/OnInitReturnValue::UseOnProcess: Use OnProcess() (non-Qt event loop)
+ * \li OnInitReturnValue::NotUseOnProcess: Don't use OnProcess() (qt event loop)
+ *
+ * \~
+ * \see Start()
+ */
 CBackend::OnInitReturnValue CBackendTemplateDesktop::OnInit()
 {
     OnInitReturnValue ret = OnInitReturnValue::NotUseOnProcess;
     // TODO: Modify Initialization
+
     emit sigRunning();
     return ret;
 }
@@ -27,6 +44,7 @@ int CBackendTemplateDesktop::OnClean()
 {
     int nRet = 0;
     // TODO: Modify clean
+
     emit sigFinished();
     return nRet;
 }
@@ -35,4 +53,4 @@ void CBackendTemplateDesktop::slotClipBoardChanged()
 {
     // TODO: add clipboard operate
 
-}
+}

Plugins/Template/Desktop/OperateTemplateDesktop.cpp

@@ -3,24 +3,28 @@
 #include <QLoggingCategory>
 
 #include "DlgSettingsTemplateDesktop.h"
-#include "OperateTemplateDesktop.h"
 #include "ParameterTemplateDesktop.h"
 #include "BackendTemplateDesktop.h"
+#include "OperateTemplateDesktop.h"
 
 static Q_LOGGING_CATEGORY(log, "Operate.TemplateDesktop")
 COperateTemplateDesktop::COperateTemplateDesktop(CPlugin *plugin)
     : COperateDesktop(plugin)
+    , m_pPara(nullptr)
 {
     qDebug(log) << Q_FUNC_INFO;
-    m_pPara = new CParameterTemplateDesktop();
-    SetParameter(m_pPara);
+
 }
 
 COperateTemplateDesktop::~COperateTemplateDesktop()
 {
     qDebug(log) << Q_FUNC_INFO;
-    if(m_pPara)
-        delete m_pPara;
+    QString szClass = this->metaObject()->className();
+    QString szWhat;
+    szWhat += "Please call ";
+    szWhat += szClass;
+    szWhat += "::Stop() first";
+    Q_ASSERT_X(!m_pPara, szClass.toStdString().c_str(), szWhat.toStdString().c_str());
 }
 
 QDialog *COperateTemplateDesktop::OnOpenDialogSettings(QWidget *parent)
@@ -31,4 +35,28 @@ QDialog *COperateTemplateDesktop::OnOpenDialogSettings(QWidget *parent)
 CBackend *COperateTemplateDesktop::InstanceBackend()
 {
     return new CBackendTemplateDesktop(this);
-}
+}
+
+int COperateTemplateDesktop::Initial()
+{
+    int nRet = 0;
+    nRet = COperateDesktop::Initial();
+    if(nRet) return nRet;
+    m_pPara = new CParameterTemplateDesktop();
+    if(m_pPara)
+        SetParameter(m_pPara);
+    return nRet;
+}
+
+int COperateTemplateDesktop::Clean()
+{
+    int nRet = 0;
+    // TODO: add Clean
+
+    if(m_pPara) {
+        delete m_pPara;
+        m_pPara = nullptr;
+    }
+    nRet = COperateDesktop::Clean();
+    return nRet;
+}

Plugins/Template/Desktop/OperateTemplateDesktop.h

@@ -15,11 +15,11 @@ class COperateTemplateDesktop : public COperateDesktop
 private:
     CParameterTemplateDesktop* m_pPara;
 
-    // COperate interface
 private:
     virtual QDialog *OnOpenDialogSettings(QWidget *parent) override;
 
-    // COperateDesktop interface
 protected:
     virtual CBackend *InstanceBackend() override;
+    virtual int Initial() override;
+    virtual int Clean() override;
 };

Plugins/Template/Desktop/PluginTemplateDesktop.cpp

@@ -56,8 +56,8 @@ const QString CPluginTemplateDesktop::Details() const
 COperate *CPluginTemplateDesktop::OnCreateOperate(const QString &szId)
 {
     if(szId != Id()) {
-        qCritical(log) << "Invalid ID";
+        qCritical(log) << "Invalid ID:" << szId;
         return nullptr;
     }
     return new COperateTemplateDesktop(this);
-}
+}

Plugins/Template/Server/BackendTemplateServer.cpp

@@ -14,6 +14,22 @@ CBackendTemplateServer::~CBackendTemplateServer()
     qDebug(log) << Q_FUNC_INFO;
 }
 
+/*!
+ * \~chinese 初始化
+ * \return
+ * \li OnInitReturnValue::Fail: 错误
+ * \li OnInitReturnValue::Success/OnInitReturnValue::UseOnProcess: 使用 OnProcess() (非 Qt 事件循环)
+ * \li OnInitReturnValue::NotUseOnProcess: 不使用 OnProcess() (qt 事件循环)
+ *
+ * \~english Initialization
+ * \return CBackend::OnInitReturnValue
+ * \li OnInitReturnValue::Fail: error
+ * \li OnInitReturnValue::Success/OnInitReturnValue::UseOnProcess: Use OnProcess() (non-Qt event loop)
+ * \li OnInitReturnValue::NotUseOnProcess: Don't use OnProcess() (qt event loop)
+ *
+ * \~
+ * \see Start()
+ */
 CBackend::OnInitReturnValue CBackendTemplateServer::OnInit()
 {
     OnInitReturnValue ret = OnInitReturnValue::NotUseOnProcess;