From 3c274b04ab195c2cd7d9618d67c57e525dd71151 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 22 Nov 2019 17:37:02 +0100 Subject: [PATCH] More work on scripting --- libnymea-core/jsonrpc/scriptshandler.cpp | 64 +++++++++ libnymea-core/jsonrpc/scriptshandler.h | 7 + libnymea-core/scriptengine/scriptengine.cpp | 144 ++++++++++++++++++-- libnymea-core/scriptengine/scriptengine.h | 25 +++- 4 files changed, 230 insertions(+), 10 deletions(-) diff --git a/libnymea-core/jsonrpc/scriptshandler.cpp b/libnymea-core/jsonrpc/scriptshandler.cpp index 17f03d25..5e42abb7 100644 --- a/libnymea-core/jsonrpc/scriptshandler.cpp +++ b/libnymea-core/jsonrpc/scriptshandler.cpp @@ -11,6 +11,7 @@ ScriptsHandler::ScriptsHandler(ScriptEngine *scriptEngine, QObject *parent): m_engine(scriptEngine) { registerEnum(); + registerEnum(); registerObject(); @@ -22,6 +23,13 @@ ScriptsHandler::ScriptsHandler(ScriptEngine *scriptEngine, QObject *parent): returns.insert("scripts", objectRef()); registerMethod("GetScripts", description, params, returns); + params.clear(); returns.clear(); + description = "Get a scripts content."; + params.insert("id", enumValueName(Uuid)); + returns.insert("scriptError", enumRef()); + returns.insert("o:content", enumValueName(String)); + registerMethod("GetScriptContent", description, params, returns); + params.clear(); returns.clear(); description = "Add a script"; params.insert("name", enumValueName(String)); @@ -46,6 +54,50 @@ ScriptsHandler::ScriptsHandler(ScriptEngine *scriptEngine, QObject *parent): returns.insert("scriptError", enumRef()); registerMethod("RemoveScript", description, params, returns); + params.clear(); + description = "Emitted when a script has been added to the system."; + params.insert("script", objectRef