hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2026-01-02 18:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

descriptions: fix bad json output (#11350)

Browse source 
---------

Co-authored-by: Mihai Fufezan <mihai@fufexan.net>
This commit is contained in:
Vaxry 2025-08-06 16:28:07 +02:00 • committed by GitHub
parent 0c317f2508
commit ec26b753a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
hyprtester/src/tests/main/hyprctl.cpp Normal file
View file

@ -0,0 +1,35 @@
#include "tests.hpp"
#include "../../shared.hpp"
#include "../../hyprctlCompat.hpp"
#include <print>
#include <thread>
#include <chrono>
#include <hyprutils/os/Process.hpp>
#include <hyprutils/memory/WeakPtr.hpp>
#include <csignal>
#include <cerrno>
#include "../shared.hpp"
static int ret = 0;
using namespace Hyprutils::OS;
using namespace Hyprutils::Memory;
#define UP CUniquePointer
#define SP CSharedPointer
static bool test() {
NLog::log("{}Testing hyprctl", Colors::GREEN);
{
NLog::log("{}Testing hyprctl descriptions for any json errors", Colors::GREEN);
CProcess jqProc("bash", {"-c", "hyprctl descriptions | jq"});
jqProc.addEnv("HYPRLAND_INSTANCE_SIGNATURE", HIS);
jqProc.runSync();
EXPECT(jqProc.exitCode(), 0);
}
return !ret;
}
REGISTER_TEST_FN(test);

1
nix/tests/default.nix
View file

@ -10,6 +10,7 @@ in {
flake.hyprtester
# Programs needed for tests
jq
kitty
xorg.xeyes
];

8
src/config/ConfigManager.cpp
View file

@ -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<T, SColorData>) {
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<T, SBoolData>) {
@ -3220,7 +3220,7 @@ std::string SConfigOptionDescription::jsonify() const {
"explicit": {})#",
val.value, currentValue, EXPLICIT);
} else if constexpr (std::is_same_v<T, SChoiceData>) {
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;
}

4
src/debug/HyprCtl.cpp
View file

@ -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;
}