Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

OBSRemoteProtocol: fix mixed indents

Browse Source
This commit is contained in:
Stéphane Lepin 2020-01-28 16:38:57 +01:00
parent 6bfe533a20
commit 8b16abd370
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/protocol/OBSRemoteProtocol.cpp
View File

@ -28,28 +28,28 @@ std::string buildResponse(QString messageId, QString status, obs_data_t* fields
obs_data_apply(response, fields); obs_data_apply(response, fields);
} }
std::string responseString = obs_data_get_json(response); std::string responseString = obs_data_get_json(response);
return responseString; return responseString;
} }
std::string successResponse(QString messageId, obs_data_t* fields = nullptr) { std::string successResponse(QString messageId, obs_data_t* fields = nullptr) {
return buildResponse(messageId, "ok", fields); return buildResponse(messageId, "ok", fields);
} }
std::string errorResponse(QString messageId, QString errorMessage, obs_data_t* additionalFields = nullptr) { std::string errorResponse(QString messageId, QString errorMessage, obs_data_t* additionalFields = nullptr) {
OBSDataAutoRelease fields = obs_data_create(); OBSDataAutoRelease fields = obs_data_create();
obs_data_set_string(fields, "error", errorMessage.toUtf8().constData()); obs_data_set_string(fields, "error", errorMessage.toUtf8().constData());
return buildResponse(messageId, "error", fields); return buildResponse(messageId, "error", fields);
} }
OBSRemoteProtocol::OBSRemoteProtocol(WSRequestHandler& requestHandler) : OBSRemoteProtocol::OBSRemoteProtocol(WSRequestHandler& requestHandler) :
_requestHandler(requestHandler) _requestHandler(requestHandler)
{ {
} }
std::string OBSRemoteProtocol::processMessage(std::string message) std::string OBSRemoteProtocol::processMessage(std::string message)
{ {
std::string msgContainer(message); std::string msgContainer(message);
const char* msg = msgContainer.c_str(); const char* msg = msgContainer.c_str();
OBSDataAutoRelease data = obs_data_create_from_json(msg); OBSDataAutoRelease data = obs_data_create_from_json(msg);
@ -58,28 +58,28 @@ std::string OBSRemoteProtocol::processMessage(std::string message)
return errorResponse(nullptr, "invalid JSON payload"); return errorResponse(nullptr, "invalid JSON payload");
} }
if (!obs_data_has_user_value(data, "request-type") || !obs_data_has_user_value(data, "message-id")) { if (!obs_data_has_user_value(data, "request-type") || !obs_data_has_user_value(data, "message-id")) {
return errorResponse(nullptr, "missing request parameters"); return errorResponse(nullptr, "missing request parameters");
} }
QString methodName = obs_data_get_string(data, "request-type"); QString methodName = obs_data_get_string(data, "request-type");
QString messageId = obs_data_get_string(data, "message-id"); QString messageId = obs_data_get_string(data, "message-id");
OBSDataAutoRelease params = obs_data_create(); OBSDataAutoRelease params = obs_data_create();
obs_data_apply(params, data); obs_data_apply(params, data);
obs_data_unset_user_value(params, "request-type"); obs_data_unset_user_value(params, "request-type");
obs_data_unset_user_value(params, "message-id"); obs_data_unset_user_value(params, "message-id");
RpcRequest request(messageId, methodName, params); RpcRequest request(messageId, methodName, params);
RpcResponse response = _requestHandler.processRequest(request); RpcResponse response = _requestHandler.processRequest(request);
OBSData additionalFields = response.additionalFields(); OBSData additionalFields = response.additionalFields();
switch (response.status()) { switch (response.status()) {
case RpcResponse::Status::Ok: case RpcResponse::Status::Ok:
return successResponse(messageId, additionalFields); return successResponse(messageId, additionalFields);
case RpcResponse::Status::Error: case RpcResponse::Status::Error:
return errorResponse(messageId, response.errorMessage(), additionalFields); return errorResponse(messageId, response.errorMessage(), additionalFields);
} }
return std::string(); return std::string();
} }

6
src/protocol/OBSRemoteProtocol.h
View File

@ -26,9 +26,9 @@ class WSRequestHandler;
class OBSRemoteProtocol class OBSRemoteProtocol
{ {
public: public:
explicit OBSRemoteProtocol(WSRequestHandler& requestHandler); explicit OBSRemoteProtocol(WSRequestHandler& requestHandler);
std::string processMessage(std::string message); std::string processMessage(std::string message);
private: private:
WSRequestHandler& _requestHandler; WSRequestHandler& _requestHandler;
}; };