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

XEP-0030: Optimise add_node usage a bit.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2017-07-17 22:46:48 +01:00
parent 8b6f5953a7
commit 9a563f1425
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
slixmpp/plugins/xep_0030/static.py
View File

@ -66,10 +66,11 @@ class StaticDisco(object):
if isinstance(ifrom, JID): if isinstance(ifrom, JID):
ifrom = ifrom.full ifrom = ifrom.full
if (jid, node, ifrom) not in self.nodes: if (jid, node, ifrom) not in self.nodes:
self.nodes[(jid, node, ifrom)] = {'info': DiscoInfo(), new_node = {'info': DiscoInfo(), 'items': DiscoItems()}
'items': DiscoItems()} new_node['info']['node'] = node
self.nodes[(jid, node, ifrom)]['info']['node'] = node new_node['items']['node'] = node
self.nodes[(jid, node, ifrom)]['items']['node'] = node self.nodes[(jid, node, ifrom)] = new_node
return self.nodes[(jid, node, ifrom)]
def get_node(self, jid=None, node=None, ifrom=None): def get_node(self, jid=None, node=None, ifrom=None):
if jid is None: if jid is None:
@ -208,8 +209,8 @@ class StaticDisco(object):
The data parameter is a disco#info substanza. The data parameter is a disco#info substanza.
""" """
self.add_node(jid, node) new_node = self.add_node(jid, node)
self.get_node(jid, node)['info'] = data new_node['info'] = data
def del_info(self, jid, node, ifrom, data): def del_info(self, jid, node, ifrom, data):
""" """
@ -242,8 +243,8 @@ class StaticDisco(object):
items -- A set of items in tuple format. items -- A set of items in tuple format.
""" """
items = data.get('items', set()) items = data.get('items', set())
self.add_node(jid, node) new_node = self.add_node(jid, node)
self.get_node(jid, node)['items']['items'] = items new_node['items']['items'] = items
def del_items(self, jid, node, ifrom, data): def del_items(self, jid, node, ifrom, data):
""" """
@ -264,8 +265,8 @@ class StaticDisco(object):
name -- Optional human readable name for this identity. name -- Optional human readable name for this identity.
lang -- Optional standard xml:lang value. lang -- Optional standard xml:lang value.
""" """
self.add_node(jid, node) new_node = self.add_node(jid, node)
self.get_node(jid, node)['info'].add_identity( new_node['info'].add_identity(
data.get('category', ''), data.get('category', ''),
data.get('itype', ''), data.get('itype', ''),
data.get('name', None), data.get('name', None),
@ -280,8 +281,8 @@ class StaticDisco(object):
(category, type, name, lang) (category, type, name, lang)
""" """
identities = data.get('identities', set()) identities = data.get('identities', set())
self.add_node(jid, node) new_node = self.add_node(jid, node)
self.get_node(jid, node)['info']['identities'] = identities new_node['info']['identities'] = identities
def del_identity(self, jid, node, ifrom, data): def del_identity(self, jid, node, ifrom, data):
""" """
@ -316,8 +317,8 @@ class StaticDisco(object):
The data parameter should include: The data parameter should include:
feature -- The namespace of the supported feature. feature -- The namespace of the supported feature.
""" """
self.add_node(jid, node) new_node = self.add_node(jid, node)
self.get_node(jid, node)['info'].add_feature( new_node['info'].add_feature(
data.get('feature', '')) data.get('feature', ''))
def set_features(self, jid, node, ifrom, data): def set_features(self, jid, node, ifrom, data):
@ -328,8 +329,8 @@ class StaticDisco(object):
features -- The new set of supported features. features -- The new set of supported features.
""" """
features = data.get('features', set()) features = data.get('features', set())
self.add_node(jid, node) new_node = self.add_node(jid, node)
self.get_node(jid, node)['info']['features'] = features new_node['info']['features'] = features
def del_feature(self, jid, node, ifrom, data): def del_feature(self, jid, node, ifrom, data):
""" """
@ -362,8 +363,8 @@ class StaticDisco(object):
non-addressable items. non-addressable items.
name -- Optional human readable name for the item. name -- Optional human readable name for the item.
""" """
self.add_node(jid, node) new_node = self.add_node(jid, node)
self.get_node(jid, node)['items'].add_item( new_node['items'].add_item(
data.get('ijid', ''), data.get('ijid', ''),
node=data.get('inode', ''), node=data.get('inode', ''),
name=data.get('name', '')) name=data.get('name', ''))
@ -392,8 +393,8 @@ class StaticDisco(object):
if isinstance(data, Iq): if isinstance(data, Iq):
data = data['disco_info'] data = data['disco_info']
self.add_node(jid, node, ifrom) new_node = self.add_node(jid, node, ifrom)
self.get_node(jid, node, ifrom)['info'] = data new_node['info'] = data
def get_cached_info(self, jid, node, ifrom, data): def get_cached_info(self, jid, node, ifrom, data):
""" """