From 926a0b992d29fb4f608c1a81d040283a13cd0071 Mon Sep 17 00:00:00 2001
From: Bernhard Kirchen <schlimmchen@posteo.net>
Date: Sat, 13 Jul 2024 22:56:04 +0200
Subject: [PATCH] improve error messages when probing JSON path value type

---
 src/Utils.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Utils.cpp b/src/Utils.cpp
index 5e26dfdf..94f80e57 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -112,6 +112,12 @@ std::optional<float> getFromString(char const* val)
     return res;
 }
 
+template<typename T>
+char const* getTypename();
+
+template<>
+char const* getTypename<float>() { return "float"; }
+
 template<typename T>
 std::pair<T, String> Utils::getJsonValueByPath(JsonDocument const& root, String const& path)
 {
@@ -179,15 +185,17 @@ std::pair<T, String> Utils::getJsonValueByPath(JsonDocument const& root, String
     }
 
     if (!value.is<char const*>()) {
-        snprintf(errBuffer, kErrBufferSize, "Value '%s' at JSON path '%s' is not "
-                "of the expected type", value.as<String>().c_str(), path.c_str());
+        snprintf(errBuffer, kErrBufferSize, "Value '%s' at JSON path '%s' is "
+                "neither a string nor of type %s", value.as<String>().c_str(),
+                path.c_str(), getTypename<T>());
         return { T(), String(errBuffer) };
     }
 
     auto res = getFromString<T>(value.as<char const*>());
     if (!res.has_value()) {
         snprintf(errBuffer, kErrBufferSize, "String '%s' at JSON path '%s' cannot "
-                "be converted to the expected type", value.as<String>().c_str(), path.c_str());
+                "be converted to %s", value.as<String>().c_str(), path.c_str(),
+                getTypename<T>());
         return { T(), String(errBuffer) };
     }