code style reformatting using black

This commit is contained in:
Goffi 2018-06-27 20:14:46 +02:00
commit 744cb0c503

View file

@ -27,25 +27,58 @@ __commands__ = ["Message"]
class Send(base.CommandBase):
def __init__(self, host):
super(Send, self).__init__(host, 'send', help=_('send a message to a contact'))
super(Send, self).__init__(host, "send", help=_("send a message to a contact"))
def add_parser_options(self):
self.parser.add_argument("-l", "--lang", type=str, default='', help=_(u"language of the message"))
self.parser.add_argument("-s", "--separate", action="store_true", help=_(u"separate xmpp messages: send one message per line instead of one message alone."))
self.parser.add_argument("-n", "--new-line", action="store_true", help=_(u"add a new line at the beginning of the input (usefull for ascii art ;))"))
self.parser.add_argument("-S", "--subject", type=base.unicode_decoder, help=_(u"subject of the message"))
self.parser.add_argument("-L", "--subject_lang", type=str, default='', help=_(u"language of subject"))
self.parser.add_argument("-t", "--type", choices=C.MESS_TYPE_STANDARD + (C.MESS_TYPE_AUTO,), default=C.MESS_TYPE_AUTO, help=_("type of the message"))
self.parser.add_argument(
"-l", "--lang", type=str, default="", help=_(u"language of the message")
)
self.parser.add_argument(
"-s",
"--separate",
action="store_true",
help=_(
u"separate xmpp messages: send one message per line instead of one message alone."
),
)
self.parser.add_argument(
"-n",
"--new-line",
action="store_true",
help=_(
u"add a new line at the beginning of the input (usefull for ascii art ;))"
),
)
self.parser.add_argument(
"-S",
"--subject",
type=base.unicode_decoder,
help=_(u"subject of the message"),
)
self.parser.add_argument(
"-L", "--subject_lang", type=str, default="", help=_(u"language of subject")
)
self.parser.add_argument(
"-t",
"--type",
choices=C.MESS_TYPE_STANDARD + (C.MESS_TYPE_AUTO,),
default=C.MESS_TYPE_AUTO,
help=_("type of the message"),
)
syntax = self.parser.add_mutually_exclusive_group()
syntax.add_argument("-x", "--xhtml", action="store_true", help=_(u"XHTML body"))
syntax.add_argument("-r", "--rich", action="store_true", help=_(u"rich body"))
self.parser.add_argument("jid", type=base.unicode_decoder, help=_(u"the destination jid"))
self.parser.add_argument(
"jid", type=base.unicode_decoder, help=_(u"the destination jid")
)
def start(self):
if self.args.xhtml and self.args.separate:
self.disp(u"argument -s/--separate is not compatible yet with argument -x/--xhtml", error=True)
self.disp(
u"argument -s/--separate is not compatible yet with argument -x/--xhtml",
error=True,
)
self.host.quit(2)
jids = self.host.check_jids([self.args.jid])
@ -58,7 +91,9 @@ class Send(base.CommandBase):
@param dest_jid: destination jid
"""
header = "\n" if self.args.new_line else ""
stdin_lines = [stream.decode('utf-8','ignore') for stream in sys.stdin.readlines()]
stdin_lines = [
stream.decode("utf-8", "ignore") for stream in sys.stdin.readlines()
]
extra = {}
if self.args.subject is None:
subject = {}
@ -72,20 +107,52 @@ class Send(base.CommandBase):
extra[key] = clean_ustr(u"".join(stdin_lines))
stdin_lines = []
if self.args.separate: #we send stdin in several messages
if self.args.separate: # we send stdin in several messages
if header:
self.host.bridge.messageSend(dest_jid, {self.args.lang: header}, subject, self.args.type, profile_key=self.profile, callback=lambda: None, errback=lambda ignore: ignore)
self.host.bridge.messageSend(
dest_jid,
{self.args.lang: header},
subject,
self.args.type,
profile_key=self.profile,
callback=lambda: None,
errback=lambda ignore: ignore,
)
for line in stdin_lines:
self.host.bridge.messageSend(dest_jid, {self.args.lang: line.replace("\n","")}, subject, self.args.type, extra, profile_key=self.host.profile, callback=lambda: None, errback=lambda ignore: ignore)
self.host.bridge.messageSend(
dest_jid,
{self.args.lang: line.replace("\n", "")},
subject,
self.args.type,
extra,
profile_key=self.host.profile,
callback=lambda: None,
errback=lambda ignore: ignore,
)
else:
msg = {self.args.lang: header + clean_ustr(u"".join(stdin_lines))} if not (self.args.xhtml or self.args.rich) else {}
self.host.bridge.messageSend(dest_jid, msg, subject, self.args.type, extra, profile_key=self.host.profile, callback=lambda: None, errback=lambda ignore: ignore)
msg = (
{self.args.lang: header + clean_ustr(u"".join(stdin_lines))}
if not (self.args.xhtml or self.args.rich)
else {}
)
self.host.bridge.messageSend(
dest_jid,
msg,
subject,
self.args.type,
extra,
profile_key=self.host.profile,
callback=lambda: None,
errback=lambda ignore: ignore,
)
class Message(base.CommandBase):
subcommands = (Send, )
subcommands = (Send,)
def __init__(self, host):
super(Message, self).__init__(host, 'message', use_profile=False, help=_('messages handling'))
super(Message, self).__init__(
host, "message", use_profile=False, help=_("messages handling")
)