annotate frontends/src/jp/output_std.py @ 2144:1d3f73e065e1

core, jp: component handling + client handling refactoring: - SàT can now handle components - plugin have now a "modes" key in PLUGIN_INFO where they declare if they can be used with clients and or components. They default to be client only. - components are really similar to clients, but with some changes in behaviour: * component has "entry point", which is a special plugin with a componentStart method, which is called just after component is connected * trigger end with a different suffixes (e.g. profileConnected vs profileConnectedComponent), so a plugin which manage both clients and components can have different workflow * for clients, only triggers of plugins handling client mode are launched * for components, only triggers of plugins needed in dependencies are launched. They all must handle component mode. * component have a sendHistory attribute (False by default) which can be set to True to allow saving sent messages into history * for convenience, "client" is still used in method even if it can now be a component * a new "component" boolean attribute tells if we have a component or a client * components have to add themselve Message protocol * roster and presence protocols are not added for components * component default port is 5347 (which is Prosody's default port) - asyncCreateProfile has been renamed for profileCreate, both to follow new naming convention and to prepare the transition to fully asynchronous bridge - createProfile has a new "component" attribute. When used to create a component, it must be set to a component entry point - jp: added --component argument to profile/create - disconnect bridge method is now asynchronous, this way frontends can know when disconnection is finished - new PI_* constants for PLUGIN_INFO values (not used everywhere yet) - client/component connection workflow has been moved to their classes instead of being a host methods - host.messageSend is now client.sendMessage, and former client.sendMessage is now client.sendMessageData. - identities are now handled in client.identities list, so it can be updated dynamically by plugins (in the future, frontends should be able to update them too through bridge) - profileConnecting* profileConnected* profileDisconnected* and getHandler now all use client instead of profile
author Goffi <goffi@goffi.org>
date Sun, 12 Feb 2017 17:55:43 +0100
parents 227a4e617549
children 8f96c242fa89
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1950
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
1 #! /usr/bin/python
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
2 # -*- coding: utf-8 -*-
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
3
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
4 # jp: a SàT command line tool
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
5 # Copyright (C) 2009-2016 Jérôme Poisson (goffi@goffi.org)
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
6
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
7 # This program is free software: you can redistribute it and/or modify
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
8 # it under the terms of the GNU Affero General Public License as published by
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
9 # the Free Software Foundation, either version 3 of the License, or
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
10 # (at your option) any later version.
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
11
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
12 # This program is distributed in the hope that it will be useful,
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
15 # GNU Affero General Public License for more details.
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
16
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
17 # You should have received a copy of the GNU Affero General Public License
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
19 """Standard outputs"""
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
20
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
21
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
22 from sat_frontends.jp.constants import Const as C
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
23 import json
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
24
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
25 __outputs__ = ["Default", "Json"]
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
26 DEFAULT = u'default'
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
27 JSON = u'json'
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
28 JSON_RAW = u'json_raw'
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
29
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
30
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
31 class Default(object):
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
32 """Default outputs"""
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
33
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
34 def __init__(self, jp):
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
35 jp.register_output(C.OUTPUT_TEXT, DEFAULT, self.text)
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
36 jp.register_output(C.OUTPUT_LIST, DEFAULT, self.list)
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
37
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
38 def text(self, data):
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
39 print data
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
40
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
41 def list(self, data):
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
42 print u'\n'.join(data)
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
43
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
44
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
45 class Json(object):
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
46 """outputs in json format"""
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
47
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
48 def __init__(self, jp):
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
49 jp.register_output(C.OUTPUT_LIST, JSON, self.dump_pretty)
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
50 jp.register_output(C.OUTPUT_LIST, JSON_RAW, self.dump)
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
51 jp.register_output(C.OUTPUT_DICT, JSON, self.dump_pretty)
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
52 jp.register_output(C.OUTPUT_DICT, JSON_RAW, self.dump)
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
53
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
54 def dump(self, data):
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
55 print json.dumps(data)
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
56
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
57 def dump_pretty(self, data):
227a4e617549 jp: --output option:
Goffi <goffi@goffi.org>
parents:
diff changeset
58 print json.dumps(data, indent=4)