Use switched instance for API calls without instance provided

Author: Lord-Grey

libsrc/api/JsonAPI.cpp

@@ -280,8 +280,8 @@ void JsonAPI::handleInstanceCommand(const JsonApiCommand& cmd, const QJsonObject
 	QJsonArray instances;
 	const QJsonValue instanceElement = message.value("instance");
 
-	// Extract instance(s) from the message
-	if (!(instanceElement.isUndefined() && instanceElement.isNull()))
+	// Extract instanceIds(s) from the message
+	if (!(instanceElement.isUndefined() || instanceElement.isNull()))
 	{
 		if (instanceElement.isDouble())
 		{
@@ -291,14 +291,27 @@ void JsonAPI::handleInstanceCommand(const JsonApiCommand& cmd, const QJsonObject
 			instances = instanceElement.toArray();
 		}
 	}
+	else
+	{
+		// If no instance element is given use the one that was switched to before
+		if (instanceElement.isUndefined() && _currInstanceIndex != NO_INSTANCE_ID)
+		{
+			instances.append(_currInstanceIndex);
+		}
+		else
+		{
+			sendErrorReply("No instance(s) given nor switched to a valid one yet", cmd);
+			return;
+		}
+	}
 
 	InstanceCmd::MustRun const isRunningInstanceRequired = cmd.getInstanceMustRun();
 	QSet const runningInstanceIds = _instanceManager->getRunningInstanceIdx();
 	QSet<quint8> instanceIds;
 	QStringList errorDetails;
 
-	// Determine instance IDs, if not provided or "all" is given
-	if (instanceElement.isUndefined() || instanceElement.isNull() || instances.contains("all"))
+	// Determine instance IDs, if empty array provided or "all" is given
+	if (instances.isEmpty() || instances.contains("all"))
 	{
 		instanceIds = (isRunningInstanceRequired == InstanceCmd::MustRun_Yes) ? runningInstanceIds : _instanceManager->getInstanceIds();
 	}
@@ -350,7 +363,8 @@ void JsonAPI::handleInstanceCommand(const JsonApiCommand& cmd, const QJsonObject
 		return;
 	}
 
-	// Execute the command for each valid instance;  Hyperion is about to quit
+	// Execute the command for each valid instance
+	quint8 const currentInstance = _currInstanceIndex;
 	for (const auto &instanceId : std::as_const(instanceIds))
 	{
 		if (isRunningInstanceRequired == InstanceCmd::MustRun_Yes || _currInstanceIndex == NO_INSTANCE_ID)
@@ -365,6 +379,12 @@ void JsonAPI::handleInstanceCommand(const JsonApiCommand& cmd, const QJsonObject
 			handleCommand(cmd, message);
 		}
 	}
+
+	//Switch back to current instance, if command was executred against multiple instances
+	if (currentInstance != _currInstanceIndex && (cmd.getInstanceCmdType() == InstanceCmd::Multi || cmd.getInstanceCmdType() == InstanceCmd::No_or_Multi))
+	{
+		handleInstanceSwitch(currentInstance);
+	}
 }
 
 void JsonAPI::handleCommand(const JsonApiCommand& cmd, const QJsonObject &message)
@@ -1482,15 +1502,31 @@ void JsonAPI::handleInstanceCommand(const QJsonObject &message, const JsonApiCom
 	QString replyMsg;
 	QStringList errorDetails;
 
-	const quint8 instanceID = static_cast<quint8>(message["instance"].toInt());
-	const QString instanceName = _instanceManager->getInstanceName(instanceID);
-	const QString &name = message["name"].toString();
+	QJsonValue const instanceValue = message["instance"];
 
-	if(cmd.subCommand != SubCommand::CreateInstance && !_instanceManager->doesInstanceExist(instanceID))
+	const quint8 instanceID = static_cast<quint8>(instanceValue.toInt());
+	if(cmd.subCommand != SubCommand::CreateInstance)
 	{
-		sendErrorReply( QString("Hyperion instance [%1] does not exist.").arg(instanceID), cmd);
-		return;
+		QString errorText;
+		if (instanceValue.isUndefined())
+		{
+			errorText = "No instance provided, but required";
+
+		} else if (!_instanceManager->doesInstanceExist(instanceID))
+		{
+			errorText = QString("Hyperion instance [%1] does not exist.").arg(instanceID);
+		}
+
+		if (!errorText.isEmpty())
+		{
+			sendErrorReply( errorText, cmd);
+			return;
+		}
 	}
+
+	const QString instanceName = _instanceManager->getInstanceName(instanceID);
+	const QString &name = message["name"].toString();
+
 	switch (cmd.subCommand) {
 	case SubCommand::SwitchTo:
 		if (handleInstanceSwitch(instanceID))