JsonUtils & improvements (#476)

* add JsonUtils * update * repair * update * ident * Schema correct msg other adjusts * fix effDel, ExceptionLog, cleanup * fix travis qt5.2 * not so funny * use Qthread interrupt instead abort bool * update services
2025-03-01 10:33:28 +00:00 · 2017-10-12 11:55:03 +02:00
parent 47641012ee
commit 838008568a
42 changed files with 940 additions and 701 deletions
--- a/libsrc/utils/FileUtils.cpp
+++ b/libsrc/utils/FileUtils.cpp
@@ -1,20 +1,146 @@
 #include <utils/FileUtils.h>

+// qt incl
 #include <QFileInfo>
+#include <QDebug>
+
+// hyperion include
+#include <hyperion/Hyperion.h>

 namespace FileUtils {
-	
-QString getBaseName( QString sourceFile)
-{
-	QFileInfo fi( sourceFile );
-	return fi.fileName();
-}
- 
-QString getDirName( QString sourceFile)
-{
-	QFileInfo fi( sourceFile );
-	return fi.path();
-}
- 

-};
+	QString getBaseName( QString sourceFile)
+	{
+		QFileInfo fi( sourceFile );
+		return fi.fileName();
+	}
+
+	QString getDirName( QString sourceFile)
+	{
+		QFileInfo fi( sourceFile );
+		return fi.path();
+	}
+
+	bool fileExists(const QString& path, Logger* log, bool ignError)
+	{
+		QFile file(path);
+		if(!file.exists())
+		{
+			ErrorIf((!ignError), log,"File does not exist: %s",QSTRING_CSTR(path));
+			return false;
+		}
+		return true;
+	}
+
+	bool readFile(const QString& path, QString& data, Logger* log, bool ignError)
+	{
+		QFile file(path);
+		if(!fileExists(path, log, ignError))
+		{
+			return false;
+		}
+
+		if(!file.open(QFile::ReadOnly | QFile::Text))
+		{
+			if(!ignError)
+				resolveFileError(file,log);
+			return false;
+		}
+		data = QString(file.readAll());
+		file.close();
+
+		return true;
+	}
+
+	bool writeFile(const QString& path, const QByteArray& data, Logger* log)
+	{
+		QFile file(path);
+		if (!file.open(QFile::WriteOnly | QFile::Truncate))
+		{
+			resolveFileError(file,log);
+			return false;
+		}
+
+		if(file.write(data) == -1)
+		{
+			resolveFileError(file,log);
+			return false;
+		}
+
+		file.close();
+		return true;
+	}
+
+	bool removeFile(const QString& path, Logger* log)
+	{
+		QFile file(path);
+		if(!file.remove())
+		{
+			resolveFileError(file,log);
+			return false;
+		}
+		return true;
+	}
+	
+ 	QString convertPath(const QString path)
+ 	{
+		QString p = path;
+		return p.replace(QString("$ROOT"), Hyperion::getInstance()->getRootPath());
+	}
+
+	void resolveFileError(const QFile& file, Logger* log)
+	{
+		QFile::FileError error = file.error();
+		const char* fn = QSTRING_CSTR(file.fileName());
+		switch(error)
+		{
+			case QFileDevice::NoError:
+				Debug(log,"No error occurred while procesing file: %s",fn);
+				break;
+			case QFileDevice::ReadError:
+				Error(log,"Can't read file: %s",fn);
+				break;
+			case QFileDevice::WriteError:
+				Error(log,"Can't write file: %s",fn);
+				break;
+			case QFileDevice::FatalError:
+				Error(log,"Fatal error while processing file: %s",fn);
+				break;
+			case QFileDevice::ResourceError:
+				Error(log,"Resource Error while processing file: %s",fn);
+				break;
+			case QFileDevice::OpenError:
+				Error(log,"Can't open file: %s",fn);
+				break;
+			case QFileDevice::AbortError:
+				Error(log,"Abort Error while processing file: %s",fn);
+				break;
+			case QFileDevice::TimeOutError:
+				Error(log,"Timeout Error while processing file: %s",fn);
+				break;
+			case QFileDevice::UnspecifiedError:
+				Error(log,"Unspecified Error while processing file: %s",fn);
+				break;
+			case QFileDevice::RemoveError:
+				Error(log,"Failed to remove file: %s",fn);
+				break;
+			case QFileDevice::RenameError:
+				Error(log,"Failed to rename file: %s",fn);
+				break;
+			case QFileDevice::PositionError:
+				Error(log,"Position Error while processing file: %s",fn);
+				break;
+			case QFileDevice::ResizeError:
+				Error(log,"Resize Error while processing file: %s",fn);
+				break;
+			case QFileDevice::PermissionsError:
+				Error(log,"Permission Error at file: %s",fn);
+				break;
+			case QFileDevice::CopyError:
+				Error(log,"Error during file copy of file: %s",fn);
+				break;
+			default:
+				break;
+		}
+	}
+};
--- a/libsrc/utils/JsonProcessor.cpp
+++ b/libsrc/utils/JsonProcessor.cpp
@@ -1,4 +1,3 @@
-
 // project includes
 #include <utils/JsonProcessor.h>

