From 9863d6234835f05c66ee3aa32198a0a11b2e1179 Mon Sep 17 00:00:00 2001
From: kelteseth <i@kelteseth.net>
Date: Sat, 22 Sep 2018 16:28:56 +0200
Subject: [PATCH] Better output when disconnection

---
 ScreenPlay/src/screenplay.h     | 12 ++++--------
 ScreenPlay/src/sdkconnector.cpp |  2 --
 ScreenPlay/src/sdkconnector.h   | 31 ++++++++++++++-----------------
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/ScreenPlay/src/screenplay.h b/ScreenPlay/src/screenplay.h
index 39ba3301..8c4bfbd7 100644
--- a/ScreenPlay/src/screenplay.h
+++ b/ScreenPlay/src/screenplay.h
@@ -39,11 +39,11 @@ public:
 
 signals:
     void allWallpaperRemoved();
-    void projectSettingsListModelFound(ProjectSettingsListModel* li,QString type);
+    void projectSettingsListModelFound(ProjectSettingsListModel* li, QString type);
     void projectSettingsListModelNotFound();
 
 public slots:
-    void createWallpaper(int monitorIndex, QUrl absoluteStoragePath, QString previewImage, float volume, QString fillMode,  QString type);
+    void createWallpaper(int monitorIndex, QUrl absoluteStoragePath, QString previewImage, float volume, QString fillMode, QString type);
     void createWidget(QUrl absoluteStoragePath, QString previewImage);
     void removeAllWallpaper();
     void requestProjectSettingsListModelAt(int index);
@@ -81,7 +81,8 @@ public:
         QProcess* m_process = new QProcess();
 
         connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), [=](int exitCode, QProcess::ExitStatus exitStatus) {
-            qDebug() << "EX: " << exitCode;
+            if (exitCode != 0)
+                qDebug() << "WARNING EXIT CODE: " << exitCode;
         });
         connect(m_process, &QProcess::errorOccurred, [=](QProcess::ProcessError error) {
             qDebug() << "EX: " << error;
@@ -101,11 +102,6 @@ public:
         m_projectSettingsListModel = QSharedPointer<ProjectSettingsListModel>(new ProjectSettingsListModel(projectPath + "/project.json"));
     }
 
-    ~ScreenPlayWallpaper()
-    {
-        qDebug() << "Destructing wallpaper " << m_appID;
-    }
-
     QSharedPointer<ProjectSettingsListModel> projectSettingsListModel() const;
 
     QVector<int> screenNumber() const
diff --git a/ScreenPlay/src/sdkconnector.cpp b/ScreenPlay/src/sdkconnector.cpp
index 58e667b2..3260b913 100644
--- a/ScreenPlay/src/sdkconnector.cpp
+++ b/ScreenPlay/src/sdkconnector.cpp
@@ -26,7 +26,6 @@ void SDKConnector::newConnection()
 void SDKConnector::closeAllWallpapers()
 {
     for (int i = 0; i < m_clients.size(); ++i) {
-        qDebug() << m_clients.data()->get()->appID();
         m_clients.at(i)->close();
         m_clients.clear();
         m_clients.squeeze();
@@ -50,7 +49,6 @@ void SDKConnector::setWallpaperValue(QString appID, QString key, QString value)
 {
 
     for (int i = 0; i < m_clients.count(); ++i) {
-        qDebug() << appID << " " << m_clients.at(i).data()->appID() << " " << m_clients.count() << " " << key << " " << value;
         if (m_clients.at(i).data()->appID() == appID) {
             QJsonObject obj;
             obj.insert(key, QJsonValue(value));
diff --git a/ScreenPlay/src/sdkconnector.h b/ScreenPlay/src/sdkconnector.h
index 54514bc1..fc970fc7 100644
--- a/ScreenPlay/src/sdkconnector.h
+++ b/ScreenPlay/src/sdkconnector.h
@@ -8,8 +8,6 @@
 #include <QTimer>
 #include <QVector>
 
-
-
 /*!
     \class SDKConnector
     \brief Used for every Wallpaper, Scene or Widget communication via Windows pipes/QLocalSocket
@@ -22,7 +20,6 @@ class SDKConnector : public QObject {
 public:
     explicit SDKConnector(QObject* parent = nullptr);
 
-
 signals:
 
 public slots:
@@ -36,7 +33,6 @@ public slots:
 private:
     QSharedPointer<QLocalServer> m_server;
     QVector<QSharedPointer<SDKConnection>> m_clients;
-
 };
 
 class SDKConnection : public QObject {
@@ -52,11 +48,6 @@ public:
         connect(m_socket, &QLocalSocket::readyRead, this, &SDKConnection::readyRead);
         connect(m_socket, &QLocalSocket::disconnected, this, &SDKConnection::disconnected);
     }
-    ~SDKConnection()
-    {
-        qDebug() << "destroying SDKConnection Object";
-    }
-
 
     QString appID() const
     {
@@ -70,7 +61,6 @@ public:
         return m_monitor;
     }
 
-
 signals:
     void requestCloseAt(int at);
     void appIDChanged(QString appID);
@@ -80,17 +70,19 @@ public slots:
     void readyRead()
     {
 
-        QString msg = QString(m_socket->readAll());
+        auto msg = QString(m_socket->readAll());
 
         // The first message allways contains the appID
         if (msg.startsWith("appID=")) {
             //Only use the first 32 chars for the appID
-            m_appID = msg.remove("appID=").mid(0,32);
+            m_appID = msg.remove("appID=").mid(0, 32);
             msg.remove(m_appID);
-
-            qDebug() << "### APPID:\t "<< m_appID << "\n### Monitor: "<< m_monitor.at(0);
+            qDebug() << "###### Wallpaper created at:";
+            qDebug() << "### APPID:\t " << m_appID << "\n### Monitor: " << m_monitor.at(0) << "\n";
         }
-        qDebug() << "SDK CONNECTOR "<< msg;
+
+        // TODO We now get all debug messages from apps here
+        // show them inside ScreenPlay somewhere
     }
 
     void disconnected()
@@ -100,8 +92,14 @@ public slots:
 
     void close()
     {
-        m_socket->disconnect();
+        if ((m_socket->state()) == QLocalSocket::UnconnectedState || (m_socket->state()) == QLocalSocket::ClosingState )
+            return;
+
+        m_socket->disconnectFromServer();
         m_socket->close();
+
+        qDebug() << "###### Destroy: ";
+        qDebug() << "### APPID:\t " << m_appID << "\n### Monitor: " << m_monitor.at(0) << " State: " << m_socket->state();
     }
 
     void setAppID(QString appID)
@@ -126,5 +124,4 @@ private:
     QLocalSocket* m_socket;
     QString m_appID;
     QVector<int> m_monitor;
-
 };