jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XEP-0084: wrap functions with coroutine_wrapper

Browse Source
This commit is contained in:
mathieui 2015-02-23 19:15:18 +01:00
parent 69da1c1d7c
commit ea5615f236
No known key found for this signature in database
GPG Key ID: C59F84CEEFD616E3
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
slixmpp/plugins/xep_0084/avatar.py
View File

@ -15,6 +15,7 @@ from slixmpp.xmlstream.handler import Callback
from slixmpp.xmlstream.matcher import StanzaPath from slixmpp.xmlstream.matcher import StanzaPath
from slixmpp.xmlstream import register_stanza_plugin, JID from slixmpp.xmlstream import register_stanza_plugin, JID
from slixmpp.plugins.xep_0084 import stanza, Data, MetaData from slixmpp.plugins.xep_0084 import stanza, Data, MetaData
from slixmpp import coroutine_wrapper
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -44,26 +45,30 @@ class XEP_0084(BasePlugin):
def generate_id(self, data): def generate_id(self, data):
return hashlib.sha1(data).hexdigest() return hashlib.sha1(data).hexdigest()
def retrieve_avatar(self, jid, id, url=None, ifrom=None, @coroutine_wrapper
callback=None, timeout=None): def retrieve_avatar(self, jid, id, url=None, ifrom=None, callback=None,
timeout=None, coroutine=False):
return self.xmpp['xep_0060'].get_item(jid, Data.namespace, id, return self.xmpp['xep_0060'].get_item(jid, Data.namespace, id,
ifrom=ifrom, ifrom=ifrom, callback=callback,
callback=callback, timeout=timeout,
timeout=timeout) coroutine=coroutine)
@coroutine_wrapper
def publish_avatar(self, data, ifrom=None, callback=None, def publish_avatar(self, data, ifrom=None, callback=None,
timeout=None): timeout=None, coroutine=False):
payload = Data() payload = Data()
payload['value'] = data payload['value'] = data
return self.xmpp['xep_0163'].publish(payload, return self.xmpp['xep_0163'].publish(payload,
id=self.generate_id(data), id=self.generate_id(data),
ifrom=ifrom, ifrom=ifrom,
callback=callback, callback=callback,
timeout=timeout) timeout=timeout,
coroutine=coroutine)
@coroutine_wrapper
def publish_avatar_metadata(self, items=None, pointers=None, def publish_avatar_metadata(self, items=None, pointers=None,
ifrom=None, ifrom=None, callback=None, timeout=None,
callback=None, timeout=None): coroutine=False):
metadata = MetaData() metadata = MetaData()
if items is None: if items is None:
items = [] items = []
@ -83,9 +88,11 @@ class XEP_0084(BasePlugin):
id=info['id'], id=info['id'],
ifrom=ifrom, ifrom=ifrom,
callback=callback, callback=callback,
timeout=timeout) timeout=timeout,
coroutine=coroutine)
def stop(self, ifrom=None, callback=None, timeout=None): @coroutine_wrapper
def stop(self, ifrom=None, callback=None, timeout=None, coroutine=False):
""" """
Clear existing avatar metadata information to stop notifications. Clear existing avatar metadata information to stop notifications.
@ -102,4 +109,5 @@ class XEP_0084(BasePlugin):
node=MetaData.namespace, node=MetaData.namespace,
ifrom=ifrom, ifrom=ifrom,
callback=callback, callback=callback,
timeout=timeout) timeout=timeout,
coroutine=coroutine)