Mercurial > libervia-backend
view sat/tools/common/ansi.py @ 2927:69e4716d6268
plugins (jingle) file transfer: use initial "from" attribute as local jid instead of client.jid:
while client.jid is fine in a client context, for components it's not the right jid to use: it is the jid of the component itself while the file transfer/jingle session entity may be established with this jid + a local part (e.g. if client is files.example.net, session may be established with louise@files.example.net, in which case "from" is louise@files.example.net, while client.jid will be files.example.net).
As a consequence, using client.jid was causing trouble with components.
This patch fixes it for jingle and plugins linked to file transfer by keeping a "local_jid" variable in the session, where the jid from the original "from" attribute is used.
author | Goffi <goffi@goffi.org> |
---|---|
date | Sun, 28 Apr 2019 08:55:13 +0200 |
parents | 003b8b4b56a7 |
children | ab2696e34d29 |
line wrap: on
line source
#!/usr/bin/env python2 # -*- coding: utf-8 -*- # SàT: a XMPP client # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org) # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. import sys class ANSI(object): ## ANSI escape sequences ## RESET = "\033[0m" NORMAL_WEIGHT = "\033[22m" FG_BLACK, FG_RED, FG_GREEN, FG_YELLOW, FG_BLUE, FG_MAGENTA, FG_CYAN, FG_WHITE = ( "\033[3%dm" % nb for nb in xrange(8) ) BOLD = "\033[1m" BLINK = "\033[5m" BLINK_OFF = "\033[25m" @classmethod def color(cls, *args): """output text using ANSI codes this method simply merge arguments, and add RESET if is not the last arguments """ # XXX: we expect to have at least one argument if args[-1] != cls.RESET: args = list(args) args.append(cls.RESET) return u"".join(args) try: tty = sys.stdout.isatty() except ( AttributeError, TypeError, ): # FIXME: TypeError is here for Pyjamas, need to be removed tty = False if not tty: # we don't want ANSI escape codes if we are not outputing to a tty! for attr in dir(ANSI): if isinstance(getattr(ANSI, attr), basestring): setattr(ANSI, attr, u"") del tty