D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes

This commit is contained in:
Goffi 2012-03-30 09:23:23 +02:00
commit 3ed55081f6
2 changed files with 53 additions and 18 deletions

View file

@ -48,7 +48,7 @@ class XEP_0077():
self.host = host
self.triggers = {} #used by other protocol (e.g. XEP-0100) to finish registration. key = target_jid
host.bridge.addMethod("in_band_register", ".plugin", in_sign='ss', out_sign='s', method=self.in_band_register)
host.bridge.addMethod("in_band_submit", ".plugin", in_sign='sa(ss)', out_sign='s', method=self.in_band_submit)
host.bridge.addMethod("in_band_submit", ".plugin", in_sign='ssa(ss)s', out_sign='s', method=self.in_band_submit)
def addTrigger(self, target, cb, profile):
"""Add a callback which is called when registration to target is successful"""

View file

@ -146,7 +146,7 @@ class XEP_0277():
self.host.plugins["XEP-0060"].publish(None, NS_MICROBLOG, [item], profile_key = profile)
return 0
def getLastMicroblogs(self, pub_jid, max_items=10, profile_key='@DEFAULT@', callback=None, errback=None):
def getLastMicroblogs(self, pub_jid, max_items=10, profile_key='@DEFAULT@'):
"""Get the last published microblogs
@param pub_jid: jid of the publisher
@param max_items: how many microblogs we want to get
@ -156,9 +156,9 @@ class XEP_0277():
"""
assert(callback)
d = self.host.plugins["XEP-0060"].getItems(jid.JID(pub_jid), NS_MICROBLOG, max_items=max_items, profile_key=profile_key)
d.addCallbacks(lambda items: callback(map(self.item2mbdata, items)), errback)
d.addCallback(lambda items: map(self.item2mbdata, items))
def setMicroblogAccess(self, access="presence", profile_key='@DEFAULT@', callback=None, errback=None):
def setMicroblogAccess(self, access="presence", profile_key='@DEFAULT@'):
"""Create a microblog node on PEP with given access
If the node already exists, it change options
@param access: Node access model, according to xep-0060 #4.5
@ -173,12 +173,11 @@ class XEP_0277():
def cb(result):
#Node is created with right permission
debug(_("Microblog node has now access %s") % access)
callback()
def fatal_err(s_error):
#Something went wrong
error(_("Can't set microblog access"))
errback(NodeAccessChangeException())
raise NodeAccessChangeException()
def err_cb(s_error):
#If the node already exists, the condition is "conflict",