Mercurial > libervia-backend
view frontends/src/jp/cmd_pipe.py @ 1963:a2bc5089c2eb
backend, frontends: message refactoring (huge commit):
/!\ several features are temporarily disabled, like notifications in frontends
next step in refactoring, with the following changes:
- jp: updated jp message to follow changes in backend/bridge
- jp: added --lang, --subject, --subject_lang, and --type options to jp message + fixed unicode handling for jid
- quick_frontend (QuickApp, QuickChat):
- follow backend changes
- refactored chat, message are now handled in OrderedDict and uid are kept so they can be updated
- Message and Occupant classes handle metadata, so frontend just have to display them
- Primitivus (Chat):
- follow backend/QuickFrontend changes
- info & standard messages are handled in the same MessageWidget class
- improved/simplified handling of messages, removed update() method
- user joined/left messages are merged when next to each other
- a separator is shown when message is received while widget is out of focus, so user can quickly see the new messages
- affiliation/role are shown (in a basic way for now) in occupants panel
- removed "/me" messages handling, as it will be done by a backend plugin
- message language is displayed when available (only one language per message for now)
- fixed :history and :search commands
- core (constants): new constants for messages type, XML namespace, entity type
- core: *Message methods renamed to follow new code sytle (e.g. sendMessageToBridge => messageSendToBridge)
- core (messages handling): fixed handling of language
- core (messages handling): mes_data['from'] and ['to'] are now jid.JID
- core (core.xmpp): reorganised message methods, added getNick() method to client.roster
- plugin text commands: fixed plugin and adapted to new messages behaviour. client is now used in arguments instead of profile
- plugins: added information for cancellation reason in CancelError calls
- plugin XEP-0045: various improvments, but this plugin still need work:
- trigger is used to avoid message already handled by the plugin to be handled a second time
- changed the way to handle history, the last message from DB is checked and we request only messages since this one, in seconds (thanks Poezio folks :))
- subject reception is waited before sending the roomJoined signal, this way we are sure that everything including history is ready
- cmd_* method now follow the new convention with client instead of profile
- roomUserJoined and roomUserLeft messages are removed, the events are now handled with info message with a "ROOM_USER_JOINED" info subtype
- probably other forgotten stuffs :p
author | Goffi <goffi@goffi.org> |
---|---|
date | Mon, 20 Jun 2016 18:41:53 +0200 |
parents | 3e168cde7a7d |
children | 8b37a62336c3 |
line wrap: on
line source
#!/usr/bin/env python2 # -*- coding: utf-8 -*- # jp: a SAT command line tool # Copyright (C) 2009-2016 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/>. from sat_frontends.jp import base import tempfile import sys import os import os.path import shutil from sat.core.i18n import _ from sat_frontends.tools import jid import xml.etree.ElementTree as ET # FIXME: used temporarily to manage XMLUI __commands__ = ["Pipe"] class PipeOut(base.CommandBase): def __init__(self, host): super(PipeOut, self).__init__(host, 'out', help=_('send a pipe a stream')) self.need_loop = True def add_parser_options(self): self.parser.add_argument("jid", type=base.unicode_decoder, help=_("the destination jid")) def start(self): """ Create named pipe, and send stdin to it """ # TODO: check_jids tmp_dir = tempfile.mkdtemp() fifopath = os.path.join(tmp_dir,"pipe_out") os.mkfifo(fifopath) self.host.bridge.pipeOut(self.host.get_full_jid(self.args.jid), fifopath, self.profile) with open(fifopath, 'w') as f: shutil.copyfileobj(sys.stdin, f) shutil.rmtree(tmp_dir) self.host.quit() class PipeIn(base.CommandAnswering): def __init__(self, host): super(PipeIn, self).__init__(host, 'in', help=_('receive a pipe stream')) self.action_callbacks = {"PIPE": self.onPipeAction} def add_parser_options(self): self.parser.add_argument("jids", type=base.unicode_decoder, nargs="*", help=_('Jids accepted (none means "accept everything")')) def getXmluiId(self, action_data): # FIXME: we temporarily use ElementTree, but a real XMLUI managing module # should be available in the futur # TODO: XMLUI module try: xml_ui = action_data['xmlui'] except KeyError: self.disp(_(u"Action has no XMLUI"), 1) else: ui = ET.fromstring(xml_ui.encode('utf-8')) xmlui_id = ui.get('submit') if not xmlui_id: self.disp(_(u"Invalid XMLUI received"), error=True) return xmlui_id def onPipeAction(self, action_data, action_id, security_limit, profile): xmlui_id = self.getXmluiId(action_data) if xmlui_id is None: return self.host.quitFromSignal(1) try: from_jid = jid.JID(action_data['meta_from_jid']) except KeyError: self.disp(_(u"Ignoring action without from_jid data"), 1) return if not self.bare_jids or from_jid.bare in self.bare_jids: tmp_dir = tempfile.mkdtemp() fifopath = os.path.join(tmp_dir,"pipe_in") os.mkfifo(fifopath) xmlui_data = {'path': fifopath} self.host.bridge.launchAction(xmlui_id, xmlui_data, profile_key=profile) with open(fifopath, 'r') as f: shutil.copyfileobj(f, sys.stdout) shutil.rmtree(tmp_dir) self.host.quit() def start(self): self.bare_jids = [jid.JID(jid_).bare for jid_ in self.args.jids] class Pipe(base.CommandBase): subcommands = (PipeOut, PipeIn) def __init__(self, host): super(Pipe, self).__init__(host, 'pipe', use_profile=False, help=_('stream piping through XMPP'))