@@ -12,13 +11,11 @@
 #include <QResource>
 #include <QDateTime>
 #include <QCryptographicHash>
-#include <QFile>
-#include <QFileInfo>
-#include <QJsonDocument>
-#include <QDir>
 #include <QImage>
 #include <QBuffer>
 #include <QByteArray>
+#include <QFileInfo>
+#include <QDir>
 #include <QIODevice>
 #include <QDateTime>

@@ -32,24 +29,25 @@
 #include <leddevice/LedDevice.h>
 #include <hyperion/GrabberWrapper.h>
 #include <utils/Process.h>
+#include <utils/JsonUtils.h>

 using namespace hyperion;

 std::map<hyperion::Components, bool> JsonProcessor::_componentsPrevState;

-JsonProcessor::JsonProcessor(QString peerAddress, bool noListener)
+JsonProcessor::JsonProcessor(QString peerAddress, Logger* log, bool noListener)
 	: QObject()
-    , _peerAddress(peerAddress)
-	, _log(Logger::getInstance("JSONRPCPROCESSOR"))
+	, _peerAddress(peerAddress)
+	, _log(log)
 	, _hyperion(Hyperion::getInstance())
 	, _imageProcessor(ImageProcessorFactory::getInstance().newImageProcessor())
 	, _streaming_logging_activated(false)
 	, _image_stream_timeout(0)
 {
-    // notify hyperion about a jsonMessageForward
-    connect(this, &JsonProcessor::forwardJsonMessage, _hyperion, &Hyperion::forwardJsonMessage);
-    // notify hyperion about a push emit
-    connect(this, &JsonProcessor::pushReq, _hyperion, &Hyperion::hyperionStateChanged);
+	// notify hyperion about a jsonMessageForward
+	connect(this, &JsonProcessor::forwardJsonMessage, _hyperion, &Hyperion::forwardJsonMessage);
+	// notify hyperion about a push emit TODO: Remove! Make sure that the target of the commands trigger this (less error margin) instead this instance
+	connect(this, &JsonProcessor::pushReq, _hyperion, &Hyperion::hyperionStateChanged);

 	if(!noListener)
 	{
@@ -73,77 +71,51 @@ void JsonProcessor::handleMessage(const QString& messageString, const QString pe
 	if(!peerAddress.isNull())
 		_peerAddress = peerAddress;

-	QString errors;
+	const QString ident = "JsonRpc@"+_peerAddress;
+	Q_INIT_RESOURCE(JSONRPC_schemas);
+	QJsonObject message;
+	// parse the message
+	if(!JsonUtils::parse(ident, messageString, message, _log))
+	{
+		sendErrorReply("Errors during message parsing, please consult the Hyperion Log. Data:"+messageString);
+		return;
+	}

- 	try
- 	{
-		QJsonParseError error;
-		QJsonDocument doc = QJsonDocument::fromJson(messageString.toUtf8(), &error);
+	// check basic message
+	if(!JsonUtils::validate(ident, message, ":schema", _log))
+	{
+		sendErrorReply("Errors during message validation, please consult the Hyperion Log.");
+		return;
+	}

-		if (error.error != QJsonParseError::NoError)
-		{
-			// report to the user the failure and their locations in the document.
-			int errorLine(0), errorColumn(0);
+	// check specific message
+	const QString command = message["command"].toString();
+	if(!JsonUtils::validate(ident, message, QString(":schema-%1").arg(command), _log))
+	{
+		sendErrorReply("Errors during specific message validation, please consult the Hyperion Log");
+		return;
+	}

-			for( int i=0, count=qMin( error.offset,messageString.size()); i<count; ++i )
-			{
-				++errorColumn;
-				if(messageString.at(i) == '\n' )
-				{
-					errorColumn = 0;
-					++errorLine;
-				}
-			}
-
-			std::stringstream sstream;
-			sstream << "Error while parsing json: " << error.errorString().toStdString() << " at Line: " << errorLine << ", Column: " << errorColumn;
-			sendErrorReply(QString::fromStdString(sstream.str()));
-			return;
-		}
-
-		const QJsonObject message = doc.object();
-
-		// check basic message
-		if (!checkJson(message, ":schema", errors))
-		{
-			sendErrorReply("Error while validating json: " + errors);
-			return;
-		}
-
-		// check specific message
-		const QString command = message["command"].toString();
-		if (!checkJson(message, QString(":schema-%1").arg(command), errors))
-		{
-			sendErrorReply("Error while validating json: " + errors);
-			return;
-		}
-
-		int tan = message["tan"].toInt(0);
-		// switch over all possible commands and handle them
-		if      (command == "color")          handleColorCommand         (message, command, tan);
-		else if (command == "image")          handleImageCommand         (message, command, tan);
-		else if (command == "effect")         handleEffectCommand        (message, command, tan);
-		else if (command == "create-effect")  handleCreateEffectCommand  (message, command, tan);
-		else if (command == "delete-effect")  handleDeleteEffectCommand  (message, command, tan);
-		else if (command == "sysinfo")        handleSysInfoCommand       (message, command, tan);
-		else if (command == "serverinfo")     handleServerInfoCommand    (message, command, tan);
-		else if (command == "clear")          handleClearCommand         (message, command, tan);
-		else if (command == "clearall")       handleClearallCommand      (message, command, tan);
-		else if (command == "adjustment")     handleAdjustmentCommand    (message, command, tan);
-		else if (command == "sourceselect")   handleSourceSelectCommand  (message, command, tan);
-		else if (command == "config")         handleConfigCommand        (message, command, tan);
-		else if (command == "componentstate") handleComponentStateCommand(message, command, tan);
-		else if (command == "ledcolors")      handleLedColorsCommand     (message, command, tan);
-		else if (command == "logging")        handleLoggingCommand       (message, command, tan);
-		else if (command == "processing")     handleProcessingCommand    (message, command, tan);
-		else if (command == "videomode")      handleVideoModeCommand     (message, command, tan);
-		else                                  handleNotImplemented       ();
- 	}
- 	catch (std::exception& e)
- 	{
- 		sendErrorReply("Error while processing incoming json message: " + QString(e.what()) + " " + errors );
- 		Warning(_log, "Error while processing incoming json message: %s (%s)", e.what(), errors.toStdString().c_str());
- 	}
+	int tan = message["tan"].toInt();
+	// switch over all possible commands and handle them
+	if      (command == "color")          handleColorCommand         (message, command, tan);
+	else if (command == "image")          handleImageCommand         (message, command, tan);
+	else if (command == "effect")         handleEffectCommand        (message, command, tan);
+	else if (command == "create-effect")  handleCreateEffectCommand  (message, command, tan);
+	else if (command == "delete-effect")  handleDeleteEffectCommand  (message, command, tan);
+	else if (command == "sysinfo")        handleSysInfoCommand       (message, command, tan);
+	else if (command == "serverinfo")     handleServerInfoCommand    (message, command, tan);
+	else if (command == "clear")          handleClearCommand         (message, command, tan);
+	else if (command == "clearall")       handleClearallCommand      (message, command, tan);
+	else if (command == "adjustment")     handleAdjustmentCommand    (message, command, tan);
+	else if (command == "sourceselect")   handleSourceSelectCommand  (message, command, tan);
+	else if (command == "config")         handleConfigCommand        (message, command, tan);
+	else if (command == "componentstate") handleComponentStateCommand(message, command, tan);
+	else if (command == "ledcolors")      handleLedColorsCommand     (message, command, tan);
+	else if (command == "logging")        handleLoggingCommand       (message, command, tan);
+	else if (command == "processing")     handleProcessingCommand    (message, command, tan);
+	else if (command == "videomode")      handleVideoModeCommand     (message, command, tan);
+	else                                  handleNotImplemented       ();
 }

 void JsonProcessor::handleColorCommand(const QJsonObject& message, const QString& command, const int tan)
@@ -247,114 +219,105 @@ void JsonProcessor::handleEffectCommand(const QJsonObject& message, const QStrin

 void JsonProcessor::handleCreateEffectCommand(const QJsonObject& message, const QString &command, const int tan)
 {
-	if(message.size() > 0)
+	if (!message["args"].toObject().isEmpty())
 	{
-		if (!message["args"].toObject().isEmpty())
+		QString scriptName;
+		(message["script"].toString().mid(0, 1)  == ":" )
+			? scriptName = ":/effects//" + message["script"].toString().mid(1)
+			: scriptName = message["script"].toString();
+
+		std::list<EffectSchema> effectsSchemas = _hyperion->getEffectSchemas();
+		std::list<EffectSchema>::iterator it = std::find_if(effectsSchemas.begin(), effectsSchemas.end(), find_schema(scriptName));
+
+		if (it != effectsSchemas.end())
 		{
-			QString scriptName;
-			(message["script"].toString().mid(0, 1)  == ":" )
-				? scriptName = ":/effects//" + message["script"].toString().mid(1)
-				: scriptName = message["script"].toString();
-
-			std::list<EffectSchema> effectsSchemas = _hyperion->getEffectSchemas();
-			std::list<EffectSchema>::iterator it = std::find_if(effectsSchemas.begin(), effectsSchemas.end(), find_schema(scriptName));
-
-			if (it != effectsSchemas.end())
+			if(!JsonUtils::validate("JsonRpc@"+_peerAddress, message["args"].toObject(), it->schemaFile, _log))
 			{
-				QString errors;
+				sendErrorReply("Error during arg validation against schema, please consult the Hyperion Log", command, tan);
+				return;
+			}

-				if (!checkJson(message["args"].toObject(), it->schemaFile, errors))
+			QJsonObject effectJson;
+			QJsonArray effectArray;
+			effectArray = _hyperion->getQJsonConfig()["effects"].toObject()["paths"].toArray();
+
+			if (effectArray.size() > 0)
+			{
+				if (message["name"].toString().trimmed().isEmpty() || message["name"].toString().trimmed().startsWith("."))
 				{
-					sendErrorReply("Error while validating json: " + errors, command, tan);
+					sendErrorReply("Can't save new effect. Effect name is empty or begins with a dot.", command, tan);
 					return;
 				}

-				QJsonObject effectJson;
-				QJsonArray effectArray;
-				effectArray = _hyperion->getQJsonConfig()["effects"].toObject()["paths"].toArray();
+				effectJson["name"] = message["name"].toString();
+				effectJson["script"] = message["script"].toString();
+				effectJson["args"] = message["args"].toObject();

-				if (effectArray.size() > 0)
+				std::list<EffectDefinition> availableEffects = _hyperion->getEffects();
+				std::list<EffectDefinition>::iterator iter = std::find_if(availableEffects.begin(), availableEffects.end(), find_effect(message["name"].toString()));
+
+				QFileInfo newFileName;
+				if (iter != availableEffects.end())
 				{
-					if (message["name"].toString().trimmed().isEmpty() || message["name"].toString().trimmed().startsWith("."))
+					newFileName.setFile(iter->file);
+					if (newFileName.absoluteFilePath().mid(0, 1)  == ":")
 					{
-						sendErrorReply("Can't save new effect. Effect name is empty or begins with a dot.", command, tan);
+						sendErrorReply("The effect name '" + message["name"].toString() + "' is assigned to an internal effect. Please rename your effekt.", command, tan);
 						return;
 					}
-
-					effectJson["name"] = message["name"].toString();
-					effectJson["script"] = message["script"].toString();
-					effectJson["args"] = message["args"].toObject();
-
-					std::list<EffectDefinition> availableEffects = _hyperion->getEffects();
-					std::list<EffectDefinition>::iterator iter = std::find_if(availableEffects.begin(), availableEffects.end(), find_effect(message["name"].toString()));
-
-					QFileInfo newFileName;
-					if (iter != availableEffects.end())
-					{
-						newFileName.setFile(iter->file);
-						if (newFileName.absoluteFilePath().mid(0, 1)  == ":")
-						{
-							sendErrorReply("The effect name '" + message["name"].toString() + "' is assigned to an internal effect. Please rename your effekt.", command, tan);
-							return;
-						}
-					} else
-					{
-						newFileName.setFile(effectArray[0].toString() + QDir::separator() + message["name"].toString().replace(QString(" "), QString("")) + QString(".json"));
-
-						while(newFileName.exists())
-						{
-							newFileName.setFile(effectArray[0].toString() + QDir::separator() + newFileName.baseName() + QString::number(qrand() % ((10) - 0) + 0) + QString(".json"));
-						}
-					}
-
-					QJsonFactory::writeJson(newFileName.absoluteFilePath(), effectJson);
-					Info(_log, "Reload effect list");
-					_hyperion->reloadEffects();
-					sendSuccessReply(command, tan);
 				} else
 				{
-					sendErrorReply("Can't save new effect. Effect path empty", command, tan);
+					QString f = FileUtils::convertPath(effectArray[0].toString() + "/" + message["name"].toString().replace(QString(" "), QString("")) + QString(".json"));
+					newFileName.setFile(f);
+				}
+
+				if(!JsonUtils::write(newFileName.absoluteFilePath(), effectJson, _log))
+				{
+					sendErrorReply("Error while saving effect, please check the Hyperion Log", command, tan);
 					return;
 				}
+
+				Info(_log, "Reload effect list");
+				_hyperion->reloadEffects();
+				sendSuccessReply(command, tan);
 			} else
-				sendErrorReply("Missing schema file for Python script " + message["script"].toString(), command, tan);
+			{
+				sendErrorReply("Can't save new effect. Effect path empty", command, tan);
+				return;
+			}
 		} else
-			sendErrorReply("Missing or empty Object 'args'", command, tan);
+			sendErrorReply("Missing schema file for Python script " + message["script"].toString(), command, tan);
 	} else
-		sendErrorReply("Error while parsing json: Message size " + QString(message.size()), command, tan);
+		sendErrorReply("Missing or empty Object 'args'", command, tan);
 }

 void JsonProcessor::handleDeleteEffectCommand(const QJsonObject& message, const QString& command, const int tan)
 {
-	if(message.size() > 0)
-	{
-		QString effectName = message["name"].toString();
-		std::list<EffectDefinition> effectsDefinition = _hyperion->getEffects();
-		std::list<EffectDefinition>::iterator it = std::find_if(effectsDefinition.begin(), effectsDefinition.end(), find_effect(effectName));
+	QString effectName = message["name"].toString();
+	std::list<EffectDefinition> effectsDefinition = _hyperion->getEffects();
+	std::list<EffectDefinition>::iterator it = std::find_if(effectsDefinition.begin(), effectsDefinition.end(), find_effect(effectName));

-		if (it != effectsDefinition.end())
+	if (it != effectsDefinition.end())
+	{
+		QFileInfo effectConfigurationFile(it->file);
+		if (effectConfigurationFile.absoluteFilePath().mid(0, 1)  != ":" )
 		{
-			QFileInfo effectConfigurationFile(it->file);
-			if (effectConfigurationFile.absoluteFilePath().mid(0, 1)  != ":" )
+			if (effectConfigurationFile.exists())
 			{
-				if (effectConfigurationFile.exists())
+				bool result = QFile::remove(effectConfigurationFile.absoluteFilePath());
+				if (result)
 				{
-					bool result = QFile::remove(effectConfigurationFile.absoluteFilePath());
-					if (result)
-					{
-						Info(_log, "Reload effect list");
-						_hyperion->reloadEffects();
-						sendSuccessReply(command, tan);
-					} else
-						sendErrorReply("Can't delete effect configuration file: " + effectConfigurationFile.absoluteFilePath() + ". Please check permissions", command, tan);
+					Info(_log, "Reload effect list");
+					_hyperion->reloadEffects();
+					sendSuccessReply(command, tan);
 				} else
-					sendErrorReply("Can't find effect configuration file: " + effectConfigurationFile.absoluteFilePath(), command, tan);
+					sendErrorReply("Can't delete effect configuration file: " + effectConfigurationFile.absoluteFilePath() + ". Please check permissions", command, tan);
 			} else
-				sendErrorReply("Can't delete internal effect: " + message["name"].toString(), command, tan);
+				sendErrorReply("Can't find effect configuration file: " + effectConfigurationFile.absoluteFilePath(), command, tan);
 		} else
-			sendErrorReply("Effect " + message["name"].toString() + " not found", command, tan);
+			sendErrorReply("Can't delete internal effect: " + message["name"].toString(), command, tan);
 	} else
-		sendErrorReply("Error while parsing json: Message size " + QString(message.size()), command, tan);
+		sendErrorReply("Effect " + message["name"].toString() + " not found", command, tan);
 }

 void JsonProcessor::handleSysInfoCommand(const QJsonObject&, const QString& command, const int tan)
@@ -889,14 +852,7 @@ void JsonProcessor::handleConfigGetCommand(const QJsonObject& message, const QSt
 	result["command"] = command;
 	result["tan"] = tan;

-	try
-	{
-		result["result"] = QJsonFactory::readConfig(_hyperion->getConfigFileName());
-	}
-	catch(...)
-	{
-		result["result"] = _hyperion->getQJsonConfig();
-	}
+	result["result"] = _hyperion->getQJsonConfig();

 	// send the result
 	emit callbackMessage(result);
@@ -1146,62 +1102,6 @@ void JsonProcessor::sendErrorReply(const QString &error, const QString &command,
 	emit callbackMessage(reply);
 }

-bool JsonProcessor::checkJson(const QJsonObject& message, const QString& schemaResource, QString& errorMessage, bool ignoreRequired)
-{
-	// make sure the resources are loaded (they may be left out after static linking)
-	Q_INIT_RESOURCE(JSONRPC_schemas);
-	QJsonParseError error;
-
-	// read the json schema from the resource
-	QFile schemaData(schemaResource);
-	if (!schemaData.open(QIODevice::ReadOnly))
-	{
-		errorMessage = "Schema error: " + schemaData.errorString();
-		return false;
-	}
-
-	// create schema checker
-	QByteArray schema = schemaData.readAll();
-	QJsonDocument schemaJson = QJsonDocument::fromJson(schema, &error);
-	schemaData.close();
-
-	if (error.error != QJsonParseError::NoError)
-	{
-		// report to the user the failure and their locations in the document.
-		int errorLine(0), errorColumn(0);
-
-		for( int i=0, count=qMin( error.offset,schema.size()); i<count; ++i )
-		{
-			++errorColumn;
-			if(schema.at(i) == '\n' )
-			{
-				errorColumn = 0;
-				++errorLine;
-			}
-		}
-
-		errorMessage = "Schema error: " + error.errorString() + " at Line: " + QString::number(errorLine) + ", Column: " + QString::number(errorColumn);
-		return false;
-	}
-
-	QJsonSchemaChecker schemaChecker;
-	schemaChecker.setSchema(schemaJson.object());
-
-	// check the message
-	if (!schemaChecker.validate(message, ignoreRequired).first)
-	{
-		const QStringList & errors = schemaChecker.getMessages();
-		errorMessage = "{";
-		foreach (auto & error, errors)
-		{
-			errorMessage += error + " ";
-		}
-		errorMessage += "}";
-		return false;
-	}
-
-	return true;
-}

 void JsonProcessor::streamLedcolorsUpdate()
 {
--- a/libsrc/utils/JsonUtils.cpp
+++ b/libsrc/utils/JsonUtils.cpp
@@ -0,0 +1,129 @@
+//project include
+#include <utils/JsonUtils.h>
+
+// util includes
+#include <utils/jsonschema/QJsonSchemaChecker.h>
+
+//qt includes
+#include <QRegularExpression>
+#include <QJsonObject>
+#include <QJsonParseError>
+
+#include <QDebug>
+
+namespace JsonUtils {
+
+	bool readFile(const QString& path, QJsonObject& obj, Logger* log, bool ignError)
+	{
+		QString data;
+		if(!FileUtils::readFile(path, data, log, ignError))
+			return false;
+
+		if(!parse(path, data, obj, log))
+			return false;
+
+		return true;
+	}
+
+	bool readSchema(const QString& path, QJsonObject& obj, Logger* log)
+	{
+		QJsonObject schema;
+		if(!readFile(path, schema, log))
+			return false;
+
+		if(!resolveRefs(schema, obj, log))
+			return false;
+
+		return true;
+	}
+
+	bool parse(const QString& path, const QString& data, QJsonObject& obj, Logger* log)
+	{
+		//remove Comments in data
+		QString cleanData = data;
+		cleanData.remove(QRegularExpression("([^:]?\\/\\/.*)"));
+
+		QJsonParseError error;
+		QJsonDocument doc = QJsonDocument::fromJson(cleanData.toUtf8(), &error);
+
+		if (error.error != QJsonParseError::NoError)
+		{
+			// report to the user the failure and their locations in the document.
+			int errorLine(0), errorColumn(0);
+
+			for( int i=0, count=qMin( error.offset,cleanData.size()); i<count; ++i )
+			{
+				++errorColumn;
+				if(data.at(i) == '\n' )
+				{
+					errorColumn = 0;
+					++errorLine;
+				}
+			}
+			Error(log,"Failed to parse json data from %s: Error: %s at Line: %i, Column: %i", QSTRING_CSTR(path), QSTRING_CSTR(error.errorString()), errorLine, errorColumn);
+			return false;
+		}
+		obj = doc.object();
+		return true;
+	}
+
+	bool validate(const QString& file, const QJsonObject& json, const QString& schemaPath, Logger* log)
+	{
+		// get the schema data
+		QJsonObject schema;
+		if(!readFile(schemaPath, schema, log))
+			return false;
+
+		QJsonSchemaChecker schemaChecker;
+		schemaChecker.setSchema(schema);
+		if (!schemaChecker.validate(json).first)
+		{
+			const QStringList & errors = schemaChecker.getMessages();
+			for (auto & error : errors)
+			{
+				Error(log, "While validating schema against json data of '%s':%s", QSTRING_CSTR(file), QSTRING_CSTR(error));
+			}
+			return false;
+		}
+		return true;
+	}
+
+	bool write(const QString& filename, const QJsonObject& json, Logger* log)
+	{
+		QJsonDocument doc;
+
+		doc.setObject(json);
+		QByteArray data = doc.toJson(QJsonDocument::Indented);
+
+		if(!FileUtils::writeFile(filename, data, log))
+			return false;
+
+		return true;
+	}
+
+	bool resolveRefs(const QJsonObject& schema, QJsonObject& obj, Logger* log)
+	{
+		for (QJsonObject::const_iterator i = schema.begin(); i != schema.end(); ++i)
+		{
+			QString attribute = i.key();
+			const QJsonValue & attributeValue = *i;
+
+			if (attribute == "$ref" && attributeValue.isString())
+			{
+				if(!readSchema(":/" + attributeValue.toString(), obj, log))
+				{
+					Error(log,"Error while getting schema ref: %s",QSTRING_CSTR(QString(":/" + attributeValue.toString())));
+					return false;
+				}
+			}
+			else if (attributeValue.isObject())
+				obj.insert(attribute, resolveRefs(attributeValue.toObject(), obj, log));
+			else
+			{
+				qDebug() <<"ADD ATTR:VALUE"<<attribute<<attributeValue;
+				obj.insert(attribute, attributeValue);
+			}
+		}
+		return true;
+	}
+};
--- a/libsrc/utils/Logger.cpp
+++ b/libsrc/utils/Logger.cpp
@@ -24,7 +24,7 @@ Logger* Logger::getInstance(QString name, Logger::LogLevel minLevel)
 	{
 		LoggerMap = new std::map<QString,Logger*>;
 	}
-	
+
 	if ( LoggerMap->find(name) == LoggerMap->end() )
 	{
 		log = new Logger(name,minLevel);
@@ -44,7 +44,7 @@ void Logger::deleteInstance(QString name)
 {
 	if (LoggerMap == nullptr)
 		return;
-	
+
 	if ( name.isEmpty() )
 	{
 		std::map<QString,Logger*>::iterator it;
@@ -99,7 +99,7 @@ Logger::Logger ( QString name, LogLevel minLevel )
    const char* _appname_char = getprogname();
 #endif
 	_appname = QString(_appname_char).toLower();
-	
+

 	loggerCount++;

@@ -111,7 +111,7 @@ Logger::Logger ( QString name, LogLevel minLevel )

 Logger::~Logger()
 {
-	Debug(this, "logger '%s' destroyed", QSTRING_CSTR(_name) );
+	//Debug(this, "logger '%s' destroyed", QSTRING_CSTR(_name) );
 	loggerCount--;
 	if ( loggerCount == 0 )
 		closelog();
--- a/libsrc/utils/Stats.cpp
+++ b/libsrc/utils/Stats.cpp
@@ -120,7 +120,7 @@ void Stats::resolveReply(QNetworkReply *reply)

 bool Stats::trigger(bool set)
 {
-	QString path =	QDir::homePath()+"/.hyperion/misc/";
+	QString path =	_hyperion->getRootPath()+"/misc/";
 	QDir dir;
 	QFile file(path + _hyperion->id);

--- a/libsrc/utils/jsonschema/QJsonSchemaChecker.cpp
+++ b/libsrc/utils/jsonschema/QJsonSchemaChecker.cpp
@@ -197,6 +197,7 @@ void QJsonSchemaChecker::checkType(const QJsonValue & value, const QJsonValue &
 		if (_correct == "modify")
 			QJsonUtils::modify(_autoCorrected, _currentPath, defaultValue);

+
 		if (_correct == "")
 			setMessage(type + " expected");
 	}
@@ -222,7 +223,10 @@ void QJsonSchemaChecker::checkProperties(const QJsonObject & value, const QJsonO
 			_error = true;

 			if (_correct == "create")
+			{
 				QJsonUtils::modify(_autoCorrected, _currentPath,  QJsonUtils::create(propertyValue, _ignoreRequired), property);
+				setMessage("Create property: "+property+" with value: "+propertyValue.toObject().find("default").value().toString());
+			}

 			if (_correct == "")
 				setMessage("missing member");
@@ -250,7 +254,10 @@ void QJsonSchemaChecker::checkAdditionalProperties(const QJsonObject & value, co
 					_error = true;

 					if (_correct == "remove")
+					{
 						QJsonUtils::modify(_autoCorrected, _currentPath);
+						setMessage("Removed property: "+property);
+					}

 					if (_correct == "")
 						setMessage("no schema definition");
@@ -280,9 +287,12 @@ void QJsonSchemaChecker::checkMinimum(const QJsonValue & value, const QJsonValue
 		_error = true;

 		if (_correct == "modify")
+		{
 			(defaultValue != QJsonValue::Null) ?
 			QJsonUtils::modify(_autoCorrected, _currentPath, defaultValue) :
 			QJsonUtils::modify(_autoCorrected, _currentPath, schema);
+			setMessage("Correct too small value: "+QString::number(value.toDouble())+" to: "+QString::number(defaultValue.toDouble()));
+		}

 		if (_correct == "")
 			setMessage("value is too small (minimum=" + QString::number(schema.toDouble()) + ")");
@@ -304,9 +314,12 @@ void QJsonSchemaChecker::checkMaximum(const QJsonValue & value, const QJsonValue
 		_error = true;

 		if (_correct == "modify")
+		{
 			(defaultValue != QJsonValue::Null) ?
 			QJsonUtils::modify(_autoCorrected, _currentPath, defaultValue) :
 			QJsonUtils::modify(_autoCorrected, _currentPath, schema);
+			setMessage("Correct too large value: "+QString::number(value.toDouble())+" to: "+QString::number(defaultValue.toDouble()));
+		}

 		if (_correct == "")
 			setMessage("value is too large (maximum=" + QString::number(schema.toDouble()) + ")");
@@ -328,10 +341,12 @@ void QJsonSchemaChecker::checkMinLength(const QJsonValue & value, const QJsonVal
 		_error = true;

 		if (_correct == "modify")
+		{
 			(defaultValue != QJsonValue::Null) ?
 			QJsonUtils::modify(_autoCorrected, _currentPath, defaultValue) :
 			QJsonUtils::modify(_autoCorrected, _currentPath, schema);
-
+			setMessage("Correct too short value: "+value.toString()+" to: "+defaultValue.toString());
+		}
 		if (_correct == "")
 			setMessage("value is too short (minLength=" + QString::number(schema.toInt()) + ")");
 	}
@@ -352,10 +367,12 @@ void QJsonSchemaChecker::checkMaxLength(const QJsonValue & value, const QJsonVal
 		_error = true;

 		if (_correct == "modify")
+		{
 			(defaultValue != QJsonValue::Null) ?
 			QJsonUtils::modify(_autoCorrected, _currentPath, defaultValue) :
 			QJsonUtils::modify(_autoCorrected, _currentPath, schema);
-
+			setMessage("Correct too long value: "+value.toString()+" to: "+defaultValue.toString());
+		}
 		if (_correct == "")
 			setMessage("value is too long (maxLength=" + QString::number(schema.toInt()) + ")");
 	}
@@ -375,7 +392,10 @@ void QJsonSchemaChecker::checkItems(const QJsonValue & value, const QJsonObject

 	if (_correct == "remove")
 		if (jArray.isEmpty())
+		{
 			QJsonUtils::modify(_autoCorrected, _currentPath);
+			setMessage("Remove empty array");
+		}

 	for(int i = 0; i < jArray.size(); ++i)
 	{
@@ -402,9 +422,12 @@ void QJsonSchemaChecker::checkMinItems(const QJsonValue & value, const QJsonValu
 		_error = true;

 		if (_correct == "modify")
+		{
 			(defaultValue != QJsonValue::Null) ?
 			QJsonUtils::modify(_autoCorrected, _currentPath, defaultValue) :
 			QJsonUtils::modify(_autoCorrected, _currentPath, schema);
+			setMessage("Correct minItems: "+QString::number(jArray.size())+" to: "+QString::number(defaultValue.toArray().size()));
+		}

 		if (_correct == "")
 			setMessage("array is too small (minimum=" + QString::number(schema.toInt()) + ")");
@@ -427,9 +450,12 @@ void QJsonSchemaChecker::checkMaxItems(const QJsonValue & value, const QJsonValu
 		_error = true;

 		if (_correct == "modify")
+		{
 			(defaultValue != QJsonValue::Null) ?
 			QJsonUtils::modify(_autoCorrected, _currentPath, defaultValue) :
 			QJsonUtils::modify(_autoCorrected, _currentPath, schema);
+			setMessage("Correct maxItems: "+QString::number(jArray.size())+" to: "+QString::number(defaultValue.toArray().size()));
+		}

 		if (_correct == "")
 			setMessage("array is too large (maximum=" + QString::number(schema.toInt()) + ")");
@@ -472,11 +498,11 @@ void QJsonSchemaChecker::checkUniqueItems(const QJsonValue & value, const QJsonV
 		if (removeDuplicates && _correct == "modify")
 		{
 			QJsonArray uniqueItemsArray;
-			
+
 			for(int i = 0; i < jArray.size(); ++i)
 				if (!uniqueItemsArray.contains(jArray[i]))
 					uniqueItemsArray.append(jArray[i]);
-			
+
 			QJsonUtils::modify(_autoCorrected, _currentPath, uniqueItemsArray);
 		}
 	}
@@ -501,9 +527,12 @@ void QJsonSchemaChecker::checkEnum(const QJsonValue & value, const QJsonValue &
 	_error = true;

 	if (_correct == "modify")
+	{
 		(defaultValue != QJsonValue::Null) ?
 		QJsonUtils::modify(_autoCorrected, _currentPath, defaultValue) :
 		QJsonUtils::modify(_autoCorrected, _currentPath, schema.toArray().first());
+		setMessage("Correct unknown enum value: "+value.toString()+" to: "+defaultValue.toString());
+	}

 	if (_correct == "")
 	{