Fix issues with batch requests

This commit is contained in:
bazuin-32
2022-07-12 16:34:28 -06:00
parent ac9ff795cd
commit ab859ec9fc
2 changed files with 24 additions and 18 deletions

View File

@@ -513,22 +513,24 @@ std::string dispatchBatch(std::string request) {
std::string getReply(std::string request) {
auto format = HyprCtl::FORMAT_NORMAL;
// process flags
int sepIndex = 0;
for (const auto& c : request) {
if (c == '/') { // stop at separator
break;
// process flags for non-batch requests
if (!(request.find("[[BATCH]]") == 0)) {
int sepIndex = 0;
for (const auto& c : request) {
if (c == '/') { // stop at separator
break;
}
sepIndex++;
if (c == 'j')
format = HyprCtl::FORMAT_JSON;
}
sepIndex++;
if (c == 'j')
format = HyprCtl::FORMAT_JSON;
if (sepIndex < request.size())
request = request.substr(sepIndex + 1); // remove flags and separator so we can compare the rest of the string
}
if (sepIndex < request.size())
request = request.substr(sepIndex + 1); // remove flags and separator so we can compare the rest of the string
if (request == "monitors")
return monitorsRequest(format);
else if (request == "workspaces")