[bluemonkey] moved configs to proper location

diff --git a/examples/bluemonkey/authSettings.js b/examples/bluemonkey/authSettings.js
deleted file mode 100644 (file)
index a678486..0000000
--- a/examples/bluemonkey/authSettings.js
+++ /dev/null
@@ -1 +0,0 @@
-auth.pin = "000"

diff --git a/examples/bluemonkey/bluemonkeyconfig b/examples/bluemonkey/bluemonkeyconfig
index c7dc9d3..67006b3 100644 (file)
--- a/examples/bluemonkey/bluemonkeyconfig
+++ b/examples/bluemonkey/bluemonkeyconfig
@@ -11,7 +11,12 @@
        "sinks": [
                {
                        "name" : "Bluemonkey Sink",
-                       "path" : "/usr/lib/automotive-message-broker/bluemonkeyplugin.so"
+                       "path" : "/usr/lib/automotive-message-broker/bluemonkeyplugin.so",
+                       "authSettings" : "/etc/ambd/authSettings.js",
+                       "ircSettings" : "/etc/ambd/ircSettings.js",
+                       "config" : "/etc/ambd/config.js",
+                       "customPrograms" : "/etc/ambd/customPrograms.js"
+
                }
        ]
 }

diff --git a/examples/bluemonkey/config.js b/examples/bluemonkey/config.js
deleted file mode 100644 (file)
index 363f3f8..0000000
--- a/examples/bluemonkey/config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var speedProperty = bluemonkey.subscribeTo("VehicleSpeed");
-
-bluemonkey.loadConfig("customPrograms.js");
-
-       

diff --git a/examples/bluemonkey/ircSettings.js b/examples/bluemonkey/ircSettings.js
deleted file mode 100644 (file)
index 06439d3..0000000
--- a/examples/bluemonkey/ircSettings.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var address = "chat.freenode.com"
-var port = 8001
-var proxy = ""
-var username = ""
-var nick = ""
-var pass = ""
-
-
-function ircConnecting() {
-        print("connecting to irc");
-}
-
-function ircConnected() {
-        print("connected");
-        for(var i=0;i<irc.channels.length;i++)
-        {
-                irc.join(irc.channels[i]);
-        }
-}
-
-
-irc.channels = ["#bluemonkey","#linuxice"]
-irc.connected.connect(ircConnected);
-irc.connecting.connect(ircConnecting);
-
-irc.connect(address,port,proxy,username,nick,pass);

diff --git a/plugins/bluemonkey/CMakeLists.txt b/plugins/bluemonkey/CMakeLists.txt
index 8ec0840..5c83883 100644 (file)
--- a/plugins/bluemonkey/CMakeLists.txt
+++ b/plugins/bluemonkey/CMakeLists.txt
@@ -28,6 +28,10 @@ add_library(bluemonkeyplugin MODULE ${bluemonkeyplugin_sources})
 set_target_properties(bluemonkeyplugin PROPERTIES PREFIX "")
 target_link_libraries(bluemonkeyplugin amb -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${QT_LIBRARIES} ${communi_LIBRARIES})
 
-install(TARGETS bluemonkeyplugin LIBRARY DESTINATION lib/automotive-message-broker)
+set(config_files ${CMAKE_CURRENT_SOURCE_DIR}/ircSettings.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/authSettings.js
+    ${CMAKE_CURRENT_SOURCE_DIR}/config.js)
 
+install(TARGETS bluemonkeyplugin LIBRARY DESTINATION lib/automotive-message-broker)
+install (FILES ${config_files} DESTINATION /etc/ambd)
 endif(bluemonkey_plugin)

diff --git a/plugins/bluemonkey/authenticate.cpp b/plugins/bluemonkey/authenticate.cpp
index b13c6eb..0097456 100644 (file)
--- a/plugins/bluemonkey/authenticate.cpp
+++ b/plugins/bluemonkey/authenticate.cpp
@@ -2,7 +2,7 @@
 #include <QSettings>
 #include <QtScript>
 
