Mercurial > libervia-backend
comparison frontends/src/tools/jid.py @ 1265:e3a9ea76de35 frontends_multi_profiles
quick_frontend, primitivus: multi-profiles refactoring part 1 (big commit, sorry :p):
This refactoring allow primitivus to manage correctly several profiles at once, with various other improvments:
- profile_manager can now plug several profiles at once, requesting password when needed. No more profile plug specific method is used anymore in backend, instead a "validated" key is used in actions
- Primitivus widget are now based on a common "PrimitivusWidget" classe which mainly manage the decoration so far
- all widgets are treated in the same way (contactList, Chat, Progress, etc), no more chat_wins specific behaviour
- widgets are created in a dedicated manager, with facilities to react on new widget creation or other events
- quick_frontend introduce a new QuickWidget class, which aims to be as generic and flexible as possible. It can manage several targets (jids or something else), and several profiles
- each widget class return a Hash according to its target. For example if given a target jid and a profile, a widget class return a hash like (target.bare, profile), the same widget will be used for all resources of the same jid
- better management of CHAT_GROUP mode for Chat widgets
- some code moved from Primitivus to QuickFrontend, the final goal is to have most non backend code in QuickFrontend, and just graphic code in subclasses
- no more (un)escapePrivate/PRIVATE_PREFIX
- contactList improved a lot: entities not in roster and special entities (private MUC conversations) are better managed
- resources can be displayed in Primitivus, and their status messages
- profiles are managed in QuickFrontend with dedicated managers
This is work in progress, other frontends are broken. Urwid SàText need to be updated. Most of features of Primitivus should work as before (or in a better way ;))
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Wed, 10 Dec 2014 19:00:09 +0100 |
| parents | 7f32371568e4 |
| children | faa1129559b8 |
comparison
equal
deleted
inserted
replaced
| 1264:60dfa2f5d61f | 1265:e3a9ea76de35 |
|---|---|
| 20 | 20 |
| 21 class JID(unicode): | 21 class JID(unicode): |
| 22 """This class help manage JID (Node@Domaine/Resource)""" | 22 """This class help manage JID (Node@Domaine/Resource)""" |
| 23 | 23 |
| 24 def __new__(cls, jid): | 24 def __new__(cls, jid): |
| 25 self = unicode.__new__(cls, cls.__normalize(jid)) | 25 self = unicode.__new__(cls, cls._normalize(jid)) |
| 26 self.__parse() | 26 self._parse() |
| 27 return self | 27 return self |
| 28 | 28 |
| 29 @classmethod | 29 @classmethod |
| 30 def __normalize(cls, jid): | 30 def _normalize(cls, jid): |
| 31 """Naive normalization before instantiating and parsing the JID""" | 31 """Naive normalization before instantiating and parsing the JID""" |
| 32 if not jid: | 32 if not jid: |
| 33 return jid | 33 return jid |
| 34 tokens = jid.split('/') | 34 tokens = jid.split('/') |
| 35 tokens[0] = tokens[0].lower() # force node and domain to lower-case | 35 tokens[0] = tokens[0].lower() # force node and domain to lower-case |
| 36 return '/'.join(tokens) | 36 return '/'.join(tokens) |
| 37 | 37 |
| 38 def __parse(self): | 38 @property |
| 39 def bare(self): | |
| 40 if not self.node: | |
| 41 return JID(self.domain) | |
| 42 return JID(u"{}@{}".format(self.node, self.domain)) | |
| 43 | |
| 44 def _parse(self): | |
| 39 """Find node domain and resource""" | 45 """Find node domain and resource""" |
| 40 node_end = self.find('@') | 46 node_end = self.find('@') |
| 41 if node_end < 0: | 47 if node_end < 0: |
| 42 node_end = 0 | 48 node_end = 0 |
| 43 domain_end = self.find('/') | 49 domain_end = self.find('/') |
| 44 if domain_end < 1: | 50 if domain_end == 0: |
| 51 raise ValueError("a jid can't start with '/'") | |
| 52 if domain_end == -1: | |
| 45 domain_end = len(self) | 53 domain_end = len(self) |
| 46 self.node = self[:node_end] | 54 self.node = self[:node_end] or None |
| 47 self.domain = self[(node_end + 1) if node_end else 0:domain_end] | 55 self.domain = self[(node_end + 1) if node_end else 0:domain_end] |
| 48 self.resource = self[domain_end + 1:] | 56 self.resource = self[domain_end + 1:] or None |
| 49 if not node_end: | |
| 50 self.bare = self | |
| 51 else: | |
| 52 self.bare = self.node + '@' + self.domain | |
| 53 | 57 |
| 54 def is_valid(self): | 58 def is_valid(self): |
| 55 """ | 59 """ |
| 56 @return: True if the JID is XMPP compliant | 60 @return: True if the JID is XMPP compliant |
| 57 """ | 61 """ |