adding signal emission

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

diff --git a/cloudeebus/cloudeebus.py b/cloudeebus/cloudeebus.py
index 137875b..0f85747 100755 (executable)
--- a/cloudeebus/cloudeebus.py
+++ b/cloudeebus/cloudeebus.py
@@ -229,6 +229,8 @@ class XmlCbParser: # The target object of the parser
                                                 attrib['type'])
                 return
             if (self.current == 'signal'):
+                if (attrib.has_key('name') == False):
+                    attrib['name'] = 'value'
                 self.dynDBusClass.add_signature(attrib['name'], 'in',
                                                 attrib['type'])
                 return
@@ -488,15 +490,33 @@ class CloudeebusService:
 
 
     @exportRpc
+    def emitSignal(self, list):
+        '''
+        arguments: agentObjectPath, signalName, result (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) + ")"
+            eval(exe_str, self.globalCtx, self.localCtx)
+        else:
+            raise Exception("No object path " + objectPath)
+
+    @exportRpc
     def returnMethod(self, list):
         '''
-        arguments: methodId, success (=true, error otherwise), result (to return)
+        arguments: methodId, callIndex, success (=true, error otherwise), result (to return)
         '''
         methodId = list[0]
-        success = list[1]
-        result = list[2]
+        callIndex = list[1]
+        success = list[2]
+        result = list[3]
         if (self.servicePendingCalls.has_key(methodId)):
-            cb = self.servicePendingCalls[methodId]
+            cb = self.servicePendingCalls[methodId]['calls'][callIndex]
+            if cb is None:
+                raise Exception("No pending call " + str(callIndex) + " for methodID " + methodId)
             if (success):                
                 successCB = cb["successCB"]
                 if (result != None):
@@ -509,74 +529,23 @@ class CloudeebusService:
                     errorCB(result)
                 else:
                     errorCB()
-            self.servicePendingCalls[methodId] = None
+            self.servicePendingCalls[methodId]['calls'][callIndex] = None
+            self.servicePendingCalls[methodId]['count'] = self.servicePendingCalls[methodId]['count'] - 1
+            if self.servicePendingCalls[methodId]['count'] == 0:
+                del self.servicePendingCalls[methodId]
         else:
             raise Exception("No methodID " + methodId)
 
-    def jsonEncodeTupleKeyDict(self, data):
-        ndict = dict()
-        # creates new dictionary with the original tuple converted to json string
-        dataLen = len(data)
-        string = ""
-        for index in range(dataLen):
-            for key in data[index]:
-                value = data[index][key]
-                print "key=" + key
-                print "value=" + str(value)
-                nkey = str(key)
-                nvalue = ""
-                print "JSON key=" + nkey
-                if (isinstance(value, dbus.Array)):
-                    # Searching dbus byte in array...
-                    ValueLen = len(value)
-                    nvalue = []
-                    for indexValue in range(ValueLen):
-                        a = value[indexValue]
-                        if (isinstance(a, dbus.Byte)):
-                            a = int(value[indexValue])
-                            nvalue.append(a)
-                        else:
-                            nvalue = str(value[indexValue])
-                            
-                print "JSON value=" + str(nvalue)                
-                ndict[nkey] =  nvalue
-
-        return ndict
-
     def srvCB(self, name, async_succes_cb, async_error_cb, *args):
         methodId = self.srvName + "#" + self.agentObjectPath + "#" + name
         cb = { 'successCB': async_succes_cb, 
                'errorCB': async_error_cb}
-        self.servicePendingCalls[methodId] = cb
-
-        if (len(args) > 0):
-            print "Received args=%s" % (str(args))
-        else:                     
-            print "No args received"
-            
-        try:               
-            print "factory.dispatch(methodId=%s, args=%s)" % (methodId, json.dumps(args))                     
-            factory.dispatch(methodId, json.dumps(args))
-            return
-        except Exception, e :
-            print "Error=%s" % (str(e))
-            
-        print "Trying to decode dbus.Dictionnary..."
-        try:
-            params = self.jsonEncodeTupleKeyDict(args)                
-            print "factory.dispatch(methodId=%s, args=%s)" % (methodId, params)                     
-            factory.dispatch(methodId, params)
-            return
-        except Exception, e :
-            print "Error=%s" % (str(e))
-                    
-        print "Trying to pass args as string..."
-        try:               
-            print "factory.dispatch(methodId=%s, args=%s)" % (methodId, str(args))                     
-            factory.dispatch(methodId, str(args))
-            return
-        except Exception, e :
-            print "Error=%s" % (str(e))
+        if methodId not in self.servicePendingCalls:
+            self.servicePendingCalls[methodId] = {'count': 0, 'calls': []}
+        pendingCallStr = json.dumps({'callIndex': len(self.servicePendingCalls[methodId]['calls']), 'args': args})
+        self.servicePendingCalls[methodId]['calls'].append(cb)
+        self.servicePendingCalls[methodId]['count'] = self.servicePendingCalls[methodId]['count'] + 1
+        factory.dispatch(methodId, pendingCallStr)
                     
     @exportRpc
     def serviceAdd(self, list):