-Authenticate::Authenticate(QObject *parent) :
+Authenticate::Authenticate(std::map<std::string, std::string> config, QObject *parent) :
     QObject(parent)
 {
        QSettings settings;
@@ -13,7 +13,7 @@ Authenticate::Authenticate(QObject *parent) :
        QScriptValue eventEngineValue = engine.newQObject(this);
        engine.globalObject().setProperty("auth", eventEngineValue);
 
-       QString str = "authSettings.js";
+       QString str = config["authSettings"].c_str();
 
        QFile file(str);
        if(!file.open(QIODevice::ReadOnly))

diff --git a/plugins/bluemonkey/authenticate.h b/plugins/bluemonkey/authenticate.h
index 601f758..df84283 100644 (file)
--- a/plugins/bluemonkey/authenticate.h
+++ b/plugins/bluemonkey/authenticate.h
@@ -3,13 +3,15 @@
 
 #include <QObject>
 #include <QStringList>
+#include <map>
+#include <string>
 
 class Authenticate : public QObject
 {
     Q_OBJECT
        Q_PROPERTY(QString pin READ pin WRITE setPin)
 public:
-    explicit Authenticate(QObject *parent = 0);
+       explicit Authenticate(std::map<std::string, std::string> config, QObject *parent = 0);
        void setPin(QString p) { mPin = p; }
        QString pin() { return mPin; }
 

diff --git a/plugins/bluemonkey/bluemonkey.cpp b/plugins/bluemonkey/bluemonkey.cpp
index 0bd0d79..58923c5 100644 (file)
--- a/plugins/bluemonkey/bluemonkey.cpp
+++ b/plugins/bluemonkey/bluemonkey.cpp
@@ -73,11 +73,11 @@ QVariant gvariantToQVariant(GVariant *value)
 
 BluemonkeySink::BluemonkeySink(AbstractRoutingEngine* e, map<string, string> config): QObject(0), AbstractSink(e, config), engine(nullptr)
 {
-       irc = new IrcCommunication(this);
+       irc = new IrcCommunication(config, this);
 
        reloadEngine();
 
-       auth = new Authenticate(this);
+       auth = new Authenticate(config, this);
 
        connect(irc, &IrcCommunication::message, [&](QString sender, QString prefix, QString codes ) {
 
@@ -184,12 +184,14 @@ void BluemonkeySink::reloadEngine()
        QScriptValue value = engine->newQObject(this);
        engine->globalObject().setProperty("bluemonkey", value);
 
-       loadConfig("config.js");
+
+
+       loadConfig(configuration["config"].c_str());
 }
 
 void BluemonkeySink::writeProgram(QString program)
 {
-       QFile file("customPrograms.js");
+       QFile file(configuration["customPrograms"].c_str());
 
        file.open(QIODevice::ReadWrite | QIODevice::Append);
 

diff --git a/plugins/bluemonkey/irccoms.cpp b/plugins/bluemonkey/irccoms.cpp
index 51c5360..4a98403 100644 (file)
--- a/plugins/bluemonkey/irccoms.cpp
+++ b/plugins/bluemonkey/irccoms.cpp
@@ -10,9 +10,10 @@
 
 #define foreach Q_FOREACH
 
-IrcCommunication::IrcCommunication(QObject* parent)
+IrcCommunication::IrcCommunication(std::map<std::string, std::string> config, QObject* parent)
        :QObject(parent)
 {
+
        session = new IrcSession(this);
        mSsl=false;
 
@@ -28,12 +29,12 @@ IrcCommunication::IrcCommunication(QObject* parent)
        QScriptValue eventEngineValue = engine->newQObject(this);
        engine->globalObject().setProperty("irc", eventEngineValue);
 
-       QString str = "ircSettings.js";
+       QString str = config["ircSettings"].c_str();
 
        QFile file(str);
        if(!file.open(QIODevice::ReadOnly))
        {
-               qDebug()<<"failed to open config file: "<<str;
+               qDebug()<<"failed to open irc config file: "<<str;
                return;
        }
 

diff --git a/plugins/bluemonkey/irccoms.h b/plugins/bluemonkey/irccoms.h
index 8c4a61e..6033362 100644 (file)
--- a/plugins/bluemonkey/irccoms.h
+++ b/plugins/bluemonkey/irccoms.h
@@ -3,6 +3,7 @@
 #include <QObject>
 #include <QVariant>
 #include <QStringList>
+#include <map>
 
 #include <IrcSession>
 #include <IrcMessage>
@@ -13,7 +14,7 @@ class IrcCommunication: public QObject
        Q_PROPERTY(QStringList channels READ channels WRITE setChannels)
        Q_PROPERTY(bool ssl WRITE setSsl)
 public:
-       IrcCommunication(QObject* parent=0);
+       IrcCommunication(std::map<std::string, std::string> config, QObject* parent=0);
        QStringList channels() { return mChannels; }
        void setChannels(QStringList c) { mChannels = c; }