[BleBox] refactor and new method for useful all hardwares

Author: szczukot

hardware/BleBox.cpp

@@ -422,20 +422,15 @@ namespace http {
 			}
 
 			std::string hwid = request::findValue(&req, "idx");
-			if (hwid == "")
-				return;
-			int iHardwareID = atoi(hwid.c_str());
-			CDomoticzHardwareBase *pHardware = m_mainworker.GetHardware(iHardwareID);
-			if (pHardware == NULL)
-				return;
-			if (pHardware->HwdType != HTYPE_BleBox)
+			CDomoticzHardwareBase *pBaseHardware = GetHardwareBase(hwid, HTYPE_BleBox);
+			if (pBaseHardware == NULL)
 				return;
 
 			root["status"] = "OK";
 			root["title"] = "BleBoxGetNodes";
 
 			std::vector<std::vector<std::string> > result;
-			result = m_sql.safe_query("SELECT ID,Name,DeviceID FROM DeviceStatus WHERE (HardwareID==%d)", iHardwareID);
+			result = m_sql.safe_query("SELECT ID,Name,DeviceID FROM DeviceStatus WHERE (HardwareID=='%d')", pBaseHardware->m_HwdID);
 			if (result.size() > 0)
 			{
 				std::vector<std::vector<std::string> >::const_iterator itt;
@@ -469,12 +464,9 @@ namespace http {
 				(mode2 == "")
 				)
 				return;
-			int iHardwareID = atoi(hwid.c_str());
-			CDomoticzHardwareBase *pBaseHardware = m_mainworker.GetHardware(iHardwareID);
+			CDomoticzHardwareBase *pBaseHardware = GetHardwareBase(hwid, HTYPE_BleBox);
 			if (pBaseHardware == NULL)
 				return;
-			if (pBaseHardware->HwdType != HTYPE_BleBox)
-				return;
 			BleBox *pHardware = reinterpret_cast<BleBox*>(pBaseHardware);
 
 			root["status"] = "OK";
@@ -505,12 +497,9 @@ namespace http {
 				(ip == "")
 				)
 				return;
-			int iHardwareID = atoi(hwid.c_str());
-			CDomoticzHardwareBase *pBaseHardware = m_mainworker.GetHardware(iHardwareID);
+			CDomoticzHardwareBase *pBaseHardware = GetHardwareBase(hwid, HTYPE_BleBox);
 			if (pBaseHardware == NULL)
 				return;
-			if (pBaseHardware->HwdType != HTYPE_BleBox)
-				return;
 			BleBox *pHardware = reinterpret_cast<BleBox*>(pBaseHardware);
 
 			root["status"] = "OK";
@@ -536,12 +525,9 @@ namespace http {
 				(ip == "")
 				)
 				return;
-			int iHardwareID = atoi(hwid.c_str());
-			CDomoticzHardwareBase *pBaseHardware = m_mainworker.GetHardware(iHardwareID);
+			CDomoticzHardwareBase *pBaseHardware = GetHardwareBase(hwid, HTYPE_BleBox);
 			if (pBaseHardware == NULL)
 				return;
-			if (pBaseHardware->HwdType != HTYPE_BleBox)
-				return;
 			BleBox *pHardware = reinterpret_cast<BleBox*>(pBaseHardware);
 
 			root["status"] = "OK";
@@ -564,12 +550,9 @@ namespace http {
 				(nodeid == "")
 				)
 				return;
-			int iHardwareID = atoi(hwid.c_str());
-			CDomoticzHardwareBase *pBaseHardware = m_mainworker.GetHardware(iHardwareID);
+			CDomoticzHardwareBase *pBaseHardware = GetHardwareBase(hwid, HTYPE_BleBox);
 			if (pBaseHardware == NULL)
 				return;
-			if (pBaseHardware->HwdType != HTYPE_BleBox)
-				return;
 			BleBox *pHardware = reinterpret_cast<BleBox*>(pBaseHardware);
 
 			root["status"] = "OK";
@@ -586,14 +569,9 @@ namespace http {
 			}
 
 			std::string hwid = request::findValue(&req, "idx");
-			if (hwid == "")
-				return;
-			int iHardwareID = atoi(hwid.c_str());
-			CDomoticzHardwareBase *pBaseHardware = m_mainworker.GetHardware(iHardwareID);
+			CDomoticzHardwareBase *pBaseHardware = GetHardwareBase(hwid, HTYPE_BleBox);
 			if (pBaseHardware == NULL)
 				return;
-			if (pBaseHardware->HwdType != HTYPE_BleBox)
-				return;
 			BleBox *pHardware = reinterpret_cast<BleBox*>(pBaseHardware);
 
 			root["status"] = "OK";

main/WebServer.cpp

@@ -15748,5 +15748,19 @@ namespace http {
 					"DELETE FROM UserSessions WHERE ExpirationDate < datetime('now', 'localtime')");
 		}
 
+
+		CDomoticzHardwareBase* CWebServer::GetHardwareBase(const std::string &HwId, const int Type)
+		{
+			if (HwId == "")
+				return NULL;
+			int iHardwareID = atoi(HwId.c_str());
+			CDomoticzHardwareBase *pHardware = m_mainworker.GetHardware(iHardwareID);
+			if (pHardware == NULL)
+				return NULL;
+			if (pHardware->HwdType != Type)
+				return NULL;
+			return pHardware;
+		}
+
 	} //server
 }//http

main/WebServer.h

@@ -5,6 +5,7 @@
 #include "../webserver/cWebem.h"
 #include "../webserver/request.hpp"
 #include "../webserver/session_store.hpp"
+#include "../DomoticzHardware.h"
 
 struct lua_State;
 struct lua_Debug;
@@ -62,6 +63,8 @@ class CWebServer : public session_store, public boost::enable_shared_from_this<C
 	void SBFSpotImportOldData(WebEmSession & session, const request& req, std::string & redirect_uri);
 	void SetCurrentCostUSBType(WebEmSession & session, const request& req, std::string & redirect_uri);
 
+	CDomoticzHardwareBase* GetHardwareBase(const std::string &HwId, const int Type);
+
 	cWebem *m_pWebEm;
 
 	void ReloadCustomSwitchIcons();