Mercurial > libervia-backend

comparison src/memory/disco.py @ 1290:faa1129559b8 frontends_multi_profiles

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core, frontends: refactoring to base Libervia on QuickFrontend (big mixed commit): /!\ not finished, everything is still instable ! - bridge: DBus bridge has been modified to allow blocking call to be called in the same way as asynchronous calls - bridge: calls with a callback and no errback are now possible, default errback log the error - constants: removed hack to manage presence without OrderedDict, as an OrderedDict like class has been implemented in Libervia - core: getLastResource has been removed and replaced by getMainResource (there is a global better management of resources) - various style improvments: use of constants when possible, fixed variable overlaps, import of module instead of direct class import - frontends: printInfo and printMessage methods in (Quick)Chat are more generic (use of extra instead of timestamp) - frontends: bridge creation and option parsing (command line arguments) are now specified by the frontend in QuickApp __init__ - frontends: ProfileManager manage a more complete plug sequence (some stuff formerly manage in contact_list have moved to ProfileManager) - quick_frontend (quick_widgets): QuickWidgetsManager is now iterable (all widgets are then returned), or can return an iterator on a specific class (return all widgets of this class) with getWidgets - frontends: tools.jid can now be used in Pyjamas, with some care - frontends (XMLUI): profile is now managed - core (memory): big improvment on entities cache management (and specially resource management) - core (params/exceptions): added PermissionError - various fixes and improvments, check diff for more details
author Goffi <goffi@goffi.org>
date Sat, 24 Jan 2015 01:00:29 +0100
parents 8ad37c3d58a9
children be3a301540c0
comparison
equal deleted inserted replaced
1289:653f2e2eea31 1290:faa1129559b8
100 client = self.host.getClient(profile_key) 100 client = self.host.getClient(profile_key)
101 if jid_ is None: 101 if jid_ is None:
102 jid_ = jid.JID(client.jid.host) 102 jid_ = jid.JID(client.jid.host)
103 try: 103 try:
104 cap_hash = self.host.memory.getEntityData(jid_, [C.ENTITY_CAP_HASH], client.profile)[C.ENTITY_CAP_HASH] 104 cap_hash = self.host.memory.getEntityData(jid_, [C.ENTITY_CAP_HASH], client.profile)[C.ENTITY_CAP_HASH]
105 disco_infos = self.hashes[cap_hash] 105 except (KeyError, exceptions.UnknownEntityError):
106 return defer.succeed(disco_infos)
107 except KeyError:
108 # capability hash is not available, we'll compute one 106 # capability hash is not available, we'll compute one
109 def infosCb(disco_infos): 107 def infosCb(disco_infos):
110 cap_hash = self.generateHash(disco_infos) 108 cap_hash = self.generateHash(disco_infos)
111 self.hashes[cap_hash] = disco_infos 109 self.hashes[cap_hash] = disco_infos
112 self.host.memory.updateEntityData(jid_, C.ENTITY_CAP_HASH, cap_hash, client.profile) 110 self.host.memory.updateEntityData(jid_, C.ENTITY_CAP_HASH, cap_hash, client.profile)
113 return disco_infos 111 return disco_infos
114 d = client.disco.requestInfo(jid_) 112 d = client.disco.requestInfo(jid_)
115 d.addCallback(infosCb) 113 d.addCallback(infosCb)
116 return d 114 return d
115 else:
116 disco_infos = self.hashes[cap_hash]
117 return defer.succeed(disco_infos)
117 118
118 @defer.inlineCallbacks 119 @defer.inlineCallbacks
119 def getItems(self, jid_=None, nodeIdentifier='', profile_key=C.PROF_KEY_NONE): 120 def getItems(self, jid_=None, nodeIdentifier='', profile_key=C.PROF_KEY_NONE):
120 """get disco items from jid_, cache them for our own server 121 """get disco items from jid_, cache them for our own server
121 122
129 jid_ = jid.JID(client.jid.host) 130 jid_ = jid.JID(client.jid.host)
130 # we cache items only for our own server 131 # we cache items only for our own server
131 try: 132 try:
132 items = self.host.memory.getEntityData(jid_, ["DISCO_ITEMS"], client.profile)["DISCO_ITEMS"] 133 items = self.host.memory.getEntityData(jid_, ["DISCO_ITEMS"], client.profile)["DISCO_ITEMS"]
133 log.debug("[%s] disco items are in cache" % jid_.full()) 134 log.debug("[%s] disco items are in cache" % jid_.full())
134 except KeyError: 135 except (KeyError, exceptions.UnknownEntityError):
135 log.debug("Caching [%s] disco items" % jid_.full()) 136 log.debug("Caching [%s] disco items" % jid_.full())
136 items = yield client.disco.requestItems(jid_, nodeIdentifier) 137 items = yield client.disco.requestItems(jid_, nodeIdentifier)
137 self.host.memory.updateEntityData(jid_, "DISCO_ITEMS", items, client.profile) 138 self.host.memory.updateEntityData(jid_, "DISCO_ITEMS", items, client.profile)
138 else: 139 else:
139 items = yield client.disco.requestItems(jid_, nodeIdentifier) 140 items = yield client.disco.requestItems(jid_, nodeIdentifier)