Mercurial > libervia-backend
diff sat_bridge/DBus.py @ 16:0a024d5e0cd0
New account creation (in-band registration)
- new method "sendAnswer" in bridge for asyncronous result communication
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Mon, 02 Nov 2009 00:45:03 +0100 |
| parents | 14d7861ca59e |
| children | 74a39f40eb6d |
line wrap: on
line diff
--- a/sat_bridge/DBus.py Sat Oct 31 00:18:35 2009 +0100 +++ b/sat_bridge/DBus.py Mon Nov 02 00:45:03 2009 +0100 @@ -28,6 +28,8 @@ from logging import debug, info, error const_INT_PREFIX = "org.goffi.SAT" #Interface prefix +const_COMM_SUFFIX = ".communication" +const_REQ_SUFFIX = ".request" class DbusObject(dbus.service.Object): @@ -41,132 +43,141 @@ ### signals ### - @dbus.service.signal(const_INT_PREFIX+".communication", + @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, signature='sa{ss}as') def newContact(self, contact, attributes, groups): debug("new contact signal (%s) sended", contact) - @dbus.service.signal(const_INT_PREFIX+".communication", + @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, signature='ssss') def newMessage(self, from_jid, msg, type='chat', to=''): debug("new message signal (from:%s msg:%s type:%s to:%s) sended", from_jid, msg, type, to) - @dbus.service.signal(const_INT_PREFIX+".communication", + @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, signature='ssssi') def presenceUpdate(self, jid, type, show, status, priority): debug("presence update signal (from:%s type: %s show:%s status:\"%s\" priority:%d) sended" , jid, type, show, status, priority) - @dbus.service.signal(const_INT_PREFIX+".communication", + @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, signature='sss') def paramUpdate(self, name, value, namespace): debug("param update signal: %s=%s in namespace %s", name, value, namespace) - @dbus.service.signal(const_INT_PREFIX+".communication", + @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, signature='s') def contactDeleted(self, jid): debug("contact deleted signal: %s", jid) - @dbus.service.signal(const_INT_PREFIX+".request", + @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX, signature='ssa{ss}') def askConfirmation(self, type, id, data): debug("asking for confirmation: id = [%s] type = %s data = %s", id, type, data) - + @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, + signature='ssa{ss}') + def sendAnswer(self, type, id, data): + debug("sending answer: id = [%s] type = %s data = %s", id, type, data) ### methods ### - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, + in_signature='sssi', out_signature='s') + def registerNewAccount(self, login, password, host, port=5222): + info ("New account registration asked") + return self.cb["registerNewAccount"](login, password, host, port) + + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='', out_signature='') def connect(self): info ("Connection asked") return self.cb["connect"]() - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='', out_signature='') def disconnect(self): info ("Disconnection asked") return self.cb["disconnect"]() - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='', out_signature='a(sa{ss}as)') def getContacts(self): debug("getContacts...") return self.cb["getContacts"]() - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='', out_signature='a(ssssi)') def getPresenceStatus(self): debug("getPresenceStatus...") return self.cb["getPresenceStatus"]() - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='ss', out_signature='') def sendMessage(self, to, message): debug("sendMessage...") self.cb["sendMessage"](to, message) - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='ssssi', out_signature='') def setPresence(self, to="", type="", show="", status="", priority=0): self.cb["setPresence"](to, type, show, status, priority) - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='sss', out_signature='') def setParam(self, name, value, namespace="default"): self.cb["setParam"](name, str(value), namespace) - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='ss', out_signature='(ss)') def getParam(self, name, namespace="default"): return self.cb["getParam"](name, namespace) - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='s', out_signature='a(sss)') def getParams(self, namespace): return self.cb["getParams"](namespace) - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='', out_signature='as') def getParamsCategories(self): return self.cb["getParamsCategories"]() - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='ssi', out_signature='a{i(ss)}') def getHistory(self, from_jid, to_jid, size): debug("History asked for %s", to_jid) return self.cb["getHistory"](from_jid, to_jid, size) - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='s', out_signature='') def addContact(self, jid): debug("Subscription asked for %s", jid) return self.cb["addContact"](jid) - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='s', out_signature='') def delContact(self, jid): debug("Unsubscription asked for %s", jid) return self.cb["delContact"](jid) - @dbus.service.method(const_INT_PREFIX+".communication", + @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX, in_signature='', out_signature='b') def isConnected(self): debug("Connection status requested") return self.cb["isConnected"]() - @dbus.service.method(const_INT_PREFIX+".request", + @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, in_signature='sba{ss}', out_signature='') def confirmationAnswer(self, id, accepted, data): debug("Answer for confirmation [%s]: %s", id, "Accepted" if accepted else "Refused") return self.cb["confirmationAnswer"](id, accepted, data) - @dbus.service.method(const_INT_PREFIX+".request", + @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX, in_signature='s', out_signature='a{ss}') def getProgress(self, id): #debug("Progress asked for %s", id) return self.cb["getProgress"](id) - def _attribute_string(self, in_sign): + def __attribute_string(self, in_sign): i=0 idx=0 attr_string="" @@ -192,7 +203,7 @@ def addMethod(self, name, int_suffix, in_sign, out_sign): """Dynamically add a method to Dbus Bridge""" #FIXME: Better way ??? - attributes = self._attribute_string(in_sign) + attributes = self.__attribute_string(in_sign) code = compile ('def '+name+' (self,'+attributes+'): return self.cb["'+name+'"]('+attributes+')', '<DBus bridge>','exec') exec (code) @@ -231,6 +242,9 @@ def askConfirmation(self, type, id, data): self.dbus_bridge.askConfirmation(type, id, data) + def sendAnswer(self, type, id, data): + self.dbus_bridge.sendAnswer(type, id, data) + def register(self, name, callback): debug("registering DBus bridge method [%s]",name) self.dbus_bridge.register(name, callback)