bump version 0.6.0

[contrib/cloudeebus.git] / cloudeebus / cloudeebus.py

diff --git a/cloudeebus/cloudeebus.py b/cloudeebus/cloudeebus.py
index ce8bf33..c7109b9 100755 (executable)
--- a/cloudeebus/cloudeebus.py
+++ b/cloudeebus/cloudeebus.py
@@ -51,7 +51,7 @@ from xml.etree.ElementTree import XMLParser
 
 ###############################################################################
 
-VERSION = "0.5.99"
+VERSION = "0.6.0"
 OPENDOOR = False
 CREDENTIALS = {}
 WHITELIST = []
@@ -297,11 +297,12 @@ class DynDBusClass():
         
         ## Overload of __init__ method 
         self.def_method("__init__")
-        self.add_method("bus, callback=None, objPath='/sample', busName='org.cloudeebus'")
+        self.add_method("bus, callback=None, objPath='/sample', srvName='org.cloudeebus'")
         self.add_stmt("self.bus = bus")
         self.add_stmt("self.objPath = objPath")
+        self.add_stmt("self.srvName = srvName")        
         self.add_stmt("self.callback = callback")        
-        self.add_stmt("dbus.service.Object.__init__(self, conn=bus, bus_name=busName)")
+        self.add_stmt("dbus.service.Object.__init__(self, conn=bus, bus_name=srvName)")
         self.end_method()
                
         ## Create 'add_to_connection' method 
@@ -410,9 +411,9 @@ class DynDBusClass():
     def add_body_method(self):
         if (self.methodToAdd != None):
             if (self.args_str != str()):
-                self.class_code.append_stmt("self.callback('" + self.methodToAdd + "', self.objPath, '"  + self.ifName + "', " + "dbus_async_cb, dbus_async_err_cb, %s)" % self.args_str)
+                self.class_code.append_stmt("self.callback(self.srvName,'" + self.methodToAdd + "', self.objPath, '"  + self.ifName + "', " + "dbus_async_cb, dbus_async_err_cb, %s)" % self.args_str)
             else:        
-                self.class_code.append_stmt("self.callback('" + self.methodToAdd + "', self.objPath, '"  + self.ifName + "', " + "dbus_async_cb, dbus_async_err_cb)")
+                self.class_code.append_stmt("self.callback(self.srvName,'" + self.methodToAdd + "', self.objPath, '"  + self.ifName + "', " + "dbus_async_cb, dbus_async_err_cb)")
 
     def add_body_signal(self):
         self.class_code.append_stmt("return") ## TODO: Remove and fix with code ad hoc
@@ -526,14 +527,19 @@ class CloudeebusService:
     @exportRpc
     def emitSignal(self, list):
         '''
-        arguments: agentObjectPath, signalName, result (to emit)
+        arguments: agentObjectPath, signalName, args (to emit)
         '''
         objectPath = list[0]
         className = re.sub('/', '_', objectPath[1:])
         signalName = list[1]
-        result = list[2]
-        if (self.serviceAgents.has_key(className) == True):
-            exe_str = "self.serviceAgents['"+ className +"']."+ signalName + "(" + str(result) + ")"
+        args = json.loads(list[2])
+        if (self.serviceAgents.has_key(className) == True):            
+            exe_str = "self.serviceAgents['"+ className +"']."+ signalName + "("
+            if len(args) > 0:
+                exe_str += json.dumps(args[0])
+                for idx in args[1:]:
+                    exe_str += "," + json.dumps(idx)
+            exe_str += ")"               
             eval(exe_str, self.globalCtx, self.localCtx)
         else:
             raise Exception("No object path " + objectPath)
@@ -570,8 +576,8 @@ class CloudeebusService:
         else:
             raise Exception("No methodID " + methodId)
 
-    def srvCB(self, name, objPath, ifName, async_succes_cb, async_error_cb, *args):
-        methodId = self.srvName + "#" + objPath + "#" + ifName + "#" + name
+    def srvCB(self, srvName, name, objPath, ifName, async_succes_cb, async_error_cb, *args):
+        methodId = srvName + "#" + objPath + "#" + ifName + "#" + name
         cb = { 'successCB': async_succes_cb, 
                'errorCB': async_error_cb}
         if methodId not in self.servicePendingCalls:
@@ -594,33 +600,34 @@ class CloudeebusService:
         '''
         busName = list[0]
         self.bus =  cache.dbusConnexion( busName )
-        self.srvName = list[1]
+        srvName = list[1]
         if not OPENDOOR and (SERVICELIST == [] or SERVICELIST != [] and self.permissions['services'] == None):
-            SERVICELIST.index(self.srvName)
+            SERVICELIST.index(srvName)
             
-        if (self.services.has_key(self.srvName) == False):
-            self.services[self.srvName] = dbus.service.BusName(name = self.srvName, bus = self.bus)
-        return self.srvName
+        if (self.services.has_key(srvName) == False):
+            self.services[srvName] = dbus.service.BusName(name = srvName, bus = self.bus)
+        return srvName
 
     @exportRpc
     def serviceRelease(self, list):
         '''
         arguments: busName, srvName
         '''
-        self.srvName = list[0]
-        if (self.services.has_key(self.srvName) == True):
-            self.services.pop(self.srvName)
-            return self.srvName
+        srvName = list[0]
+        if (self.services.has_key(srvName) == True):
+            self.services.pop(srvName)
+            return srvName
         else:
-            raise Exception(self.srvName + " does not exist")
+            raise Exception(srvName + " does not exist")
                    
     @exportRpc
     def serviceAddAgent(self, list):
         '''
         arguments: objectPath, xmlTemplate
         '''
-        agentObjectPath = list[0]
-        xmlTemplate = list[1]
+        srvName = list[0]
+        agentObjectPath = list[1]
+        xmlTemplate = list[2]
         className = createClassName(agentObjectPath)
         if (self.dynDBusClasses.has_key(className) == False):
             self.dynDBusClasses[className] = DynDBusClass(className, self.globalCtx, self.localCtx)
@@ -629,7 +636,7 @@ class CloudeebusService:
 
         ## Class already exist, instanciate it if not already instanciated
         if (self.serviceAgents.has_key(className) == False):
-            self.serviceAgents[className] = eval(className + "(self.bus, callback=self.srvCB, objPath='"+agentObjectPath+"', busName=self.srvName)", self.globalCtx, self.localCtx)
+            self.serviceAgents[className] = eval(className + "(self.bus, callback=self.srvCB, objPath='" + agentObjectPath + "', srvName='" + srvName + "')", self.globalCtx, self.localCtx)
             
         self.serviceAgents[className].add_to_connection()
         return (agentObjectPath)
@@ -642,8 +649,6 @@ class CloudeebusService:
         agentObjectPath = list[0]
         className = createClassName(agentObjectPath)
         
-        print 'PY Try to remove ' + className
-
         if (self.serviceAgents.has_key(className)):
             self.serviceAgents[className].remove_from_connection()
             self.serviceAgents.pop(className)