Add CreateSensor type and SensorList with getAsType.

SensorList allows you to directly get the sensor type you want or all sensors of a given type.

Add CreateSensor type and SensorList with getAsType.
SensorList allows you to directly get the sensor type you want or all sensors of a given type.
Jojo-1000 · Moritz Wirger
1 parent fa678638
Showing 7 changed files with 110 additions and 6 deletions
include/hueplusplus/Bridge.h
include/hueplusplus/CLIPSensors.h
include/hueplusplus/ResourceList.h
include/hueplusplus/Sensor.h
include/hueplusplus/SensorList.h
src/Bridge.cpp
src/Sensor.cpp
@@ -43,6 +43,7 @@
 #include "Scene.h"
 #include "Schedule.h"
 #include "Sensor.h"
+#include "SensorList.h"
 #include "Utils.h"
  
 #include "json/json.hpp"
@@ -132,7 +133,6 @@ public:
     using GroupList = GroupResourceList<Group, CreateGroup>;
     using ScheduleList = CreateableResourceList<Schedule, int, CreateSchedule>;
     using SceneList = CreateableResourceList<Scene, std::string, CreateScene>;
-    using SensorList = ResourceList<Sensor, int>;
  
 public:
     //! \brief Constructor of Bridge class
@@ -48,6 +48,7 @@ public:
 protected:
     BaseCLIP(Sensor sensor) : BaseDevice(std::move(sensor)) { }
 };
+
 class CLIPSwitch : public BaseCLIP
 {
 public:
@@ -19,8 +19,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
  
-#ifndef INCLUDE_RESOURCE_LIST_H
-#define INCLUDE_RESOURCE_LIST_H
+#ifndef INCLUDE_HUEPLUSPLUS_RESOURCE_LIST_H
+#define INCLUDE_HUEPLUSPLUS_RESOURCE_LIST_H
  
 #include <functional>
 #include <map>
@@ -122,6 +122,21 @@ protected:
     Sensor(int id, const HueCommandAPI& commands, std::chrono::steady_clock::duration refreshDuration);
 };
  
+class CreateSensor
+{
+public:
+    CreateSensor(const std::string& name, const std::string& modelid, const std::string& swversion,
+        const std::string& type, const std::string& uniqueid, const std::string& manufacturername);
+
+    CreateSensor& setState(const nlohmann::json& state);
+    CreateSensor& setConfig(const nlohmann::json& config);
+    CreateSensor& setRecycle(bool recycle);
+
+    nlohmann::json getRequest() const;
+protected:
+    nlohmann::json request;
+};
+
 namespace sensors
 {
 class DaylightSensor : public BaseDevice
+/**
+    \file SensorList.h
+    Copyright Notice\n
+    Copyright (C) 2020  Jan Rogall		- developer\n
+
+    This file is part of hueplusplus.
+
+    hueplusplus is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    hueplusplus is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
+**/
+
+#ifndef INCLUDE_HUEPLUSPLUS_SENSOR_LIST_H
+#define INCLUDE_HUEPLUSPLUS_SENSOR_LIST_H
+
+#include "ResourceList.h"
+#include "Sensor.h"
+
+namespace hueplusplus
+{
+class SensorList : public CreateableResourceList<Sensor, int, CreateSensor>
+{
+public:
+    using CreateableResourceList::CreateableResourceList;
+
+    template <typename T>
+    T getAsType(int id)
+    {
+        return get(id).asSensorType<T>();
+    }
+    template <typename T>
+    std::vector<T> getAllByType()
+    {
+        std::vector<T> result;
+        std::string type = T::typeStr;
+        // TODO: Maybe only parse the sensors with correct type
+        for (Sensor& s : getAll())
+        {
+            result.push_back(s.asSensorType<T>());
+        }
+        return result;
+    }
+
+protected:
+    SensorList(SensorList&&) = default;
+    SensorList& operator=(SensorList&&) = default;
+};
+} // namespace hueplusplus
+
+#endif
@@ -277,12 +277,12 @@ const Bridge::SceneList&amp; Bridge::scenes() const
     return sceneList;
 }
  
-Bridge::SensorList& Bridge::sensors()
+hueplusplus::SensorList& Bridge::sensors()
 {
     return sensorList;
 }
  
-const Bridge::SensorList& Bridge::sensors() const
+const hueplusplus::SensorList& Bridge::sensors() const
 {
     return sensorList;
 }
@@ -74,7 +74,7 @@ bool Sensor::isOn() const
  
 void Sensor::setOn(bool on)
 {
-    sendPutRequest("/config", nlohmann::json{ {"on", on} }, CURRENT_FILE_INFO);
+    sendPutRequest("/config", nlohmann::json {{"on", on}}, CURRENT_FILE_INFO);
 }
  
 bool Sensor::hasBatteryState() const
@@ -234,6 +234,35 @@ Sensor::Sensor(int id, const HueCommandAPI&amp; commands, std::chrono::steady_clock:
     : BaseDevice(id, commands, "/sensors/", refreshDuration)
 { }
  
+CreateSensor::CreateSensor(const std::string& name, const std::string& modelid, const std::string& swversion,
+    const std::string& type, const std::string& uniqueid, const std::string& manufacturername)
+    : request({{"name", name}, {"modelid", modelid}, {"swversion", swversion}, {"type", type}, {"uniqueid", uniqueid},
+        {"manufacturername", manufacturername}})
+{ }
+
+CreateSensor& CreateSensor::setState(const nlohmann::json& state)
+{
+    request["state"] = state;
+    return *this;
+}
+
+CreateSensor& CreateSensor::setConfig(const nlohmann::json& config)
+{
+    request["config"] = config;
+    return *this;
+}
+
+CreateSensor& CreateSensor::setRecycle(bool recycle)
+{
+    request["recycle"] = recycle;
+    return *this;
+}
+
+nlohmann::json CreateSensor::getRequest() const
+{
+    return request;
+}
+
 namespace sensors
 {