From ec26b753a253bf92ad7451b685b95cbddcb75403 Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Wed, 6 Aug 2025 16:28:07 +0200 Subject: descriptions: fix bad json output (#11350) --------- Co-authored-by: Mihai Fufezan --- src/config/ConfigManager.cpp | 8 ++++---- src/debug/HyprCtl.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 337682dc..48c1d103 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -3210,8 +3210,8 @@ std::string SConfigOptionDescription::jsonify() const { "explicit": {})#", val.value, val.min, val.max, currentValue, EXPLICIT); } else if constexpr (std::is_same_v) { - return std::format(R"#( "value": {}, - "current": {}, + return std::format(R"#( "value": "{}", + "current": "{}", "explicit": {})#", val.color.getAsHex(), currentValue, EXPLICIT); } else if constexpr (std::is_same_v) { @@ -3220,7 +3220,7 @@ std::string SConfigOptionDescription::jsonify() const { "explicit": {})#", val.value, currentValue, EXPLICIT); } else if constexpr (std::is_same_v) { - return std::format(R"#( "value": {}, + return std::format(R"#( "value": "{}", "firstIndex": {}, "current": {}, "explicit": {})#", @@ -3257,7 +3257,7 @@ std::string SConfigOptionDescription::jsonify() const { {} }} }})#", - value, description, (uint16_t)type, (uint32_t)flags, parseData()); + value, escapeJSONStrings(description), (uint16_t)type, (uint32_t)flags, parseData()); return json; } diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp index cec41087..3b83d323 100644 --- a/src/debug/HyprCtl.cpp +++ b/src/debug/HyprCtl.cpp @@ -1697,7 +1697,7 @@ static std::string getIsLocked(eHyprCtlOutputFormat format, std::string request) } static std::string getDescriptions(eHyprCtlOutputFormat format, std::string request) { - std::string json = "{"; + std::string json = "["; const auto& DESCS = g_pConfigManager->getAllDescriptions(); for (const auto& d : DESCS) { @@ -1707,7 +1707,7 @@ static std::string getDescriptions(eHyprCtlOutputFormat format, std::string requ json.pop_back(); json.pop_back(); - json += "}\n"; + json += "]\n"; return json; } -- cgit v1.2.3