Change parsing behavior for unknown light types:

No longer throw exception, instead set type to unknown. Add separate color types for other gamut.

Change parsing behavior for unknown light types:
No longer throw exception, instead set type to unknown. Add separate color types for other gamut.
Jojo-1000 · Moritz Wirger
1 parent b4e3087b
Showing 4 changed files with 22 additions and 7 deletions
include/hueplusplus/Light.h
src/HueDeviceTypes.cpp
src/Light.cpp
test/test_LightFactory.cpp
@@ -49,7 +49,9 @@ enum class ColorType
     TEMPERATURE, //!< light has color temperature control
     GAMUT_A_TEMPERATURE, //!< light uses Gamut A and has color temperature control
     GAMUT_B_TEMPERATURE, //!< light uses Gamut B and has color temperature control
-    GAMUT_C_TEMPERATURE //!< light uses Gamut C and has color temperature control
+    GAMUT_C_TEMPERATURE, //!< light uses Gamut C and has color temperature control
+    GAMUT_OTHER, //!< light uses capabilities to specify a different gamut
+    GAMUT_OTHER_TEMPERATURE //!< light uses capabilities to specify a different gamut and has color temperature control
 };
 //! \brief Class for Hue Light fixtures
@@ -136,7 +136,7 @@ ColorType LightFactory::getColorType(const nlohmann::json&amp; lightState, bool hasC
         else
         {
             // Only other type is "Other" which does not have an enum value
-            return ColorType::UNDEFINED;
+            return hasCt ? ColorType::GAMUT_OTHER_TEMPERATURE : ColorType::GAMUT_OTHER;
         }
     }
     else
@@ -155,8 +155,13 @@ ColorType LightFactory::getColorType(const nlohmann::json&amp; lightState, bool hasC
         {
             return hasCt ? ColorType::GAMUT_C_TEMPERATURE : ColorType::GAMUT_C;
         }
-        std::cerr << "Could not determine Light color type:" << modelid << "!\n";
-        throw HueException(CURRENT_FILE_INFO, "Could not determine Light color type!");
+        else
+        {
+            std::cerr << "Warning: Could not determine Light color type:" << modelid
+                      << "!\n"
+                         "Results may not be correct.\n";
+            return ColorType::UNDEFINED;
+        }
     }
 }
 } // namespace hueplusplus
@@ -74,7 +74,9 @@ ColorGamut Light::getColorGamut() const
     case ColorType::GAMUT_C:
     case ColorType::GAMUT_C_TEMPERATURE:
         return gamut::gamutC;
-    default: {
+    case ColorType::UNDEFINED:
+        return gamut::maxGamut;
+    default: { // GAMUT_OTHER, GAMUT_OTHER_TEMPERATURE
         const nlohmann::json& capabilitiesGamut
             = utils::safeGetMember(state.getValue(), "capabilities", "control", "colorgamut");
         if (capabilitiesGamut.is_array() && capabilitiesGamut.size() == 3)
@@ -94,7 +94,7 @@ TEST(LightFactory, createLight_gamutCapabilities)
     lightState["capabilities"]["control"]["colorgamuttype"] = "Other";
     test_light_1 = factory.createLight(lightState, 1);
-    EXPECT_EQ(test_light_1.getColorType(), ColorType::UNDEFINED);
+    EXPECT_EQ(test_light_1.getColorType(), ColorType::GAMUT_OTHER);
     // With color temperature
     lightState["type"] = "Extended color light";
@@ -112,6 +112,11 @@ TEST(LightFactory, createLight_gamutCapabilities)
     test_light_1 = factory.createLight(lightState, 1);
     EXPECT_EQ(test_light_1.getColorType(), ColorType::GAMUT_C_TEMPERATURE);
+
+    lightState["capabilities"]["control"]["colorgamuttype"] = "Other";
+
+    test_light_1 = factory.createLight(lightState, 1);
+    EXPECT_EQ(test_light_1.getColorType(), ColorType::GAMUT_OTHER_TEMPERATURE);
 }
 TEST(LightFactory, createLight_gamutModelid)
@@ -164,5 +169,6 @@ TEST(LightFactory, createLight_gamutModelid)
     // Unknown model
     lightState["modelid"] = "Unknown model";
-    EXPECT_THROW(factory.createLight(lightState, 1), HueException);
+    test_light_1 = factory.createLight(lightState, 1);
+    EXPECT_EQ(test_light_1.getColorType(), ColorType::UNDEFINED);
 }