Improvements during startup. Check if openhab system is available (#17)

* Improvements during startup. Check if openhab system is available * code styling * code style * Bugfix * Improvements during reconnection * code style
YIO-Remote · Dec 23, 2020 · e0a77bc · e0a77bc · zehnm · Dec 23, 2020
1 parent c15bc67
commit e0a77bc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/src/openhab.cpp b/src/openhab.cpp
@@ -2,6 +2,7 @@
  *
  * Copyright (C) 2019 Christian Riedl <ric@rts.co.at>
  * Copyright (C) 2020 Andreas Mroß <andreas@mross.pw>
+ * Copyright (C) 2020 Michael Löcher <MichaelLoercher@web.de>
  *
  * This file is part of the YIO-Remote software project.
  *
@@ -29,6 +30,7 @@
 #include <QSet>
 #include <QString>
 #include <QtDebug>
+#include <QProcess>
 
 #include "openhab_channelmappings.h"
 #include "yio-interface/entities/blindinterface.h"
@@ -186,12 +188,20 @@ void OpenHAB::connect() {
 
     _myEntities = m_entities->getByIntegration(integrationId());
 
-    getItems(true);
+
 
     _tries = 0;
     _userDisconnect = false;
     _wasDisconnected = false;
     _standby = false;
+    if (QProcess::execute("curl", QStringList() << "-s" << _url) == 0) {
+        startSse();
+        _pollingTimer.start();
+        getItems(true);
+        setState(CONNECTED);
+    } else {
+        qCDebug(m_logCategory) << "openhab not reachable";
+    }
 }
 
 void OpenHAB::disconnect() {
@@ -213,23 +223,34 @@ void OpenHAB::enterStandby() {
     if (_sseReply->isRunning()) {
         _sseReply->abort();
     }
-    _pollingTimer.start();
+    if (QProcess::execute("curl", QStringList() << "-s" << _url) == 0) {
+        _pollingTimer.start();
+    } else {
+        qCDebug(m_logCategory) << "openhab not reachable";
+    }
 }
 
 void OpenHAB::leaveStandby() {
     _standby = false;
-
-    _pollingTimer.stop();
-    startSse();
-    getItems(false);
+    if (QProcess::execute("curl", QStringList() << "-s" << _url) == 0) {
+        // _pollingTimer.stop();
+        startSse();
+        getItems(false);
+    } else {
+        qCDebug(m_logCategory) << "openhab not reachable";
+    }
 }
 
 void OpenHAB::jsonError(const QString& error) {
     qCWarning(m_logCategory) << "JSON error " << error;
 }
 
 void OpenHAB::onPollingTimer() {
-    getItems(false);
+    if (QProcess::execute("curl", QStringList() << "-s" << _url) == 0) {
+        getItems(false);
+    } else {
+        qCDebug(m_logCategory) << "openhab not reachable";
+    }
 }
 
 void OpenHAB::onNetWorkAccessible(QNetworkAccessManager::NetworkAccessibility accessibility) {
@@ -255,7 +276,6 @@ void OpenHAB::getItems(bool first) {
             // called during connect
             setState(CONNECTED);
             // connect to the SSE source
-            startSse();
         }
         processItems(doc, first);
     });

diff --git a/src/openhab.h b/src/openhab.h
@@ -2,6 +2,7 @@
  *
  * Copyright (C) 2019 Christian Riedl <ric@rts.co.at>
  * Copyright (C) 2020 Andreas Mroß <andreas@mross.pw>
+ * Copyright (C) 2020 Michael Löcher <MichaelLoercher@web.de>
  *
  * This file is part of the YIO-Remote software project.
  *