comparison frontends/src/jp/cmd_profile.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 5fbe09b9b568
children 1bb9bf1b4150
comparison
equal deleted inserted replaced
2143:c3cac21157d4 2144:1d3f73e065e1
123 self.parser.add_argument('profile', type=str, help=_('the name of the profile')) 123 self.parser.add_argument('profile', type=str, help=_('the name of the profile'))
124 self.parser.add_argument('-p', '--password', type=str, default='', help=_('the password of the profile')) 124 self.parser.add_argument('-p', '--password', type=str, default='', help=_('the password of the profile'))
125 self.parser.add_argument('-j', '--jid', type=str, help=_('the jid of the profile')) 125 self.parser.add_argument('-j', '--jid', type=str, help=_('the jid of the profile'))
126 self.parser.add_argument('-x', '--xmpp-password', type=str, help=_('the password of the XMPP account (use profile password if not specified)'), 126 self.parser.add_argument('-x', '--xmpp-password', type=str, help=_('the password of the XMPP account (use profile password if not specified)'),
127 metavar='PASSWORD') 127 metavar='PASSWORD')
128 self.parser.add_argument('-C', '--component', type=base.unicode_decoder, default='',
129 help=_(u'set to component import name (entry point) if this is a component'))
128 130
129 def _session_started(self, dummy): 131 def _session_started(self, dummy):
130 if self.args.jid: 132 if self.args.jid:
131 self.host.bridge.setParam("JabberID", self.args.jid, "Connection" ,profile_key=self.args.profile) 133 self.host.bridge.setParam("JabberID", self.args.jid, "Connection" ,profile_key=self.args.profile)
132 xmpp_pwd = self.args.password or self.args.xmpp_password 134 xmpp_pwd = self.args.password or self.args.xmpp_password
140 def start(self): 142 def start(self):
141 """Create a new profile""" 143 """Create a new profile"""
142 if self.args.profile in self.host.bridge.getProfilesList(): 144 if self.args.profile in self.host.bridge.getProfilesList():
143 log.error("Profile %s already exists." % self.args.profile) 145 log.error("Profile %s already exists." % self.args.profile)
144 self.host.quit(1) 146 self.host.quit(1)
145 self.host.bridge.asyncCreateProfile(self.args.profile, self.args.password, callback=self._profile_created, errback=None) 147 self.host.bridge.profileCreate(self.args.profile, self.args.password, self.args.component, callback=self._profile_created, errback=None)
146 148
147 149
148 class ProfileModify(base.CommandBase): 150 class ProfileModify(base.CommandBase):
149 def __init__(self, host): 151 def __init__(self, host):
150 super(ProfileModify, self).__init__(host, 'modify', need_connect=False, help=_('modify an existing profile')) 152 super(ProfileModify, self).__init__(host, 'modify', need_connect=False, help=_('modify an existing profile'))