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

migrate std::string to qstring + add sysinfo via json (#412)

Browse Source 
* std::string -> qstring part 1

* more string migration

* more string migration ...

* ...

* more qstring mogrations
add sysinfo via json

* remove unneccessary includes

* integrate sysinfo into webui
This commit is contained in:
redPanther
2017-03-04 22:17:42 +01:00
committed by GitHub
parent 19f8928869
commit bfb9a08c80
90 changed files with 539 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
libsrc/utils/jsonschema/QJsonSchemaChecker.cpp
View File

@@ -1,6 +1,5 @@
// stdlib includes
#include <iterator>
#include <sstream>
#include <algorithm>
#include <math.h>
@@ -33,7 +32,7 @@ bool QJsonSchemaChecker::validate(const QJsonObject & value, bool ignoreRequired
_error = false;
_messages.clear();
_currentPath.clear();
_currentPath.push_back("[root]");
_currentPath.append("[root]");
// validate
validate(value, _qSchema);
@@ -116,21 +115,18 @@ void QJsonSchemaChecker::validate(const QJsonValue & value, const QJsonObject &s
{
// no check function defined for this attribute
_error = true;
setMessage(std::string("No check function defined for attribute ") + attribute.toStdString());
setMessage("No check function defined for attribute " + attribute);
continue;
}
}
}
void QJsonSchemaChecker::setMessage(const std::string & message)
void QJsonSchemaChecker::setMessage(const QString & message)
{
std::ostringstream oss;
std::copy(_currentPath.begin(), _currentPath.end(), std::ostream_iterator<std::string>(oss, ""));
oss << ": " << message;
_messages.push_back(oss.str());
_messages.append(_currentPath.join("") +": "+message);
}
const std::list<std::string> & QJsonSchemaChecker::getMessages() const
const QStringList & QJsonSchemaChecker::getMessages() const
{
return _messages;
}
@@ -166,7 +162,7 @@ void QJsonSchemaChecker::checkType(const QJsonValue & value, const QJsonValue &
if (wrongType)
{
_error = true;
setMessage(type.toStdString() + " expected");
setMessage(type + " expected");
}
}
@@ -178,7 +174,7 @@ void QJsonSchemaChecker::checkProperties(const QJsonObject & value, const QJsonO
const QJsonValue & propertyValue = i.value();
_currentPath.push_back(std::string(".") + property.toStdString());
_currentPath.append("." + property);
QJsonObject::const_iterator required = propertyValue.toObject().find("required");
if (value.contains(property))
@@ -190,7 +186,7 @@ void QJsonSchemaChecker::checkProperties(const QJsonObject & value, const QJsonO
_error = true;
setMessage("missing member");
}
_currentPath.pop_back();
_currentPath.removeLast();
}
}
@@ -202,7 +198,7 @@ void QJsonSchemaChecker::checkAdditionalProperties(const QJsonObject & value, co
if (std::find(ignoredProperties.begin(), ignoredProperties.end(), property) == ignoredProperties.end())
{
// property has no property definition. check against the definition for additional properties
_currentPath.push_back(std::string(".") + property.toStdString());
_currentPath.append("." + property);
if (schema.isBool())
{
if (schema.toBool() == false)
@@ -215,7 +211,7 @@ void QJsonSchemaChecker::checkAdditionalProperties(const QJsonObject & value, co
{
validate(value[property].toObject(), schema.toObject());
}
_currentPath.pop_back();
_currentPath.removeLast();
}
}
}
@@ -233,9 +229,7 @@ void QJsonSchemaChecker::checkMinimum(const QJsonValue & value, const QJsonValue
if (value.toDouble() < schema.toDouble())
{
_error = true;
std::ostringstream oss;
oss << "value is too small (minimum=" << schema.toDouble() << ")";
setMessage(oss.str());
setMessage("value is too small (minimum=" + schema.toString() + ")");
}
}
@@ -252,9 +246,7 @@ void QJsonSchemaChecker::checkMaximum(const QJsonValue & value, const QJsonValue
if (value.toDouble() > schema.toDouble())
{
_error = true;
std::ostringstream oss;
oss << "value is too large (maximum=" << schema.toDouble() << ")";
setMessage(oss.str());
setMessage("value is too large (maximum=" + schema.toString() + ")");
}
}
@@ -272,11 +264,9 @@ void QJsonSchemaChecker::checkItems(const QJsonValue & value, const QJsonObject
for(int i = 0; i < jArray.size(); ++i)
{
// validate each item
std::ostringstream oss;
oss << "[" << i << "]";
_currentPath.push_back(oss.str());
_currentPath.append("[" + QString::number(i) + "]");
validate(jArray[i], schema);
_currentPath.pop_back();
_currentPath.removeLast();
}
}
@@ -296,9 +286,7 @@ void QJsonSchemaChecker::checkMinItems(const QJsonValue & value, const QJsonValu
if (static_cast<int>(jArray.size()) < minimum)
{
_error = true;
std::ostringstream oss;
oss << "array is too small (minimum=" << minimum << ")";
setMessage(oss.str());
setMessage("array is too large (minimum=" + QString::number(minimum) + ")");
}
}
@@ -318,9 +306,7 @@ void QJsonSchemaChecker::checkMaxItems(const QJsonValue & value, const QJsonValu
if (static_cast<int>(jArray.size()) > maximum)
{
_error = true;
std::ostringstream oss;
oss << "array is too large (maximum=" << maximum << ")";
setMessage(oss.str());
setMessage("array is too large (maximum=" + QString::number(maximum) + ")");
}
}
@@ -371,10 +357,7 @@ void QJsonSchemaChecker::checkEnum(const QJsonValue & value, const QJsonValue &
// nothing found
_error = true;
std::ostringstream oss;
oss << "Unknown enum value (allowed values are: " << schema.toString().toStdString();
QJsonDocument doc(schema.toArray());
QString strJson(doc.toJson(QJsonDocument::Compact));
oss << strJson.toStdString() << ")";
setMessage(oss.str());
setMessage("Unknown enum value (allowed values are: " + schema.toString() + strJson+ ")");
}