frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate handleInstanceCommand out

Browse Source
This commit is contained in:
LordGrey 2024-04-29 20:42:35 +02:00
parent 12ace5e418
commit c4b88a2e0e
2 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/api/JsonAPI.h
View File

@ -97,6 +97,7 @@ signals:
private:
void handleCommand(const JsonApiCommand& cmd, const QJsonObject &message);
void handleInstanceCommand(const JsonApiCommand& cmd, const QJsonObject &message);
///
/// @brief Handle the switches of Hyperion instances

130
libsrc/api/JsonAPI.cpp
View File

@ -236,74 +236,74 @@ void JsonAPI::handleMessage(const QString &messageString, const QString &httpAut
}
else
{
const QJsonValue instanceElement = message.value("instance");
handleInstanceCommand(cmd, message);
}
}
QList<quint8> runningInstanceIdxs = _instanceManager->getRunningInstanceIdx();
QList<quint8> intanceIdxList;
QStringList errorDetails;
QJsonArray instances;
if (instanceElement.isDouble())
{
instances.append(instanceElement);
} else if (instanceElement.isArray())
{
instances = instanceElement.toArray();
}
if (instances.contains("all"))
{
for (const auto& instanceIdx : runningInstanceIdxs)
{
intanceIdxList.append(instanceIdx);
}
}
else
{
for (const auto &instance : std::as_const(instances)) {
quint8 instanceIdx = static_cast<quint8>(instance.toInt());
if (instance.isDouble() && runningInstanceIdxs.contains(instanceIdx))
{
intanceIdxList.append(instanceIdx);
}
else
{
errorDetails.append("Not a running or valid instance: " + instance.toVariant().toString());
}
}
}
if (intanceIdxList.isEmpty() || !errorDetails.isEmpty() )
{
cmd.isInstanceCmd = InstanceCmd::No;
sendErrorReply("Invalid instance(s) given", errorDetails, cmd);
return;
}
quint8 currentInstanceIdx = getCurrentInstanceIndex();
if (intanceIdxList.size() > 1)
{
if (cmd.isInstanceCmd != InstanceCmd::Multi)
{
sendErrorReply("Command does not support multiple instances", cmd);
return;
}
}
for (const auto &instanceIdx : intanceIdxList)
{
if (setHyperionInstance(instanceIdx))
{
handleCommand(cmd, message);
}
}
setHyperionInstance(currentInstanceIdx);
void JsonAPI::handleInstanceCommand(const JsonApiCommand& cmd, const QJsonObject &message)
{
const QJsonValue instanceElement = message.value("instance");
QJsonArray instances;
if (instanceElement.isDouble())
{
instances.append(instanceElement);
} else if (instanceElement.isArray())
{
instances = instanceElement.toArray();
}
QList<quint8> runningInstanceIdxs = _instanceManager->getRunningInstanceIdx();
QList<quint8> instanceIdxList;
QStringList errorDetails;
if (instances.contains("all"))
{
for (const auto& instanceIdx : runningInstanceIdxs)
{
instanceIdxList.append(instanceIdx);
}
}
else
{
for (const auto &instance : std::as_const(instances)) {
quint8 instanceIdx = static_cast<quint8>(instance.toInt());
if (instance.isDouble() && runningInstanceIdxs.contains(instanceIdx))
{
instanceIdxList.append(instanceIdx);
}
else
{
errorDetails.append("Not a running or valid instance: " + instance.toVariant().toString());
}
}
}
if (instanceIdxList.isEmpty() || !errorDetails.isEmpty() )
{
sendErrorReply("Invalid instance(s) given", errorDetails, cmd);
return;
}
quint8 currentInstanceIdx = getCurrentInstanceIndex();
if (instanceIdxList.size() > 1)
{
if (cmd.isInstanceCmd != InstanceCmd::Multi)
{
sendErrorReply("Command does not support multiple instances", cmd);
return;
}
}
for (const auto &instanceIdx : instanceIdxList)
{
if (setHyperionInstance(instanceIdx))
{
handleCommand(cmd, message);
}
}
setHyperionInstance(currentInstanceIdx);
}
void JsonAPI::handleCommand(const JsonApiCommand& cmd, const QJsonObject &message)