Merge branch 'Refactor' of https://github.com/Lord-Grey/hyperion.ng into Refactor

Author: Lord-Grey

.github/workflows/qt5_6.yml

@@ -153,9 +153,18 @@ jobs:
           cmake --preset macos-${{ env.BUILD_TYPE }} ${{ steps.dependencies.outputs.cmakeArgs }}
           cmake --build --preset macos-${{ env.BUILD_TYPE }}
           # CPack workaround for macOS 13
-          echo killing...; sudo pkill -9 XProtect >/dev/null || true;
-          echo waiting...; while pgrep XProtect; do sleep 3; done;
-          cd build; cpack
+          attempt=0
+          max_attempts=5
+          while [ $attempt -lt $max_attempts ]; do
+            if cd build && cpack; then
+              echo "Package created successfully"
+              break
+            else
+              echo "Failed to create package, retrying..."
+              sleep 10
+            fi
+            attempt=$((attempt + 1))
+          done
         env:
           BUILD_TYPE: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
           HINT: ${{ steps.dependencies.outputs.cmakeArgs != '' && '(with pre-built dependencies)' || '(full build)' }}

assets/webconfig/js/content_network.js

@@ -266,7 +266,7 @@ $(document).ready(function () {
     $("#conf_cont_tok").insertAfter("#conf_cont_network");
 
     // Initial state check based on server config
-    checkApiTokenState(window.serverConfig.network.internetAccessAPI || window.serverConfig.network.localApiAuth);
+    checkApiTokenState(window.serverConfig.network.internetAccessAPI || window.serverConfig.network.localApiAuth || storedAccess === 'expert');
 
     // Listen for changes on the Internet access API Auth toggle
     $('#root_network_internetAccessAPI').on("change", function () {

bin/compile.sh

@@ -142,7 +142,7 @@ private slots:
 	/// Flatbuffer connection for forwarding
 	QList<TargetHost> _flatbufferTargets;
 
-	MessageForwarderFlatbufferClientsHelper* _messageForwarderFlatBufHelper;
+	QSharedPointer<MessageForwarderFlatbufferClientsHelper> _messageForwarderFlatBufHelper;
 
 	QSharedPointer<MdnsBrowser> _mdnsBrowser = MdnsBrowser::getInstance();
 };

bin/copy_binaries_to_deploy.sh

@@ -259,6 +259,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()))
 	{
 		if (instanceElement.isDouble())
@@ -270,79 +272,65 @@ void JsonAPI::handleInstanceCommand(const JsonApiCommand& cmd, const QJsonObject
 		}
 	}
 
-	InstanceCmd::MustRun isRunningInstanceRequired = cmd.getInstanceMustRun();
+	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"))
 	{
-		if (isRunningInstanceRequired == InstanceCmd::MustRun_Yes)
-		{
-			instanceIds = runningInstanceIds;
-		}
-		else
-		{
-			instanceIds = _instanceManager->getInstanceIds();
-		}
+		instanceIds = (isRunningInstanceRequired == InstanceCmd::MustRun_Yes) ? runningInstanceIds : _instanceManager->getInstanceIds();
 	}
 	else
 	{
-		for (const auto &instance : std::as_const(instances)) {
+		//Resolve instances provided and test, if they need to be running
+		for (const auto &instance : std::as_const(instances))
+		{
+			if (!instance.isDouble())
+			{
+				errorDetails.append("Not a valid instance: " + instance.toVariant().toString());
+				continue;
+			}
 
 			quint8 const instanceId = static_cast<quint8>(instance.toInt());
-			if (instance.isDouble())
+
+			if (isRunningInstanceRequired == InstanceCmd::MustRun_Yes && !runningInstanceIds.contains(instanceId))
 			{
-				if (isRunningInstanceRequired == InstanceCmd::MustRun_Yes)
-				{
-					if (runningInstanceIds.contains(instanceId))
-					{
-						instanceIds.insert(instanceId);
-					}
-					else
-					{
-						errorDetails.append(QString("Instance [%1] is not running, but the (sub-) command requires a running instance.").arg(instance.toVariant().toString()));
-					}
-				}
-				else
-				{
-					instanceIds.insert(instanceId);
-				}
+				errorDetails.append(QString("Instance [%1] is not running, but the (sub-) command requires a running instance.").arg(instance.toVariant().toString()));
 			}
 			else
 			{
-				errorDetails.append("Not a valid instance: " + instance.toVariant().toString());
+				instanceIds.insert(instanceId);
 			}
 		}
 	}
 
-	if (instanceIds.isEmpty() && errorDetails.isEmpty() )
+	// Handle cases where no valid instances are found
+	if (instanceIds.isEmpty())
 	{
-		if (cmd.getInstanceCmdType() == InstanceCmd::No_or_Single || cmd.getInstanceCmdType() == InstanceCmd::No_or_Multi )
+		if (errorDetails.isEmpty() && (cmd.getInstanceCmdType() == InstanceCmd::No_or_Single || cmd.getInstanceCmdType() == InstanceCmd::No_or_Multi) )
 		{
 			handleCommand(cmd, message);
 			return;
 		}
-		else
-		{
-			errorDetails.append("No instance(s) provided, but required");
-		}
+		errorDetails.append("No instance(s) provided, but required");
 	}
 
-	if (instanceIds.size() > 1)
+	// Check if multiple instances are allowed
+	if (instanceIds.size() > 1 && cmd.getInstanceCmdType() != InstanceCmd::Multi)
 	{
-		if (cmd.getInstanceCmdType() != InstanceCmd::Multi)
-		{
-			errorDetails.append("Command does not support multiple instances");
-		}
+		errorDetails.append("Command does not support multiple instances");
 	}
 
+	// If there are errors, send a response and exit
 	if ( !errorDetails.isEmpty() )
 	{
 		sendErrorReply("Errors for instance(s) given", errorDetails, cmd);
 		return;
 	}
 
+	// Execute the command for each valid instance
 	for (const auto &instanceId : std::as_const(instanceIds))
 	{
 		if (isRunningInstanceRequired == InstanceCmd::MustRun_Yes)

bin/create_all_releases.sh

@@ -519,9 +519,9 @@ int MessageForwarder::startFlatbufferTargets(const QJsonObject& config)
 {
 	if (!config["flatbuffer"].isNull())
 	{
-		if (_messageForwarderFlatBufHelper == nullptr)
+		if (_messageForwarderFlatBufHelper.isNull())
 		{
-			_messageForwarderFlatBufHelper = new MessageForwarderFlatbufferClientsHelper();
+			_messageForwarderFlatBufHelper = QSharedPointer<MessageForwarderFlatbufferClientsHelper>::create();
 		}
 		else
 		{
@@ -598,13 +598,13 @@ void MessageForwarder::forwardJsonMessage(const QJsonObject& message, quint8 ins
 
 void MessageForwarder::forwardFlatbufferMessage(const QString& /*name*/, const Image<ColorRgb>& image)
 {
-	if (_messageForwarderFlatBufHelper != nullptr)
+	if (_messageForwarderFlatBufHelper)
 	{
 		bool const isfree = _messageForwarderFlatBufHelper->isFree();
 
 		if (isfree && _isActive)
 		{
-			QMetaObject::invokeMethod(_messageForwarderFlatBufHelper, "forwardImage", Qt::QueuedConnection, Q_ARG(Image<ColorRgb>, image));
+			QMetaObject::invokeMethod(_messageForwarderFlatBufHelper.get(), "forwardImage", Qt::QueuedConnection, Q_ARG(Image<ColorRgb>, image));
 		}
 	}
 }

bin/create_release.sh

@@ -112,7 +112,8 @@ void JsonConnection::setImage(const QImage& image, int priority, int duration, c
 	// ensure the image has RGB888 format
 	QImage imageARGB32 = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
 	QByteArray binaryImage;
-	binaryImage.reserve(imageARGB32.width() * imageARGB32.height() * 3);
+	binaryImage.reserve(static_cast<qsizetype>(imageARGB32.width()) *
+						static_cast<qsizetype>(imageARGB32.height()) * 3);
 	for (int i = 0; i < imageARGB32.height(); ++i)
 	{
 		const QRgb * scanline = reinterpret_cast<const QRgb *>(imageARGB32.scanLine(i));