Server: remove obsolete code & small refactor in DLIBWorker

Author: fuzun

server/source/Client/Client.cpp

@@ -52,7 +52,6 @@ Client::Client(QObject *parent, QWebSocket* _socket, QSettings* config)
     QMetaObject::invokeMethod(worker, &ClientWorker::init, Qt::BlockingQueuedConnection);
 
     QObject::connect(worker, &ClientWorker::log, this, &Client::log);
-    QObject::connect(worker, &ClientWorker::throwException, this, &Client::throwException);
     QObject::connect(worker, &ClientWorker::commandReceived, this, &Client::processCommand);
     QObject::connect(worker, &ClientWorker::sendCommand, this, &Client::sendCommand);
 
@@ -96,11 +95,6 @@ Client::~Client()
     socket->flush();
 }
 
-void Client::throwException(const std::exception& e)
-{
-    throw e;
-}
-
 QString Client::getName() const
 {
     return name;

server/source/Client/Client.h

@@ -108,8 +108,6 @@ private slots:
     void processDlibWorkerFaceResults(const QVector<QPair<QRect, QString>>& results);
     void processDlibWorkerObjectResults(const QStringList& results);
 
-    void throwException(const std::exception &e);
-
 public:
 signals:
     void clientNameChanged(const QString& name);

server/source/Client/ClientWorker.cpp

@@ -169,7 +169,6 @@ void ClientWorker::init()
 
     dlibWorker = new DLIBWorker(config, settings);
     dlibWorker->moveToThread(&dlibWorkerThread);
-    connect(dlibWorker, &DLIBWorker::throwException, this, &ClientWorker::throwException);
     connect(&dlibWorkerThread, &QThread::finished, dlibWorker, &QObject::deleteLater);
     connect(this, &ClientWorker::processImage, dlibWorker, &DLIBWorker::process);
     connect(dlibWorker, &DLIBWorker::doneFace, this, &ClientWorker::processDlibWorkerFaceResults);

server/source/Client/ClientWorker.h

@@ -76,7 +76,6 @@ public slots:
 
 signals:
     void log(const QString& str);
-    void throwException(const std::exception &e);
     void commandReceived(Client::Command cmd, const QVariant& ctx);
 
 };

server/source/DLIBWorker/DLIBWorker.cpp

@@ -60,11 +60,7 @@ DLIBWorker::DLIBWorker(class QSettings* config, const Settings *settings)
     config->endGroup();
 
     QFile refFile(_refFile);
-    if(!refFile.open(QIODevice::ReadOnly))
-    {
-        throw std::exception("Reference photo list file can not be opened!");
-    }
-    else
+    if(refFile.open(QIODevice::ReadOnly))
     {
         QByteArray data = refFile.readAll();
 
@@ -97,9 +93,17 @@ DLIBWorker::DLIBWorker(class QSettings* config, const Settings *settings)
 
 #ifdef TURBOJPEG_AVAILABLE
     QMetaObject::invokeMethod(this, [this]() {
-            m_tjHandle = tjInitDecompress();
-        }, Qt::QueuedConnection);
+        m_tjHandle = tjInitDecompress();
+    }, Qt::QueuedConnection);
 #endif
+
+    QMetaObject::invokeMethod(this, [this]() {
+        detector = get_frontal_face_detector();
+        string landmarkModel = m_faceLandmarkModelFile.toStdString();
+        string recogModel = m_faceRecognitionModelFile.toStdString();
+        deserialize(landmarkModel) >> sp;
+        deserialize(recogModel) >> net;
+    }, Qt::QueuedConnection);
 }
 
 DLIBWorker::~DLIBWorker()
@@ -402,16 +406,10 @@ void DLIBWorker::process(const QByteArray& buffer)
             {
                 if(m_refPhotoFileList.size() == 0)
                 {
-                    throwException(std::exception("Reference face list is empty!"));
+                    emit log("WARNING: Reference face list is empty!");
                 }
                 else
                 {
-                    detector = get_frontal_face_detector();
-                    string landmarkModel = m_faceLandmarkModelFile.toStdString();
-                    string recogModel = m_faceRecognitionModelFile.toStdString();
-                    deserialize(landmarkModel) >> sp;
-                    deserialize(recogModel) >> net;
-
                     setupReference(m_refPhotoFileList);
                 }
             }
@@ -449,7 +447,8 @@ void DLIBWorker::process(const QByteArray& buffer)
     }
     catch(const std::exception& e)
     {
-        emit throwException(e);
+        std::cerr << e.what() << std::endl;
+        emit log(QString("dlib exception: %1").arg(e.what()));
     }
 }
 

server/source/DLIBWorker/DLIBWorker.h

@@ -145,9 +145,7 @@ public slots:
     void doneFace(const QVector<QPair<QRect, QString>>& results);
     void doneObject(const QStringList& results);
 
-    void throwException(const std::exception& e);
     void log(const QString& str);
-
 };
 
 #endif // DLIBWORKER_H

server/source/SocketHandler/SocketHandler.cpp

@@ -10,6 +10,8 @@
 #include <QWebSocket>
 #include <QSettings>
 
+#include <stdexcept>
+
 #include "Server/Server.h"
 #include "ClientHandler/ClientHandler.h"
 #include "UIInterface/UIInterface.h"
@@ -59,7 +61,7 @@ SocketHandler::SocketHandler(QObject *parent, UIInterface *&_uiInterface, Client
     }
     else
     {
-        throw std::exception("QWebSocketServer can not listen!");
+        throw std::runtime_error("QWebSocketServer can not listen!");
     }
 }
 
@@ -88,7 +90,7 @@ void SocketHandler::onSslErrors(const QList<QSslError>& errors)
             errStr += "\n" + it.errorString();
         }
 
-        throw (std::exception(errStr.toStdString().c_str()));
+        throw std::runtime_error(errStr.toStdString().c_str());
     }
 }