Plugins::FtpServer: add process error

Author: KangLin

Plugins/FtpServer/BackendFtpServer.cpp

@@ -55,10 +55,13 @@ CBackend::OnInitReturnValue CBackendFtpServer::OnInit()
         }
     }
     if(bListen) {
-        qInfo(log) << "The ftp server listen in" << m_Para->GetPort();
+        QString szMsg = tr("Ftp server listen in %1").arg(m_Para->GetPort());
+        qInfo(log) << szMsg;
+        emit sigInformation(szMsg);
     } else {
-        QString szErr = tr("The ftp server is not listening in %1").arg(m_Para->GetPort());
+        QString szErr = tr("Ftp server is not listening in %1").arg(m_Para->GetPort());
         emit sigError(-1, szErr);
+        return OnInitReturnValue::Fail;
     }
     return OnInitReturnValue::NotUseOnProcess;
 }

Plugins/FtpServer/OperateFtpServer.cpp

@@ -141,6 +141,7 @@ QSharedPointer<CParameterFtpServer> COperateFtpServer::GetParameter()
 void COperateFtpServer::slotStart(bool checked)
 {
     qDebug(log) << Q_FUNC_INFO << m_pStart->isChecked();
+    bool check = false;
     if(!checked) {
         m_pStart->setText(tr("Start server"));
         m_pStart->setToolTip(m_pStart->text());
@@ -163,6 +164,10 @@ void COperateFtpServer::slotStart(bool checked)
         qCritical(log) << "new CBackendThread fail";
         return;
     }
-    
+    check = connect(this, &COperateFtpServer::sigError,
+                    this, [this](const int nError, const QString &szError){
+                        m_pStart->setChecked(false);
+                    });
+    Q_ASSERT(check);
     m_pThread->start();
 }

Src/Backend.cpp

@@ -7,8 +7,9 @@
 
 static Q_LOGGING_CATEGORY(log, "Operate")
 
-CBackend::CBackend(COperate *pOperate)
+CBackend::CBackend(COperate *pOperate, bool bStopSignal)
     : QObject() // Because it's in a different thread with pOperate
+    , m_bStopSignal(bStopSignal)
 {
     qDebug(log) << Q_FUNC_INFO;
     SetConnect(pOperate);
@@ -127,9 +128,11 @@ void CBackend::slotTimeOut()
         qCritical(log) << "Process fail";
         emit sigError(-3, "Process fail");
     }
-
-    // Error or stop, must notify user disconnect it
-    emit sigStop();
+    
+    if(m_bStopSignal) {
+        // Error or stop, must notify user disconnect it
+        emit sigStop();
+    }
 }
 
 int CBackend::OnProcess()

Src/Backend.h

@@ -42,7 +42,15 @@ class PLUGIN_EXPORT CBackend : public QObject
 {
     Q_OBJECT
 public:
-    explicit CBackend(COperate *pOperate = nullptr);
+    /*!
+     * \brief CBackend
+     * \param pOperate
+     * \param bStopSignal
+     *          - true: When an error occurs, emit a `COperate::sigStop()` signal
+     *          - false: not emit signal
+     * 
+     */
+    explicit CBackend(COperate *pOperate = nullptr, bool bStopSignal = true);
     virtual ~CBackend();
 
 public:
@@ -264,4 +272,7 @@ protected Q_SLOTS:
 
 private:
     int SetConnect(COperate* pOperate);
+
+    //! When an error occurs, emit a `COperate::sigStop()` signal
+    bool m_bStopSignal;
 };

Src/BackendThread.cpp

@@ -7,15 +7,15 @@
 
 static Q_LOGGING_CATEGORY(log, "BackendThread")
 
-CBackendThread::CBackendThread(COperate *pOperate, bool bSingle)
+CBackendThread::CBackendThread(COperate *pOperate, bool bFinishedSignal)
     // Note that the parent object pointer cannot be set here.
     // If set the parent, the object is also deleted
     // when the parent object (CConnecterThread) is destroyed.
     // Because it is deleted when it is finished.
     : QThread()
     , m_pOperate(pOperate)
     , m_pBackend(nullptr)
-    , m_bSignal(bSingle)
+    , m_bFinishedSignal(bFinishedSignal)
 {
     qDebug(log) << Q_FUNC_INFO;
     bool check = false;
@@ -79,7 +79,7 @@ void CBackendThread::run()
     if(!m_pBackend || !bRet)
     {
         qCritical(log) << "InstanceBackend fail";
-        if(m_bSignal) {
+        if(m_bFinishedSignal) {
             emit m_pOperate->sigStop();
             emit m_pOperate->sigFinished();
         }
@@ -93,7 +93,7 @@ void CBackendThread::run()
             m_pBackend->Stop();
             m_pBackend->deleteLater();
             m_pBackend = nullptr;
-            if(m_bSignal) {
+            if(m_bFinishedSignal) {
                 emit m_pOperate->sigStop();
                 emit m_pOperate->sigFinished();
             }
@@ -108,7 +108,7 @@ void CBackendThread::run()
         m_pBackend->deleteLater();
     }
 
-    if(m_bSignal)
+    if(m_bFinishedSignal)
         emit m_pOperate->sigFinished();
 
     qDebug(log) << Q_FUNC_INFO << "end";

Src/BackendThread.h

@@ -14,17 +14,28 @@
 class PLUGIN_EXPORT CBackendThread : public QThread
 {
     Q_OBJECT
+    
 public:
-    explicit CBackendThread(COperate *pOperate = nullptr, bool bSignal = true);
+    /*!
+     * \brief CBackendThread
+     * \param pOperate
+     * \param bFinishedSignal
+     *          - true: When an error occurs, emit a `COperate::sigFinished()` signal
+     *          - false: not emit signal
+     */
+    explicit CBackendThread(COperate *pOperate = nullptr, bool bFinishedSignal = true);
     virtual ~CBackendThread() override;
     /*!
      * \brief Quit
      * \note Use this replace QThread::quit, QThread::exit, QThread::terminate
      */
     virtual void quit();
+
 protected:
     virtual void run() override;
     COperate* m_pOperate;
     CBackend* m_pBackend;
-    bool m_bSignal;
+    
+    //! When an error occurs, emit a `COperate::sigFinished()` signal
+    bool m_bFinishedSignal;
 };