7ca3c657f4
- imports from sat_frontends.jp instead of local imports
- added __init__.py
- commands now inherits from a base class: each base.CommandBase instance is a subcommand
- new arguments are added in CommandBase.add_parser_options methods, starting point si CommandBase.run or CommandBase.connected if a profile connection is needed
- commands are exported using a __commands__ variable at the top of the module
- sub-subcommand are easily added by using an other CommandBase instance as parent instead of using a Jp instance. In this case, the parent subcommand must be the one exported, and have a subcommands iterable (see cmd_file or cmd_pipe for examples).
- options which are often used (like --profile) are automatically added on demand (use_profile=True, use_progress=True)
- commands are automatically loaded when there are in a module named cmd_XXX
- restored --connect option
- restored progress bar
- restored getVersion bridge call on jp --version
- fixed file and pipe commands
- fixed forgotten translations
- fixed non SàT compliant docstrings
- better about/version dialog
61 lines
2.7 KiB
Python
61 lines
2.7 KiB
Python
#! /usr/bin/python
|
|
# -*- coding: utf-8 -*-
|
|
|
|
# jp: a SAT command line tool
|
|
# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 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 sys
|
|
from sat.core.i18n import _
|
|
from sat.tools.utils import clean_ustr
|
|
|
|
__commands__ = ["Message"]
|
|
|
|
|
|
class Message(base.CommandBase):
|
|
|
|
def __init__(self, host):
|
|
super(Message, self).__init__(host, 'message', help=_('Send a message to a contact'))
|
|
|
|
def add_parser_options(self):
|
|
self.parser.add_argument("-s", "--separate", action="store_true", help=_("Separate xmpp messages: send one message per line instead of one message alone."))
|
|
self.parser.add_argument("-n", "--new-line", action="store_true", help=_("Add a new line at the beginning of the input (usefull for ascii art ;))"))
|
|
self.parser.add_argument("jid", type=str, help=_("The destination jid"))
|
|
|
|
def connected(self):
|
|
super(Message, self).connected()
|
|
jids = self.host.check_jids([self.args.jid])
|
|
jid = jids[0]
|
|
self.send_stdin(jid)
|
|
|
|
def send_stdin(self, dest_jid):
|
|
"""Send incomming data on stdin to jabber contact
|
|
@param dest_jid: destination jid"""
|
|
header = "\n" if self.args.new_line else ""
|
|
|
|
if self.args.separate: #we send stdin in several messages
|
|
|
|
if header:
|
|
self.host.bridge.sendMessage(dest_jid, header, profile_key=self.profile, callback=lambda: None, errback=lambda ignore: ignore)
|
|
|
|
while (True):
|
|
line = clean_ustr(sys.stdin.readline().decode('utf-8','ignore'))
|
|
if not line:
|
|
break
|
|
self.host.bridge.sendMessage(dest_jid, line.replace("\n",""), profile_key=self.host.profile, callback=lambda: None, errback=lambda ignore: ignore)
|
|
|
|
else:
|
|
self.host.bridge.sendMessage(dest_jid, header + clean_ustr(u"".join([stream.decode('utf-8','ignore') for stream in sys.stdin.readlines()])), profile_key=self.host.profile, callback=lambda: None, errback=lambda ignore: ignore)
|