diff --git a/app/src/websockets/websocketserver.cpp b/app/src/websockets/websocketserver.cpp index 8fae98925917621b63db8e9f3271190af47c2353..597c3d6c1479dcbd2fe5f8869c99163af084efa4 100644 --- a/app/src/websockets/websocketserver.cpp +++ b/app/src/websockets/websocketserver.cpp @@ -116,9 +116,7 @@ void WebSocketServer::execRequest(const QJsonObject &request) QString func = request["func"].toString(); QJsonArray arg = request["arg"].toArray(); - QJsonObject response; - response["id"] = id; - response["func"] = func; + QJsonArray result; // WebSocketServer if (func == "WebSocketServer::stop") { @@ -126,106 +124,106 @@ void WebSocketServer::execRequest(const QJsonObject &request) return; } else if (func == "WebSocketServer::isError") { - response["result"] = isError(); + result[0] = isError(); } else if (func == "WebSocketServer::errorString") { - response["result"] = errorString(); + result[0] = errorString(); } else if (func == "WebSocketServer::serverUrl") { - response["result"] = serverUrl().toString(); + result[0] = serverUrl().toString(); } // ConfigHandler else if (func == "ConfigHandler::getAppConfigApplication") { - response["result"] = configHandler_->getAppConfigApplication(); + result[0] = configHandler_->getAppConfigApplication(); } else if (func == "ConfigHandler::getAppConfigInstallTypes") { - response["result"] = configHandler_->getAppConfigInstallTypes(); + result[0] = configHandler_->getAppConfigInstallTypes(); } else if (func == "ConfigHandler::getUsrConfigApplication") { - response["result"] = configHandler_->getUsrConfigApplication(); + result[0] = configHandler_->getUsrConfigApplication(); } else if (func == "ConfigHandler::setUsrConfigApplication") { - response["result"] = configHandler_->setUsrConfigApplication(arg[0].toObject()); + result[0] = configHandler_->setUsrConfigApplication(arg[0].toObject()); } else if (func == "ConfigHandler::getUsrConfigProviders") { - response["result"] = configHandler_->getUsrConfigProviders(); + result[0] = configHandler_->getUsrConfigProviders(); } else if (func == "ConfigHandler::setUsrConfigProviders") { - response["result"] = configHandler_->setUsrConfigProviders(arg[0].toObject()); + result[0] = configHandler_->setUsrConfigProviders(arg[0].toObject()); } else if (func == "ConfigHandler::getUsrConfigCategories") { - response["result"] = configHandler_->getUsrConfigCategories(); + result[0] = configHandler_->getUsrConfigCategories(); } else if (func == "ConfigHandler::setUsrConfigCategories") { - response["result"] = configHandler_->setUsrConfigCategories(arg[0].toObject()); + result[0] = configHandler_->setUsrConfigCategories(arg[0].toObject()); } else if (func == "ConfigHandler::getUsrConfigInstalledItems") { - response["result"] = configHandler_->getUsrConfigInstalledItems(); + result[0] = configHandler_->getUsrConfigInstalledItems(); } else if (func == "ConfigHandler::setUsrConfigInstalledItems") { - response["result"] = configHandler_->setUsrConfigInstalledItems(arg[0].toObject()); + result[0] = configHandler_->setUsrConfigInstalledItems(arg[0].toObject()); } else if (func == "ConfigHandler::setUsrConfigProvidersProvider") { - response["result"] = configHandler_->setUsrConfigProvidersProvider(arg[0].toString(), arg[1].toObject()); + result[0] = configHandler_->setUsrConfigProvidersProvider(arg[0].toString(), arg[1].toObject()); } else if (func == "ConfigHandler::removeUsrConfigProvidersProvider") { - response["result"] = configHandler_->removeUsrConfigProvidersProvider(arg[0].toString()); + result[0] = configHandler_->removeUsrConfigProvidersProvider(arg[0].toString()); } else if (func == "ConfigHandler::setUsrConfigCategoriesProvider") { - response["result"] = configHandler_->setUsrConfigCategoriesProvider(arg[0].toString(), arg[1].toObject()); + result[0] = configHandler_->setUsrConfigCategoriesProvider(arg[0].toString(), arg[1].toObject()); } else if (func == "ConfigHandler::removeUsrConfigCategoriesProvider") { - response["result"] = configHandler_->removeUsrConfigCategoriesProvider(arg[0].toString()); + result[0] = configHandler_->removeUsrConfigCategoriesProvider(arg[0].toString()); } else if (func == "ConfigHandler::setUsrConfigCategoriesInstallType") { - response["result"] = configHandler_->setUsrConfigCategoriesInstallType(arg[0].toString(), arg[1].toString(), arg[2].toString()); + result[0] = configHandler_->setUsrConfigCategoriesInstallType(arg[0].toString(), arg[1].toString(), arg[2].toString()); } else if (func == "ConfigHandler::setUsrConfigInstalledItemsItem") { - response["result"] = configHandler_->setUsrConfigInstalledItemsItem(arg[0].toString(), arg[1].toObject()); + result[0] = configHandler_->setUsrConfigInstalledItemsItem(arg[0].toString(), arg[1].toObject()); } else if (func == "ConfigHandler::removeUsrConfigInstalledItemsItem") { - response["result"] = configHandler_->removeUsrConfigInstalledItemsItem(arg[0].toString()); + result[0] = configHandler_->removeUsrConfigInstalledItemsItem(arg[0].toString()); } // SystemHandler else if (func == "SystemHandler::isUnix") { - response["result"] = systemHandler_->isUnix(); + result[0] = systemHandler_->isUnix(); } else if (func == "SystemHandler::desktopEnvironment") { - response["result"] = systemHandler_->desktopEnvironment(); + result[0] = systemHandler_->desktopEnvironment(); } else if (func == "SystemHandler::isApplicableType") { - response["result"] = systemHandler_->isApplicableType(arg[0].toString()); + result[0] = systemHandler_->isApplicableType(arg[0].toString()); } else if (func == "SystemHandler::applyFile") { - response["result"] = false; + result[0] = false; #ifdef QTLIB_UNIX - response["result"] = systemHandler_->applyFile(arg[0].toString(), arg[1].toString()); + result[0] = systemHandler_->applyFile(arg[0].toString(), arg[1].toString()); #endif } // OcsHandler else if (func == "OcsHandler::addProviders") { - response["result"] = ocsHandler_->addProviders(arg[0].toString()); + result[0] = ocsHandler_->addProviders(arg[0].toString()); } else if (func == "OcsHandler::removeProvider") { - response["result"] = ocsHandler_->removeProvider(arg[0].toString()); + result[0] = ocsHandler_->removeProvider(arg[0].toString()); } else if (func == "OcsHandler::updateAllCategories") { - response["result"] = ocsHandler_->updateAllCategories(arg[0].toBool()); + result[0] = ocsHandler_->updateAllCategories(arg[0].toBool()); } else if (func == "OcsHandler::updateCategories") { - response["result"] = ocsHandler_->updateCategories(arg[0].toString(), arg[1].toBool()); + result[0] = ocsHandler_->updateCategories(arg[0].toString(), arg[1].toBool()); } else if (func == "OcsHandler::getContents") { - response["result"] = ocsHandler_->getContents(arg[0].toString(), arg[1].toString(), + result[0] = ocsHandler_->getContents(arg[0].toString(), arg[1].toString(), arg[2].toString(), arg[3].toString(), arg[4].toString(), arg[5].toString(), arg[6].toInt(), arg[7].toInt()); } else if (func == "OcsHandler::getContent") { - response["result"] = ocsHandler_->getContent(arg[0].toString(), arg[1].toString()); + result[0] = ocsHandler_->getContent(arg[0].toString(), arg[1].toString()); } // ItemHandler else if (func == "ItemHandler::metadataSet") { - response["result"] = itemHandler_->metadataSet(); + result[0] = itemHandler_->metadataSet(); } else if (func == "ItemHandler::download") { itemHandler_->download(arg[0].toString(), arg[1].toString(), arg[2].toString(), arg[3].toString()); @@ -240,6 +238,10 @@ void WebSocketServer::execRequest(const QJsonObject &request) return; } + QJsonObject response; + response["id"] = id; + response["func"] = func; + response["result"] = result; sendResponse(response); } @@ -249,7 +251,7 @@ void WebSocketServer::sendResponse(const QJsonObject &response) { "id": "example", "func": "functionName", - "result": mixed + "result": ["value", 2, true] } */