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

Add missing header and code updates

Browse Source
This commit is contained in:
LordGrey 2023-02-11 19:19:41 +01:00
parent 1fa20083c4
commit c08c22bf6a
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libsrc/leddevice/dev_net/ProviderRestApi.cpp
View File

@ -256,30 +256,28 @@ httpResponse ProviderRestApi::getResponse(QNetworkReply* const& reply)
if (reply->error() == QNetworkReply::NoError) if (reply->error() == QNetworkReply::NoError)
{ {
if ( httpStatusCode != HttpStatusCode::NoContent ){ QByteArray replyData = reply->readAll();
QByteArray replyData = reply->readAll();
if (!replyData.isEmpty()) if (!replyData.isEmpty())
{
QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(replyData, &error);
if (error.error != QJsonParseError::NoError)
{ {
QJsonParseError error; //Received not valid JSON response
QJsonDocument jsonDoc = QJsonDocument::fromJson(replyData, &error); response.setError(true);
response.setErrorReason(error.errorString());
if (error.error != QJsonParseError::NoError)
{
//Received not valid JSON response
response.setError(true);
response.setErrorReason(error.errorString());
}
else
{
response.setBody(jsonDoc);
}
} }
else else
{ // Create valid body which is empty {
response.setBody(QJsonDocument()); response.setBody(jsonDoc);
} }
} }
else
{ // Create valid body which is empty
response.setBody(QJsonDocument());
}
} }
else else
{ {
@ -316,12 +314,10 @@ httpResponse ProviderRestApi::getResponse(QNetworkReply* const& reply)
{ {
errorReason = reply->errorString(); errorReason = reply->errorString();
} }
response.setError(true);
response.setErrorReason(errorReason);
}
// Create valid body which is empty }
response.setBody(QJsonDocument()); response.setError(true);
response.setErrorReason(errorReason);
} }
return response; return response;
} }

2
libsrc/leddevice/dev_net/ProviderRestApi.h
View File

@ -13,6 +13,8 @@
#include <QBasicTimer> #include <QBasicTimer>
#include <QTimerEvent> #include <QTimerEvent>
#include <chrono>
constexpr std::chrono::milliseconds DEFAULT_REST_TIMEOUT{ 1000 }; constexpr std::chrono::milliseconds DEFAULT_REST_TIMEOUT{ 1000 };
//Set QNetworkReply timeout without external timer //Set QNetworkReply timeout without external timer