comparison sat_frontends/bridge/pb.py @ 4037:524856bd7b19

massive refactoring to switch from camelCase to snake_case: historically, Libervia (SàT before) was using camelCase as allowed by PEP8 when using a pre-PEP8 code, to use the same coding style as in Twisted. However, snake_case is more readable and it's better to follow PEP8 best practices, so it has been decided to move on full snake_case. Because Libervia has a huge codebase, this ended with a ugly mix of camelCase and snake_case. To fix that, this patch does a big refactoring by renaming every function and method (including bridge) that are not coming from Twisted or Wokkel, to use fully snake_case. This is a massive change, and may result in some bugs.
author Goffi <goffi@goffi.org>
date Sat, 08 Apr 2023 13:54:42 +0200
parents 3c7a64d6f49f
children 4b842c1fb686
comparison
equal deleted inserted replaced
4036:c4464d7ae97b 4037:524856bd7b19
53 ) 53 )
54 ) 54 )
55 setattr(self, method_name, handler) 55 setattr(self, method_name, handler)
56 56
57 57
58 class Bridge(object): 58 class bridge(object):
59 59
60 def __init__(self): 60 def __init__(self):
61 self.signals_handler = SignalsHandler() 61 self.signals_handler = SignalsHandler()
62 62
63 def __getattr__(self, name): 63 def __getattr__(self, name):
73 name=failure_.type.decode('utf-8'), 73 name=failure_.type.decode('utf-8'),
74 message=str(failure_.value) 74 message=str(failure_.value)
75 ) 75 )
76 ) 76 )
77 77
78 def remoteCallback(self, result, callback): 78 def remote_callback(self, result, callback):
79 """call callback with argument or None 79 """call callback with argument or None
80 80
81 if result is not None not argument is used, 81 if result is not None not argument is used,
82 else result is used as argument 82 else result is used as argument
83 @param result: remote call result 83 @param result: remote call result
110 elif len(args) >= 2 and callable(args[-1]) and callable(args[-2]): 110 elif len(args) >= 2 and callable(args[-1]) and callable(args[-2]):
111 errback = args.pop() 111 errback = args.pop()
112 callback = args.pop() 112 callback = args.pop()
113 d = self.root.callRemote(name, *args, **kwargs) 113 d = self.root.callRemote(name, *args, **kwargs)
114 if callback is not None: 114 if callback is not None:
115 d.addCallback(self.remoteCallback, callback) 115 d.addCallback(self.remote_callback, callback)
116 if errback is not None: 116 if errback is not None:
117 d.addErrback(errback) 117 d.addErrback(errback)
118 118
119 def _initBridgeEb(self, failure_): 119 def _init_bridge_eb(self, failure_):
120 log.error("Can't init bridge: {msg}".format(msg=failure_)) 120 log.error("Can't init bridge: {msg}".format(msg=failure_))
121 return failure_ 121 return failure_
122 122
123 def _set_root(self, root): 123 def _set_root(self, root):
124 """set remote root object 124 """set remote root object
125 125
126 bridge will then be initialised 126 bridge will then be initialised
127 """ 127 """
128 self.root = root 128 self.root = root
129 d = root.callRemote("initBridge", self.signals_handler) 129 d = root.callRemote("initBridge", self.signals_handler)
130 d.addErrback(self._initBridgeEb) 130 d.addErrback(self._init_bridge_eb)
131 return d 131 return d
132 132
133 def getRootObjectEb(self, failure_): 133 def get_root_object_eb(self, failure_):
134 """Call errback with appropriate bridge error""" 134 """Call errback with appropriate bridge error"""
135 if failure_.check(ConnectionRefusedError, ConnectError): 135 if failure_.check(ConnectionRefusedError, ConnectError):
136 raise exceptions.BridgeExceptionNoService 136 raise exceptions.BridgeExceptionNoService
137 else: 137 else:
138 raise failure_ 138 raise failure_
139 139
140 def bridgeConnect(self, callback, errback): 140 def bridge_connect(self, callback, errback):
141 factory = pb.PBClientFactory() 141 factory = pb.PBClientFactory()
142 conf = config.parseMainConf() 142 conf = config.parse_main_conf()
143 getConf = partial(config.getConf, conf, "bridge_pb", "") 143 get_conf = partial(config.get_conf, conf, "bridge_pb", "")
144 conn_type = getConf("connection_type", "unix_socket") 144 conn_type = get_conf("connection_type", "unix_socket")
145 if conn_type == "unix_socket": 145 if conn_type == "unix_socket":
146 local_dir = Path(config.getConfig(conf, "", "local_dir")).resolve() 146 local_dir = Path(config.config_get(conf, "", "local_dir")).resolve()
147 socket_path = local_dir / "bridge_pb" 147 socket_path = local_dir / "bridge_pb"
148 reactor.connectUNIX(str(socket_path), factory) 148 reactor.connectUNIX(str(socket_path), factory)
149 elif conn_type == "socket": 149 elif conn_type == "socket":
150 host = getConf("host", "localhost") 150 host = get_conf("host", "localhost")
151 port = int(getConf("port", 8789)) 151 port = int(get_conf("port", 8789))
152 reactor.connectTCP(host, port, factory) 152 reactor.connectTCP(host, port, factory)
153 else: 153 else:
154 raise ValueError(f"Unknown pb connection type: {conn_type!r}") 154 raise ValueError(f"Unknown pb connection type: {conn_type!r}")
155 d = factory.getRootObject() 155 d = factory.getRootObject()
156 d.addCallback(self._set_root) 156 d.addCallback(self._set_root)
157 if callback is not None: 157 if callback is not None:
158 d.addCallback(lambda __: callback()) 158 d.addCallback(lambda __: callback())
159 d.addErrback(self.getRootObjectEb) 159 d.addErrback(self.get_root_object_eb)
160 if errback is not None: 160 if errback is not None:
161 d.addErrback(lambda failure_: errback(failure_.value)) 161 d.addErrback(lambda failure_: errback(failure_.value))
162 return d 162 return d
163 163
164 def register_signal(self, functionName, handler, iface="core"): 164 def register_signal(self, functionName, handler, iface="core"):
165 self.signals_handler.register_signal(functionName, handler, iface) 165 self.signals_handler.register_signal(functionName, handler, iface)
166 166
167 167
168 def actionsGet(self, profile_key="@DEFAULT@", callback=None, errback=None): 168 def action_launch(self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None):
169 d = self.root.callRemote("actionsGet", profile_key) 169 d = self.root.callRemote("action_launch", callback_id, data, profile_key)
170 if callback is not None: 170 if callback is not None:
171 d.addCallback(callback) 171 d.addCallback(callback)
172 if errback is None: 172 if errback is None:
173 d.addErrback(self._generic_errback) 173 d.addErrback(self._generic_errback)
174 else: 174 else:
175 d.addErrback(self._errback, ori_errback=errback) 175 d.addErrback(self._errback, ori_errback=errback)
176 176
177 def addContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): 177 def actions_get(self, profile_key="@DEFAULT@", callback=None, errback=None):
178 d = self.root.callRemote("addContact", entity_jid, profile_key) 178 d = self.root.callRemote("actions_get", profile_key)
179 if callback is not None: 179 if callback is not None:
180 d.addCallback(lambda __: callback()) 180 d.addCallback(callback)
181 if errback is None: 181 if errback is None:
182 d.addErrback(self._generic_errback) 182 d.addErrback(self._generic_errback)
183 else: 183 else:
184 d.addErrback(self._errback, ori_errback=errback) 184 d.addErrback(self._errback, ori_errback=errback)
185 185
186 def asyncDeleteProfile(self, profile, callback=None, errback=None): 186 def config_get(self, section, name, callback=None, errback=None):
187 d = self.root.callRemote("asyncDeleteProfile", profile) 187 d = self.root.callRemote("config_get", section, name)
188 if callback is not None:
189 d.addCallback(lambda __: callback())
190 if errback is None:
191 d.addErrback(self._generic_errback)
192 else:
193 d.addErrback(self._errback, ori_errback=errback)
194
195 def asyncGetParamA(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None):
196 d = self.root.callRemote("asyncGetParamA", name, category, attribute, security_limit, profile_key)
197 if callback is not None:
198 d.addCallback(callback)
199 if errback is None:
200 d.addErrback(self._generic_errback)
201 else:
202 d.addErrback(self._errback, ori_errback=errback)
203
204 def asyncGetParamsValuesFromCategory(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@", callback=None, errback=None):
205 d = self.root.callRemote("asyncGetParamsValuesFromCategory", category, security_limit, app, extra, profile_key)
206 if callback is not None: 188 if callback is not None:
207 d.addCallback(callback) 189 d.addCallback(callback)
208 if errback is None: 190 if errback is None:
209 d.addErrback(self._generic_errback) 191 d.addErrback(self._generic_errback)
210 else: 192 else:
217 if errback is None: 199 if errback is None:
218 d.addErrback(self._generic_errback) 200 d.addErrback(self._generic_errback)
219 else: 201 else:
220 d.addErrback(self._errback, ori_errback=errback) 202 d.addErrback(self._errback, ori_errback=errback)
221 203
222 def contactGet(self, arg_0, profile_key="@DEFAULT@", callback=None, errback=None): 204 def contact_add(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None):
223 d = self.root.callRemote("contactGet", arg_0, profile_key) 205 d = self.root.callRemote("contact_add", entity_jid, profile_key)
224 if callback is not None: 206 if callback is not None:
225 d.addCallback(callback) 207 d.addCallback(lambda __: callback())
226 if errback is None: 208 if errback is None:
227 d.addErrback(self._generic_errback) 209 d.addErrback(self._generic_errback)
228 else: 210 else:
229 d.addErrback(self._errback, ori_errback=errback) 211 d.addErrback(self._errback, ori_errback=errback)
230 212
231 def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): 213 def contact_del(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None):
232 d = self.root.callRemote("delContact", entity_jid, profile_key) 214 d = self.root.callRemote("contact_del", entity_jid, profile_key)
233 if callback is not None: 215 if callback is not None:
234 d.addCallback(lambda __: callback()) 216 d.addCallback(lambda __: callback())
235 if errback is None: 217 if errback is None:
236 d.addErrback(self._generic_errback) 218 d.addErrback(self._generic_errback)
237 else: 219 else:
238 d.addErrback(self._errback, ori_errback=errback) 220 d.addErrback(self._errback, ori_errback=errback)
239 221
240 def devicesInfosGet(self, bare_jid, profile_key, callback=None, errback=None): 222 def contact_get(self, arg_0, profile_key="@DEFAULT@", callback=None, errback=None):
241 d = self.root.callRemote("devicesInfosGet", bare_jid, profile_key) 223 d = self.root.callRemote("contact_get", arg_0, profile_key)
242 if callback is not None: 224 if callback is not None:
243 d.addCallback(callback) 225 d.addCallback(callback)
244 if errback is None: 226 if errback is None:
245 d.addErrback(self._generic_errback) 227 d.addErrback(self._generic_errback)
246 else: 228 else:
247 d.addErrback(self._errback, ori_errback=errback) 229 d.addErrback(self._errback, ori_errback=errback)
248 230
249 def discoFindByFeatures(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key="@DEFAULT@", callback=None, errback=None): 231 def contact_update(self, entity_jid, name, groups, profile_key="@DEFAULT@", callback=None, errback=None):
250 d = self.root.callRemote("discoFindByFeatures", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key) 232 d = self.root.callRemote("contact_update", entity_jid, name, groups, profile_key)
251 if callback is not None: 233 if callback is not None:
252 d.addCallback(callback) 234 d.addCallback(lambda __: callback())
253 if errback is None: 235 if errback is None:
254 d.addErrback(self._generic_errback) 236 d.addErrback(self._generic_errback)
255 else: 237 else:
256 d.addErrback(self._errback, ori_errback=errback) 238 d.addErrback(self._errback, ori_errback=errback)
257 239
258 def discoInfos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None): 240 def contacts_get(self, profile_key="@DEFAULT@", callback=None, errback=None):
259 d = self.root.callRemote("discoInfos", entity_jid, node, use_cache, profile_key) 241 d = self.root.callRemote("contacts_get", profile_key)
260 if callback is not None: 242 if callback is not None:
261 d.addCallback(callback) 243 d.addCallback(callback)
262 if errback is None: 244 if errback is None:
263 d.addErrback(self._generic_errback) 245 d.addErrback(self._generic_errback)
264 else: 246 else:
265 d.addErrback(self._errback, ori_errback=errback) 247 d.addErrback(self._errback, ori_errback=errback)
266 248
267 def discoItems(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None): 249 def contacts_get_from_group(self, group, profile_key="@DEFAULT@", callback=None, errback=None):
268 d = self.root.callRemote("discoItems", entity_jid, node, use_cache, profile_key) 250 d = self.root.callRemote("contacts_get_from_group", group, profile_key)
251 if callback is not None:
252 d.addCallback(callback)
253 if errback is None:
254 d.addErrback(self._generic_errback)
255 else:
256 d.addErrback(self._errback, ori_errback=errback)
257
258 def devices_infos_get(self, bare_jid, profile_key, callback=None, errback=None):
259 d = self.root.callRemote("devices_infos_get", bare_jid, profile_key)
260 if callback is not None:
261 d.addCallback(callback)
262 if errback is None:
263 d.addErrback(self._generic_errback)
264 else:
265 d.addErrback(self._errback, ori_errback=errback)
266
267 def disco_find_by_features(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key="@DEFAULT@", callback=None, errback=None):
268 d = self.root.callRemote("disco_find_by_features", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key)
269 if callback is not None:
270 d.addCallback(callback)
271 if errback is None:
272 d.addErrback(self._generic_errback)
273 else:
274 d.addErrback(self._errback, ori_errback=errback)
275
276 def disco_infos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None):
277 d = self.root.callRemote("disco_infos", entity_jid, node, use_cache, profile_key)
278 if callback is not None:
279 d.addCallback(callback)
280 if errback is None:
281 d.addErrback(self._generic_errback)
282 else:
283 d.addErrback(self._errback, ori_errback=errback)
284
285 def disco_items(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None):
286 d = self.root.callRemote("disco_items", entity_jid, node, use_cache, profile_key)
269 if callback is not None: 287 if callback is not None:
270 d.addCallback(callback) 288 d.addCallback(callback)
271 if errback is None: 289 if errback is None:
272 d.addErrback(self._generic_errback) 290 d.addErrback(self._generic_errback)
273 else: 291 else:
280 if errback is None: 298 if errback is None:
281 d.addErrback(self._generic_errback) 299 d.addErrback(self._generic_errback)
282 else: 300 else:
283 d.addErrback(self._errback, ori_errback=errback) 301 d.addErrback(self._errback, ori_errback=errback)
284 302
285 def encryptionNamespaceGet(self, arg_0, callback=None, errback=None): 303 def encryption_namespace_get(self, arg_0, callback=None, errback=None):
286 d = self.root.callRemote("encryptionNamespaceGet", arg_0) 304 d = self.root.callRemote("encryption_namespace_get", arg_0)
287 if callback is not None: 305 if callback is not None:
288 d.addCallback(callback) 306 d.addCallback(callback)
289 if errback is None: 307 if errback is None:
290 d.addErrback(self._generic_errback) 308 d.addErrback(self._generic_errback)
291 else: 309 else:
292 d.addErrback(self._errback, ori_errback=errback) 310 d.addErrback(self._errback, ori_errback=errback)
293 311
294 def encryptionPluginsGet(self, callback=None, errback=None): 312 def encryption_plugins_get(self, callback=None, errback=None):
295 d = self.root.callRemote("encryptionPluginsGet") 313 d = self.root.callRemote("encryption_plugins_get")
296 if callback is not None: 314 if callback is not None:
297 d.addCallback(callback) 315 d.addCallback(callback)
298 if errback is None: 316 if errback is None:
299 d.addErrback(self._generic_errback) 317 d.addErrback(self._generic_errback)
300 else: 318 else:
301 d.addErrback(self._errback, ori_errback=errback) 319 d.addErrback(self._errback, ori_errback=errback)
302 320
303 def encryptionTrustUIGet(self, to_jid, namespace, profile_key, callback=None, errback=None): 321 def encryption_trust_ui_get(self, to_jid, namespace, profile_key, callback=None, errback=None):
304 d = self.root.callRemote("encryptionTrustUIGet", to_jid, namespace, profile_key) 322 d = self.root.callRemote("encryption_trust_ui_get", to_jid, namespace, profile_key)
305 if callback is not None: 323 if callback is not None:
306 d.addCallback(callback) 324 d.addCallback(callback)
307 if errback is None: 325 if errback is None:
308 d.addErrback(self._generic_errback) 326 d.addErrback(self._generic_errback)
309 else: 327 else:
310 d.addErrback(self._errback, ori_errback=errback) 328 d.addErrback(self._errback, ori_errback=errback)
311 329
312 def getConfig(self, section, name, callback=None, errback=None): 330 def entities_data_get(self, jids, keys, profile, callback=None, errback=None):
313 d = self.root.callRemote("getConfig", section, name) 331 d = self.root.callRemote("entities_data_get", jids, keys, profile)
314 if callback is not None: 332 if callback is not None:
315 d.addCallback(callback) 333 d.addCallback(callback)
316 if errback is None: 334 if errback is None:
317 d.addErrback(self._generic_errback) 335 d.addErrback(self._generic_errback)
318 else: 336 else:
319 d.addErrback(self._errback, ori_errback=errback) 337 d.addErrback(self._errback, ori_errback=errback)
320 338
321 def getContacts(self, profile_key="@DEFAULT@", callback=None, errback=None): 339 def entity_data_get(self, jid, keys, profile, callback=None, errback=None):
322 d = self.root.callRemote("getContacts", profile_key) 340 d = self.root.callRemote("entity_data_get", jid, keys, profile)
323 if callback is not None: 341 if callback is not None:
324 d.addCallback(callback) 342 d.addCallback(callback)
325 if errback is None: 343 if errback is None:
326 d.addErrback(self._generic_errback) 344 d.addErrback(self._generic_errback)
327 else: 345 else:
328 d.addErrback(self._errback, ori_errback=errback) 346 d.addErrback(self._errback, ori_errback=errback)
329 347
330 def getContactsFromGroup(self, group, profile_key="@DEFAULT@", callback=None, errback=None): 348 def features_get(self, profile_key, callback=None, errback=None):
331 d = self.root.callRemote("getContactsFromGroup", group, profile_key) 349 d = self.root.callRemote("features_get", profile_key)
332 if callback is not None: 350 if callback is not None:
333 d.addCallback(callback) 351 d.addCallback(callback)
334 if errback is None: 352 if errback is None:
335 d.addErrback(self._generic_errback) 353 d.addErrback(self._generic_errback)
336 else: 354 else:
337 d.addErrback(self._errback, ori_errback=errback) 355 d.addErrback(self._errback, ori_errback=errback)
338 356
339 def getEntitiesData(self, jids, keys, profile, callback=None, errback=None): 357 def history_get(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@", callback=None, errback=None):
340 d = self.root.callRemote("getEntitiesData", jids, keys, profile) 358 d = self.root.callRemote("history_get", from_jid, to_jid, limit, between, filters, profile)
341 if callback is not None: 359 if callback is not None:
342 d.addCallback(callback) 360 d.addCallback(callback)
343 if errback is None: 361 if errback is None:
344 d.addErrback(self._generic_errback) 362 d.addErrback(self._generic_errback)
345 else: 363 else:
346 d.addErrback(self._errback, ori_errback=errback) 364 d.addErrback(self._errback, ori_errback=errback)
347 365
348 def getEntityData(self, jid, keys, profile, callback=None, errback=None): 366 def image_check(self, arg_0, callback=None, errback=None):
349 d = self.root.callRemote("getEntityData", jid, keys, profile) 367 d = self.root.callRemote("image_check", arg_0)
350 if callback is not None: 368 if callback is not None:
351 d.addCallback(callback) 369 d.addCallback(callback)
352 if errback is None: 370 if errback is None:
353 d.addErrback(self._generic_errback) 371 d.addErrback(self._generic_errback)
354 else: 372 else:
355 d.addErrback(self._errback, ori_errback=errback) 373 d.addErrback(self._errback, ori_errback=errback)
356 374
357 def getFeatures(self, profile_key, callback=None, errback=None): 375 def image_convert(self, source, dest, arg_2, extra, callback=None, errback=None):
358 d = self.root.callRemote("getFeatures", profile_key) 376 d = self.root.callRemote("image_convert", source, dest, arg_2, extra)
359 if callback is not None: 377 if callback is not None:
360 d.addCallback(callback) 378 d.addCallback(callback)
361 if errback is None: 379 if errback is None:
362 d.addErrback(self._generic_errback) 380 d.addErrback(self._generic_errback)
363 else: 381 else:
364 d.addErrback(self._errback, ori_errback=errback) 382 d.addErrback(self._errback, ori_errback=errback)
365 383
366 def getMainResource(self, contact_jid, profile_key="@DEFAULT@", callback=None, errback=None): 384 def image_generate_preview(self, image_path, profile_key, callback=None, errback=None):
367 d = self.root.callRemote("getMainResource", contact_jid, profile_key) 385 d = self.root.callRemote("image_generate_preview", image_path, profile_key)
368 if callback is not None: 386 if callback is not None:
369 d.addCallback(callback) 387 d.addCallback(callback)
370 if errback is None: 388 if errback is None:
371 d.addErrback(self._generic_errback) 389 d.addErrback(self._generic_errback)
372 else: 390 else:
373 d.addErrback(self._errback, ori_errback=errback) 391 d.addErrback(self._errback, ori_errback=errback)
374 392
375 def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@", callback=None, errback=None): 393 def image_resize(self, image_path, width, height, callback=None, errback=None):
376 d = self.root.callRemote("getParamA", name, category, attribute, profile_key) 394 d = self.root.callRemote("image_resize", image_path, width, height)
377 if callback is not None: 395 if callback is not None:
378 d.addCallback(callback) 396 d.addCallback(callback)
379 if errback is None: 397 if errback is None:
380 d.addErrback(self._generic_errback) 398 d.addErrback(self._generic_errback)
381 else: 399 else:
382 d.addErrback(self._errback, ori_errback=errback) 400 d.addErrback(self._errback, ori_errback=errback)
383 401
384 def getParamsCategories(self, callback=None, errback=None): 402 def is_connected(self, profile_key="@DEFAULT@", callback=None, errback=None):
385 d = self.root.callRemote("getParamsCategories") 403 d = self.root.callRemote("is_connected", profile_key)
386 if callback is not None: 404 if callback is not None:
387 d.addCallback(callback) 405 d.addCallback(callback)
388 if errback is None: 406 if errback is None:
389 d.addErrback(self._generic_errback) 407 d.addErrback(self._generic_errback)
390 else: 408 else:
391 d.addErrback(self._errback, ori_errback=errback) 409 d.addErrback(self._errback, ori_errback=errback)
392 410
393 def getParamsUI(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@", callback=None, errback=None): 411 def main_resource_get(self, contact_jid, profile_key="@DEFAULT@", callback=None, errback=None):
394 d = self.root.callRemote("getParamsUI", security_limit, app, extra, profile_key) 412 d = self.root.callRemote("main_resource_get", contact_jid, profile_key)
395 if callback is not None: 413 if callback is not None:
396 d.addCallback(callback) 414 d.addCallback(callback)
397 if errback is None: 415 if errback is None:
398 d.addErrback(self._generic_errback) 416 d.addErrback(self._generic_errback)
399 else: 417 else:
400 d.addErrback(self._errback, ori_errback=errback) 418 d.addErrback(self._errback, ori_errback=errback)
401 419
402 def getPresenceStatuses(self, profile_key="@DEFAULT@", callback=None, errback=None): 420 def menu_help_get(self, menu_id, language, callback=None, errback=None):
403 d = self.root.callRemote("getPresenceStatuses", profile_key) 421 d = self.root.callRemote("menu_help_get", menu_id, language)
404 if callback is not None: 422 if callback is not None:
405 d.addCallback(callback) 423 d.addCallback(callback)
406 if errback is None: 424 if errback is None:
407 d.addErrback(self._generic_errback) 425 d.addErrback(self._generic_errback)
408 else: 426 else:
409 d.addErrback(self._errback, ori_errback=errback) 427 d.addErrback(self._errback, ori_errback=errback)
410 428
411 def getReady(self, callback=None, errback=None): 429 def menu_launch(self, menu_type, path, data, security_limit, profile_key, callback=None, errback=None):
412 d = self.root.callRemote("getReady") 430 d = self.root.callRemote("menu_launch", menu_type, path, data, security_limit, profile_key)
413 if callback is not None: 431 if callback is not None:
414 d.addCallback(lambda __: callback()) 432 d.addCallback(callback)
415 if errback is None: 433 if errback is None:
416 d.addErrback(self._generic_errback) 434 d.addErrback(self._generic_errback)
417 else: 435 else:
418 d.addErrback(self._errback, ori_errback=errback) 436 d.addErrback(self._errback, ori_errback=errback)
419 437
420 def getVersion(self, callback=None, errback=None): 438 def menus_get(self, language, security_limit, callback=None, errback=None):
421 d = self.root.callRemote("getVersion") 439 d = self.root.callRemote("menus_get", language, security_limit)
422 if callback is not None: 440 if callback is not None:
423 d.addCallback(callback) 441 d.addCallback(callback)
424 if errback is None: 442 if errback is None:
425 d.addErrback(self._generic_errback) 443 d.addErrback(self._generic_errback)
426 else: 444 else:
427 d.addErrback(self._errback, ori_errback=errback) 445 d.addErrback(self._errback, ori_errback=errback)
428 446
429 def getWaitingSub(self, profile_key="@DEFAULT@", callback=None, errback=None): 447 def message_encryption_get(self, to_jid, profile_key, callback=None, errback=None):
430 d = self.root.callRemote("getWaitingSub", profile_key) 448 d = self.root.callRemote("message_encryption_get", to_jid, profile_key)
431 if callback is not None: 449 if callback is not None:
432 d.addCallback(callback) 450 d.addCallback(callback)
433 if errback is None: 451 if errback is None:
434 d.addErrback(self._generic_errback) 452 d.addErrback(self._generic_errback)
435 else: 453 else:
436 d.addErrback(self._errback, ori_errback=errback) 454 d.addErrback(self._errback, ori_errback=errback)
437 455
438 def historyGet(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@", callback=None, errback=None): 456 def message_encryption_start(self, to_jid, namespace='', replace=False, profile_key="@NONE@", callback=None, errback=None):
439 d = self.root.callRemote("historyGet", from_jid, to_jid, limit, between, filters, profile) 457 d = self.root.callRemote("message_encryption_start", to_jid, namespace, replace, profile_key)
440 if callback is not None: 458 if callback is not None:
441 d.addCallback(callback) 459 d.addCallback(lambda __: callback())
442 if errback is None: 460 if errback is None:
443 d.addErrback(self._generic_errback) 461 d.addErrback(self._generic_errback)
444 else: 462 else:
445 d.addErrback(self._errback, ori_errback=errback) 463 d.addErrback(self._errback, ori_errback=errback)
446 464
447 def imageCheck(self, arg_0, callback=None, errback=None): 465 def message_encryption_stop(self, to_jid, profile_key, callback=None, errback=None):
448 d = self.root.callRemote("imageCheck", arg_0) 466 d = self.root.callRemote("message_encryption_stop", to_jid, profile_key)
449 if callback is not None: 467 if callback is not None:
450 d.addCallback(callback) 468 d.addCallback(lambda __: callback())
451 if errback is None: 469 if errback is None:
452 d.addErrback(self._generic_errback) 470 d.addErrback(self._generic_errback)
453 else: 471 else:
454 d.addErrback(self._errback, ori_errback=errback) 472 d.addErrback(self._errback, ori_errback=errback)
455 473
456 def imageConvert(self, source, dest, arg_2, extra, callback=None, errback=None): 474 def message_send(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None):
457 d = self.root.callRemote("imageConvert", source, dest, arg_2, extra) 475 d = self.root.callRemote("message_send", to_jid, message, subject, mess_type, extra, profile_key)
458 if callback is not None: 476 if callback is not None:
459 d.addCallback(callback) 477 d.addCallback(lambda __: callback())
460 if errback is None: 478 if errback is None:
461 d.addErrback(self._generic_errback) 479 d.addErrback(self._generic_errback)
462 else: 480 else:
463 d.addErrback(self._errback, ori_errback=errback) 481 d.addErrback(self._errback, ori_errback=errback)
464 482
465 def imageGeneratePreview(self, image_path, profile_key, callback=None, errback=None): 483 def namespaces_get(self, callback=None, errback=None):
466 d = self.root.callRemote("imageGeneratePreview", image_path, profile_key) 484 d = self.root.callRemote("namespaces_get")
467 if callback is not None: 485 if callback is not None:
468 d.addCallback(callback) 486 d.addCallback(callback)
469 if errback is None: 487 if errback is None:
470 d.addErrback(self._generic_errback) 488 d.addErrback(self._generic_errback)
471 else: 489 else:
472 d.addErrback(self._errback, ori_errback=errback) 490 d.addErrback(self._errback, ori_errback=errback)
473 491
474 def imageResize(self, image_path, width, height, callback=None, errback=None): 492 def param_get_a(self, name, category, attribute="value", profile_key="@DEFAULT@", callback=None, errback=None):
475 d = self.root.callRemote("imageResize", image_path, width, height) 493 d = self.root.callRemote("param_get_a", name, category, attribute, profile_key)
476 if callback is not None: 494 if callback is not None:
477 d.addCallback(callback) 495 d.addCallback(callback)
478 if errback is None: 496 if errback is None:
479 d.addErrback(self._generic_errback) 497 d.addErrback(self._generic_errback)
480 else: 498 else:
481 d.addErrback(self._errback, ori_errback=errback) 499 d.addErrback(self._errback, ori_errback=errback)
482 500
483 def isConnected(self, profile_key="@DEFAULT@", callback=None, errback=None): 501 def param_get_a_async(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None):
484 d = self.root.callRemote("isConnected", profile_key) 502 d = self.root.callRemote("param_get_a_async", name, category, attribute, security_limit, profile_key)
485 if callback is not None: 503 if callback is not None:
486 d.addCallback(callback) 504 d.addCallback(callback)
487 if errback is None: 505 if errback is None:
488 d.addErrback(self._generic_errback) 506 d.addErrback(self._generic_errback)
489 else: 507 else:
490 d.addErrback(self._errback, ori_errback=errback) 508 d.addErrback(self._errback, ori_errback=errback)
491 509
492 def launchAction(self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None): 510 def param_set(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None):
493 d = self.root.callRemote("launchAction", callback_id, data, profile_key) 511 d = self.root.callRemote("param_set", name, value, category, security_limit, profile_key)
494 if callback is not None: 512 if callback is not None:
495 d.addCallback(callback) 513 d.addCallback(lambda __: callback())
496 if errback is None: 514 if errback is None:
497 d.addErrback(self._generic_errback) 515 d.addErrback(self._generic_errback)
498 else: 516 else:
499 d.addErrback(self._errback, ori_errback=errback) 517 d.addErrback(self._errback, ori_errback=errback)
500 518
501 def loadParamsTemplate(self, filename, callback=None, errback=None): 519 def param_ui_get(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@", callback=None, errback=None):
502 d = self.root.callRemote("loadParamsTemplate", filename) 520 d = self.root.callRemote("param_ui_get", security_limit, app, extra, profile_key)
503 if callback is not None: 521 if callback is not None:
504 d.addCallback(callback) 522 d.addCallback(callback)
505 if errback is None: 523 if errback is None:
506 d.addErrback(self._generic_errback) 524 d.addErrback(self._generic_errback)
507 else: 525 else:
508 d.addErrback(self._errback, ori_errback=errback) 526 d.addErrback(self._errback, ori_errback=errback)
509 527
510 def menuHelpGet(self, menu_id, language, callback=None, errback=None): 528 def params_categories_get(self, callback=None, errback=None):
511 d = self.root.callRemote("menuHelpGet", menu_id, language) 529 d = self.root.callRemote("params_categories_get")
512 if callback is not None: 530 if callback is not None:
513 d.addCallback(callback) 531 d.addCallback(callback)
514 if errback is None: 532 if errback is None:
515 d.addErrback(self._generic_errback) 533 d.addErrback(self._generic_errback)
516 else: 534 else:
517 d.addErrback(self._errback, ori_errback=errback) 535 d.addErrback(self._errback, ori_errback=errback)
518 536
519 def menuLaunch(self, menu_type, path, data, security_limit, profile_key, callback=None, errback=None): 537 def params_register_app(self, xml, security_limit=-1, app='', callback=None, errback=None):
520 d = self.root.callRemote("menuLaunch", menu_type, path, data, security_limit, profile_key) 538 d = self.root.callRemote("params_register_app", xml, security_limit, app)
521 if callback is not None: 539 if callback is not None:
522 d.addCallback(callback) 540 d.addCallback(lambda __: callback())
523 if errback is None: 541 if errback is None:
524 d.addErrback(self._generic_errback) 542 d.addErrback(self._generic_errback)
525 else: 543 else:
526 d.addErrback(self._errback, ori_errback=errback) 544 d.addErrback(self._errback, ori_errback=errback)
527 545
528 def menusGet(self, language, security_limit, callback=None, errback=None): 546 def params_template_load(self, filename, callback=None, errback=None):
529 d = self.root.callRemote("menusGet", language, security_limit) 547 d = self.root.callRemote("params_template_load", filename)
530 if callback is not None: 548 if callback is not None:
531 d.addCallback(callback) 549 d.addCallback(callback)
532 if errback is None: 550 if errback is None:
533 d.addErrback(self._generic_errback) 551 d.addErrback(self._generic_errback)
534 else: 552 else:
535 d.addErrback(self._errback, ori_errback=errback) 553 d.addErrback(self._errback, ori_errback=errback)
536 554
537 def messageEncryptionGet(self, to_jid, profile_key, callback=None, errback=None): 555 def params_template_save(self, filename, callback=None, errback=None):
538 d = self.root.callRemote("messageEncryptionGet", to_jid, profile_key) 556 d = self.root.callRemote("params_template_save", filename)
539 if callback is not None: 557 if callback is not None:
540 d.addCallback(callback) 558 d.addCallback(callback)
541 if errback is None: 559 if errback is None:
542 d.addErrback(self._generic_errback) 560 d.addErrback(self._generic_errback)
543 else: 561 else:
544 d.addErrback(self._errback, ori_errback=errback) 562 d.addErrback(self._errback, ori_errback=errback)
545 563
546 def messageEncryptionStart(self, to_jid, namespace='', replace=False, profile_key="@NONE@", callback=None, errback=None): 564 def params_values_from_category_get_async(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@", callback=None, errback=None):
547 d = self.root.callRemote("messageEncryptionStart", to_jid, namespace, replace, profile_key) 565 d = self.root.callRemote("params_values_from_category_get_async", category, security_limit, app, extra, profile_key)
548 if callback is not None: 566 if callback is not None:
549 d.addCallback(lambda __: callback()) 567 d.addCallback(callback)
550 if errback is None: 568 if errback is None:
551 d.addErrback(self._generic_errback) 569 d.addErrback(self._generic_errback)
552 else: 570 else:
553 d.addErrback(self._errback, ori_errback=errback) 571 d.addErrback(self._errback, ori_errback=errback)
554 572
555 def messageEncryptionStop(self, to_jid, profile_key, callback=None, errback=None): 573 def presence_set(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@", callback=None, errback=None):
556 d = self.root.callRemote("messageEncryptionStop", to_jid, profile_key) 574 d = self.root.callRemote("presence_set", to_jid, show, statuses, profile_key)
557 if callback is not None: 575 if callback is not None:
558 d.addCallback(lambda __: callback()) 576 d.addCallback(lambda __: callback())
559 if errback is None: 577 if errback is None:
560 d.addErrback(self._generic_errback) 578 d.addErrback(self._generic_errback)
561 else: 579 else:
562 d.addErrback(self._errback, ori_errback=errback) 580 d.addErrback(self._errback, ori_errback=errback)
563 581
564 def messageSend(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None): 582 def presence_statuses_get(self, profile_key="@DEFAULT@", callback=None, errback=None):
565 d = self.root.callRemote("messageSend", to_jid, message, subject, mess_type, extra, profile_key) 583 d = self.root.callRemote("presence_statuses_get", profile_key)
566 if callback is not None: 584 if callback is not None:
567 d.addCallback(lambda __: callback()) 585 d.addCallback(callback)
568 if errback is None: 586 if errback is None:
569 d.addErrback(self._generic_errback) 587 d.addErrback(self._generic_errback)
570 else: 588 else:
571 d.addErrback(self._errback, ori_errback=errback) 589 d.addErrback(self._errback, ori_errback=errback)
572 590
573 def namespacesGet(self, callback=None, errback=None): 591 def private_data_delete(self, namespace, key, arg_2, callback=None, errback=None):
574 d = self.root.callRemote("namespacesGet") 592 d = self.root.callRemote("private_data_delete", namespace, key, arg_2)
575 if callback is not None: 593 if callback is not None:
576 d.addCallback(callback) 594 d.addCallback(lambda __: callback())
577 if errback is None: 595 if errback is None:
578 d.addErrback(self._generic_errback) 596 d.addErrback(self._generic_errback)
579 else: 597 else:
580 d.addErrback(self._errback, ori_errback=errback) 598 d.addErrback(self._errback, ori_errback=errback)
581 599
582 def paramsRegisterApp(self, xml, security_limit=-1, app='', callback=None, errback=None): 600 def private_data_get(self, namespace, key, profile_key, callback=None, errback=None):
583 d = self.root.callRemote("paramsRegisterApp", xml, security_limit, app) 601 d = self.root.callRemote("private_data_get", namespace, key, profile_key)
584 if callback is not None: 602 if callback is not None:
585 d.addCallback(lambda __: callback()) 603 d.addCallback(callback)
586 if errback is None: 604 if errback is None:
587 d.addErrback(self._generic_errback) 605 d.addErrback(self._generic_errback)
588 else: 606 else:
589 d.addErrback(self._errback, ori_errback=errback) 607 d.addErrback(self._errback, ori_errback=errback)
590 608
591 def privateDataDelete(self, namespace, key, arg_2, callback=None, errback=None): 609 def private_data_set(self, namespace, key, data, profile_key, callback=None, errback=None):
592 d = self.root.callRemote("privateDataDelete", namespace, key, arg_2) 610 d = self.root.callRemote("private_data_set", namespace, key, data, profile_key)
593 if callback is not None: 611 if callback is not None:
594 d.addCallback(lambda __: callback()) 612 d.addCallback(lambda __: callback())
595 if errback is None: 613 if errback is None:
596 d.addErrback(self._generic_errback) 614 d.addErrback(self._generic_errback)
597 else: 615 else:
598 d.addErrback(self._errback, ori_errback=errback) 616 d.addErrback(self._errback, ori_errback=errback)
599 617
600 def privateDataGet(self, namespace, key, profile_key, callback=None, errback=None): 618 def profile_create(self, profile, password='', component='', callback=None, errback=None):
601 d = self.root.callRemote("privateDataGet", namespace, key, profile_key) 619 d = self.root.callRemote("profile_create", profile, password, component)
602 if callback is not None: 620 if callback is not None:
603 d.addCallback(callback) 621 d.addCallback(lambda __: callback())
604 if errback is None: 622 if errback is None:
605 d.addErrback(self._generic_errback) 623 d.addErrback(self._generic_errback)
606 else: 624 else:
607 d.addErrback(self._errback, ori_errback=errback) 625 d.addErrback(self._errback, ori_errback=errback)
608 626
609 def privateDataSet(self, namespace, key, data, profile_key, callback=None, errback=None): 627 def profile_delete_async(self, profile, callback=None, errback=None):
610 d = self.root.callRemote("privateDataSet", namespace, key, data, profile_key) 628 d = self.root.callRemote("profile_delete_async", profile)
611 if callback is not None: 629 if callback is not None:
612 d.addCallback(lambda __: callback()) 630 d.addCallback(lambda __: callback())
613 if errback is None: 631 if errback is None:
614 d.addErrback(self._generic_errback) 632 d.addErrback(self._generic_errback)
615 else: 633 else:
616 d.addErrback(self._errback, ori_errback=errback) 634 d.addErrback(self._errback, ori_errback=errback)
617 635
618 def profileCreate(self, profile, password='', component='', callback=None, errback=None): 636 def profile_is_session_started(self, profile_key="@DEFAULT@", callback=None, errback=None):
619 d = self.root.callRemote("profileCreate", profile, password, component) 637 d = self.root.callRemote("profile_is_session_started", profile_key)
620 if callback is not None: 638 if callback is not None:
621 d.addCallback(lambda __: callback()) 639 d.addCallback(callback)
622 if errback is None: 640 if errback is None:
623 d.addErrback(self._generic_errback) 641 d.addErrback(self._generic_errback)
624 else: 642 else:
625 d.addErrback(self._errback, ori_errback=errback) 643 d.addErrback(self._errback, ori_errback=errback)
626 644
627 def profileIsSessionStarted(self, profile_key="@DEFAULT@", callback=None, errback=None): 645 def profile_name_get(self, profile_key="@DEFAULT@", callback=None, errback=None):
628 d = self.root.callRemote("profileIsSessionStarted", profile_key) 646 d = self.root.callRemote("profile_name_get", profile_key)
629 if callback is not None: 647 if callback is not None:
630 d.addCallback(callback) 648 d.addCallback(callback)
631 if errback is None: 649 if errback is None:
632 d.addErrback(self._generic_errback) 650 d.addErrback(self._generic_errback)
633 else: 651 else:
634 d.addErrback(self._errback, ori_errback=errback) 652 d.addErrback(self._errback, ori_errback=errback)
635 653
636 def profileNameGet(self, profile_key="@DEFAULT@", callback=None, errback=None): 654 def profile_set_default(self, profile, callback=None, errback=None):
637 d = self.root.callRemote("profileNameGet", profile_key) 655 d = self.root.callRemote("profile_set_default", profile)
638 if callback is not None: 656 if callback is not None:
639 d.addCallback(callback) 657 d.addCallback(lambda __: callback())
640 if errback is None: 658 if errback is None:
641 d.addErrback(self._generic_errback) 659 d.addErrback(self._generic_errback)
642 else: 660 else:
643 d.addErrback(self._errback, ori_errback=errback) 661 d.addErrback(self._errback, ori_errback=errback)
644 662
645 def profileSetDefault(self, profile, callback=None, errback=None): 663 def profile_start_session(self, password='', profile_key="@DEFAULT@", callback=None, errback=None):
646 d = self.root.callRemote("profileSetDefault", profile) 664 d = self.root.callRemote("profile_start_session", password, profile_key)
647 if callback is not None: 665 if callback is not None:
648 d.addCallback(lambda __: callback()) 666 d.addCallback(callback)
649 if errback is None: 667 if errback is None:
650 d.addErrback(self._generic_errback) 668 d.addErrback(self._generic_errback)
651 else: 669 else:
652 d.addErrback(self._errback, ori_errback=errback) 670 d.addErrback(self._errback, ori_errback=errback)
653 671
654 def profileStartSession(self, password='', profile_key="@DEFAULT@", callback=None, errback=None): 672 def profiles_list_get(self, clients=True, components=False, callback=None, errback=None):
655 d = self.root.callRemote("profileStartSession", password, profile_key) 673 d = self.root.callRemote("profiles_list_get", clients, components)
656 if callback is not None: 674 if callback is not None:
657 d.addCallback(callback) 675 d.addCallback(callback)
658 if errback is None: 676 if errback is None:
659 d.addErrback(self._generic_errback) 677 d.addErrback(self._generic_errback)
660 else: 678 else:
661 d.addErrback(self._errback, ori_errback=errback) 679 d.addErrback(self._errback, ori_errback=errback)
662 680
663 def profilesListGet(self, clients=True, components=False, callback=None, errback=None): 681 def progress_get(self, id, profile, callback=None, errback=None):
664 d = self.root.callRemote("profilesListGet", clients, components) 682 d = self.root.callRemote("progress_get", id, profile)
665 if callback is not None: 683 if callback is not None:
666 d.addCallback(callback) 684 d.addCallback(callback)
667 if errback is None: 685 if errback is None:
668 d.addErrback(self._generic_errback) 686 d.addErrback(self._generic_errback)
669 else: 687 else:
670 d.addErrback(self._errback, ori_errback=errback) 688 d.addErrback(self._errback, ori_errback=errback)
671 689
672 def progressGet(self, id, profile, callback=None, errback=None): 690 def progress_get_all(self, profile, callback=None, errback=None):
673 d = self.root.callRemote("progressGet", id, profile) 691 d = self.root.callRemote("progress_get_all", profile)
674 if callback is not None: 692 if callback is not None:
675 d.addCallback(callback) 693 d.addCallback(callback)
676 if errback is None: 694 if errback is None:
677 d.addErrback(self._generic_errback) 695 d.addErrback(self._generic_errback)
678 else: 696 else:
679 d.addErrback(self._errback, ori_errback=errback) 697 d.addErrback(self._errback, ori_errback=errback)
680 698
681 def progressGetAll(self, profile, callback=None, errback=None): 699 def progress_get_all_metadata(self, profile, callback=None, errback=None):
682 d = self.root.callRemote("progressGetAll", profile) 700 d = self.root.callRemote("progress_get_all_metadata", profile)
683 if callback is not None: 701 if callback is not None:
684 d.addCallback(callback) 702 d.addCallback(callback)
685 if errback is None: 703 if errback is None:
686 d.addErrback(self._generic_errback) 704 d.addErrback(self._generic_errback)
687 else: 705 else:
688 d.addErrback(self._errback, ori_errback=errback) 706 d.addErrback(self._errback, ori_errback=errback)
689 707
690 def progressGetAllMetadata(self, profile, callback=None, errback=None): 708 def ready_get(self, callback=None, errback=None):
691 d = self.root.callRemote("progressGetAllMetadata", profile) 709 d = self.root.callRemote("ready_get")
692 if callback is not None: 710 if callback is not None:
693 d.addCallback(callback) 711 d.addCallback(lambda __: callback())
694 if errback is None: 712 if errback is None:
695 d.addErrback(self._generic_errback) 713 d.addErrback(self._generic_errback)
696 else: 714 else:
697 d.addErrback(self._errback, ori_errback=errback) 715 d.addErrback(self._errback, ori_errback=errback)
698 716
699 def rosterResync(self, profile_key="@DEFAULT@", callback=None, errback=None): 717 def roster_resync(self, profile_key="@DEFAULT@", callback=None, errback=None):
700 d = self.root.callRemote("rosterResync", profile_key) 718 d = self.root.callRemote("roster_resync", profile_key)
701 if callback is not None: 719 if callback is not None:
702 d.addCallback(lambda __: callback()) 720 d.addCallback(lambda __: callback())
703 if errback is None: 721 if errback is None:
704 d.addErrback(self._generic_errback) 722 d.addErrback(self._generic_errback)
705 else: 723 else:
706 d.addErrback(self._errback, ori_errback=errback) 724 d.addErrback(self._errback, ori_errback=errback)
707 725
708 def saveParamsTemplate(self, filename, callback=None, errback=None): 726 def session_infos_get(self, profile_key, callback=None, errback=None):
709 d = self.root.callRemote("saveParamsTemplate", filename) 727 d = self.root.callRemote("session_infos_get", profile_key)
710 if callback is not None: 728 if callback is not None:
711 d.addCallback(callback) 729 d.addCallback(callback)
712 if errback is None: 730 if errback is None:
713 d.addErrback(self._generic_errback) 731 d.addErrback(self._generic_errback)
714 else: 732 else:
715 d.addErrback(self._errback, ori_errback=errback) 733 d.addErrback(self._errback, ori_errback=errback)
716 734
717 def sessionInfosGet(self, profile_key, callback=None, errback=None): 735 def sub_waiting_get(self, profile_key="@DEFAULT@", callback=None, errback=None):
718 d = self.root.callRemote("sessionInfosGet", profile_key) 736 d = self.root.callRemote("sub_waiting_get", profile_key)
719 if callback is not None: 737 if callback is not None:
720 d.addCallback(callback) 738 d.addCallback(callback)
721 if errback is None:
722 d.addErrback(self._generic_errback)
723 else:
724 d.addErrback(self._errback, ori_errback=errback)
725
726 def setParam(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None):
727 d = self.root.callRemote("setParam", name, value, category, security_limit, profile_key)
728 if callback is not None:
729 d.addCallback(lambda __: callback())
730 if errback is None:
731 d.addErrback(self._generic_errback)
732 else:
733 d.addErrback(self._errback, ori_errback=errback)
734
735 def setPresence(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@", callback=None, errback=None):
736 d = self.root.callRemote("setPresence", to_jid, show, statuses, profile_key)
737 if callback is not None:
738 d.addCallback(lambda __: callback())
739 if errback is None: 739 if errback is None:
740 d.addErrback(self._generic_errback) 740 d.addErrback(self._generic_errback)
741 else: 741 else:
742 d.addErrback(self._errback, ori_errback=errback) 742 d.addErrback(self._errback, ori_errback=errback)
743 743
748 if errback is None: 748 if errback is None:
749 d.addErrback(self._generic_errback) 749 d.addErrback(self._generic_errback)
750 else: 750 else:
751 d.addErrback(self._errback, ori_errback=errback) 751 d.addErrback(self._errback, ori_errback=errback)
752 752
753 def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@", callback=None, errback=None): 753 def version_get(self, callback=None, errback=None):
754 d = self.root.callRemote("updateContact", entity_jid, name, groups, profile_key) 754 d = self.root.callRemote("version_get")
755 if callback is not None: 755 if callback is not None:
756 d.addCallback(lambda __: callback()) 756 d.addCallback(callback)
757 if errback is None: 757 if errback is None:
758 d.addErrback(self._generic_errback) 758 d.addErrback(self._generic_errback)
759 else: 759 else:
760 d.addErrback(self._errback, ori_errback=errback) 760 d.addErrback(self._errback, ori_errback=errback)
761 761
766 async_handler = lambda *args, **kwargs: defer.Deferred.fromFuture( 766 async_handler = lambda *args, **kwargs: defer.Deferred.fromFuture(
767 asyncio.ensure_future(handler(*args, **kwargs))) 767 asyncio.ensure_future(handler(*args, **kwargs)))
768 return super().register_signal(name, async_handler, iface) 768 return super().register_signal(name, async_handler, iface)
769 769
770 770
771 class AIOBridge(Bridge): 771 class AIOBridge(bridge):
772 772
773 def __init__(self): 773 def __init__(self):
774 self.signals_handler = AIOSignalsHandler() 774 self.signals_handler = AIOSignalsHandler()
775 775
776 def _errback(self, failure_): 776 def _errback(self, failure_):
783 def call(self, name, *args, **kwargs): 783 def call(self, name, *args, **kwargs):
784 d = self.root.callRemote(name, *args, *kwargs) 784 d = self.root.callRemote(name, *args, *kwargs)
785 d.addErrback(self._errback) 785 d.addErrback(self._errback)
786 return d.asFuture(asyncio.get_event_loop()) 786 return d.asFuture(asyncio.get_event_loop())
787 787
788 async def bridgeConnect(self): 788 async def bridge_connect(self):
789 d = super().bridgeConnect(callback=None, errback=None) 789 d = super().bridge_connect(callback=None, errback=None)
790 return await d.asFuture(asyncio.get_event_loop()) 790 return await d.asFuture(asyncio.get_event_loop())
791 791
792 def actionsGet(self, profile_key="@DEFAULT@"): 792 def action_launch(self, callback_id, data, profile_key="@DEFAULT@"):
793 d = self.root.callRemote("actionsGet", profile_key) 793 d = self.root.callRemote("action_launch", callback_id, data, profile_key)
794 d.addErrback(self._errback) 794 d.addErrback(self._errback)
795 return d.asFuture(asyncio.get_event_loop()) 795 return d.asFuture(asyncio.get_event_loop())
796 796
797 def addContact(self, entity_jid, profile_key="@DEFAULT@"): 797 def actions_get(self, profile_key="@DEFAULT@"):
798 d = self.root.callRemote("addContact", entity_jid, profile_key) 798 d = self.root.callRemote("actions_get", profile_key)
799 d.addErrback(self._errback) 799 d.addErrback(self._errback)
800 return d.asFuture(asyncio.get_event_loop()) 800 return d.asFuture(asyncio.get_event_loop())
801 801
802 def asyncDeleteProfile(self, profile): 802 def config_get(self, section, name):
803 d = self.root.callRemote("asyncDeleteProfile", profile) 803 d = self.root.callRemote("config_get", section, name)
804 d.addErrback(self._errback)
805 return d.asFuture(asyncio.get_event_loop())
806
807 def asyncGetParamA(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@"):
808 d = self.root.callRemote("asyncGetParamA", name, category, attribute, security_limit, profile_key)
809 d.addErrback(self._errback)
810 return d.asFuture(asyncio.get_event_loop())
811
812 def asyncGetParamsValuesFromCategory(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@"):
813 d = self.root.callRemote("asyncGetParamsValuesFromCategory", category, security_limit, app, extra, profile_key)
814 d.addErrback(self._errback) 804 d.addErrback(self._errback)
815 return d.asFuture(asyncio.get_event_loop()) 805 return d.asFuture(asyncio.get_event_loop())
816 806
817 def connect(self, profile_key="@DEFAULT@", password='', options={}): 807 def connect(self, profile_key="@DEFAULT@", password='', options={}):
818 d = self.root.callRemote("connect", profile_key, password, options) 808 d = self.root.callRemote("connect", profile_key, password, options)
819 d.addErrback(self._errback) 809 d.addErrback(self._errback)
820 return d.asFuture(asyncio.get_event_loop()) 810 return d.asFuture(asyncio.get_event_loop())
821 811
822 def contactGet(self, arg_0, profile_key="@DEFAULT@"): 812 def contact_add(self, entity_jid, profile_key="@DEFAULT@"):
823 d = self.root.callRemote("contactGet", arg_0, profile_key) 813 d = self.root.callRemote("contact_add", entity_jid, profile_key)
824 d.addErrback(self._errback) 814 d.addErrback(self._errback)
825 return d.asFuture(asyncio.get_event_loop()) 815 return d.asFuture(asyncio.get_event_loop())
826 816
827 def delContact(self, entity_jid, profile_key="@DEFAULT@"): 817 def contact_del(self, entity_jid, profile_key="@DEFAULT@"):
828 d = self.root.callRemote("delContact", entity_jid, profile_key) 818 d = self.root.callRemote("contact_del", entity_jid, profile_key)
829 d.addErrback(self._errback) 819 d.addErrback(self._errback)
830 return d.asFuture(asyncio.get_event_loop()) 820 return d.asFuture(asyncio.get_event_loop())
831 821
832 def devicesInfosGet(self, bare_jid, profile_key): 822 def contact_get(self, arg_0, profile_key="@DEFAULT@"):
833 d = self.root.callRemote("devicesInfosGet", bare_jid, profile_key) 823 d = self.root.callRemote("contact_get", arg_0, profile_key)
834 d.addErrback(self._errback) 824 d.addErrback(self._errback)
835 return d.asFuture(asyncio.get_event_loop()) 825 return d.asFuture(asyncio.get_event_loop())
836 826
837 def discoFindByFeatures(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key="@DEFAULT@"): 827 def contact_update(self, entity_jid, name, groups, profile_key="@DEFAULT@"):
838 d = self.root.callRemote("discoFindByFeatures", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key) 828 d = self.root.callRemote("contact_update", entity_jid, name, groups, profile_key)
839 d.addErrback(self._errback) 829 d.addErrback(self._errback)
840 return d.asFuture(asyncio.get_event_loop()) 830 return d.asFuture(asyncio.get_event_loop())
841 831
842 def discoInfos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): 832 def contacts_get(self, profile_key="@DEFAULT@"):
843 d = self.root.callRemote("discoInfos", entity_jid, node, use_cache, profile_key) 833 d = self.root.callRemote("contacts_get", profile_key)
844 d.addErrback(self._errback) 834 d.addErrback(self._errback)
845 return d.asFuture(asyncio.get_event_loop()) 835 return d.asFuture(asyncio.get_event_loop())
846 836
847 def discoItems(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): 837 def contacts_get_from_group(self, group, profile_key="@DEFAULT@"):
848 d = self.root.callRemote("discoItems", entity_jid, node, use_cache, profile_key) 838 d = self.root.callRemote("contacts_get_from_group", group, profile_key)
839 d.addErrback(self._errback)
840 return d.asFuture(asyncio.get_event_loop())
841
842 def devices_infos_get(self, bare_jid, profile_key):
843 d = self.root.callRemote("devices_infos_get", bare_jid, profile_key)
844 d.addErrback(self._errback)
845 return d.asFuture(asyncio.get_event_loop())
846
847 def disco_find_by_features(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key="@DEFAULT@"):
848 d = self.root.callRemote("disco_find_by_features", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key)
849 d.addErrback(self._errback)
850 return d.asFuture(asyncio.get_event_loop())
851
852 def disco_infos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"):
853 d = self.root.callRemote("disco_infos", entity_jid, node, use_cache, profile_key)
854 d.addErrback(self._errback)
855 return d.asFuture(asyncio.get_event_loop())
856
857 def disco_items(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"):
858 d = self.root.callRemote("disco_items", entity_jid, node, use_cache, profile_key)
849 d.addErrback(self._errback) 859 d.addErrback(self._errback)
850 return d.asFuture(asyncio.get_event_loop()) 860 return d.asFuture(asyncio.get_event_loop())
851 861
852 def disconnect(self, profile_key="@DEFAULT@"): 862 def disconnect(self, profile_key="@DEFAULT@"):
853 d = self.root.callRemote("disconnect", profile_key) 863 d = self.root.callRemote("disconnect", profile_key)
854 d.addErrback(self._errback) 864 d.addErrback(self._errback)
855 return d.asFuture(asyncio.get_event_loop()) 865 return d.asFuture(asyncio.get_event_loop())
856 866
857 def encryptionNamespaceGet(self, arg_0): 867 def encryption_namespace_get(self, arg_0):
858 d = self.root.callRemote("encryptionNamespaceGet", arg_0) 868 d = self.root.callRemote("encryption_namespace_get", arg_0)
859 d.addErrback(self._errback) 869 d.addErrback(self._errback)
860 return d.asFuture(asyncio.get_event_loop()) 870 return d.asFuture(asyncio.get_event_loop())
861 871
862 def encryptionPluginsGet(self): 872 def encryption_plugins_get(self):
863 d = self.root.callRemote("encryptionPluginsGet") 873 d = self.root.callRemote("encryption_plugins_get")
864 d.addErrback(self._errback) 874 d.addErrback(self._errback)
865 return d.asFuture(asyncio.get_event_loop()) 875 return d.asFuture(asyncio.get_event_loop())
866 876
867 def encryptionTrustUIGet(self, to_jid, namespace, profile_key): 877 def encryption_trust_ui_get(self, to_jid, namespace, profile_key):
868 d = self.root.callRemote("encryptionTrustUIGet", to_jid, namespace, profile_key) 878 d = self.root.callRemote("encryption_trust_ui_get", to_jid, namespace, profile_key)
869 d.addErrback(self._errback) 879 d.addErrback(self._errback)
870 return d.asFuture(asyncio.get_event_loop()) 880 return d.asFuture(asyncio.get_event_loop())
871 881
872 def getConfig(self, section, name): 882 def entities_data_get(self, jids, keys, profile):
873 d = self.root.callRemote("getConfig", section, name) 883 d = self.root.callRemote("entities_data_get", jids, keys, profile)
874 d.addErrback(self._errback) 884 d.addErrback(self._errback)
875 return d.asFuture(asyncio.get_event_loop()) 885 return d.asFuture(asyncio.get_event_loop())
876 886
877 def getContacts(self, profile_key="@DEFAULT@"): 887 def entity_data_get(self, jid, keys, profile):
878 d = self.root.callRemote("getContacts", profile_key) 888 d = self.root.callRemote("entity_data_get", jid, keys, profile)
879 d.addErrback(self._errback) 889 d.addErrback(self._errback)
880 return d.asFuture(asyncio.get_event_loop()) 890 return d.asFuture(asyncio.get_event_loop())
881 891
882 def getContactsFromGroup(self, group, profile_key="@DEFAULT@"): 892 def features_get(self, profile_key):
883 d = self.root.callRemote("getContactsFromGroup", group, profile_key) 893 d = self.root.callRemote("features_get", profile_key)
884 d.addErrback(self._errback) 894 d.addErrback(self._errback)
885 return d.asFuture(asyncio.get_event_loop()) 895 return d.asFuture(asyncio.get_event_loop())
886 896
887 def getEntitiesData(self, jids, keys, profile): 897 def history_get(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@"):
888 d = self.root.callRemote("getEntitiesData", jids, keys, profile) 898 d = self.root.callRemote("history_get", from_jid, to_jid, limit, between, filters, profile)
889 d.addErrback(self._errback) 899 d.addErrback(self._errback)
890 return d.asFuture(asyncio.get_event_loop()) 900 return d.asFuture(asyncio.get_event_loop())
891 901
892 def getEntityData(self, jid, keys, profile): 902 def image_check(self, arg_0):
893 d = self.root.callRemote("getEntityData", jid, keys, profile) 903 d = self.root.callRemote("image_check", arg_0)
894 d.addErrback(self._errback) 904 d.addErrback(self._errback)
895 return d.asFuture(asyncio.get_event_loop()) 905 return d.asFuture(asyncio.get_event_loop())
896 906
897 def getFeatures(self, profile_key): 907 def image_convert(self, source, dest, arg_2, extra):
898 d = self.root.callRemote("getFeatures", profile_key) 908 d = self.root.callRemote("image_convert", source, dest, arg_2, extra)
899 d.addErrback(self._errback) 909 d.addErrback(self._errback)
900 return d.asFuture(asyncio.get_event_loop()) 910 return d.asFuture(asyncio.get_event_loop())
901 911
902 def getMainResource(self, contact_jid, profile_key="@DEFAULT@"): 912 def image_generate_preview(self, image_path, profile_key):
903 d = self.root.callRemote("getMainResource", contact_jid, profile_key) 913 d = self.root.callRemote("image_generate_preview", image_path, profile_key)
904 d.addErrback(self._errback) 914 d.addErrback(self._errback)
905 return d.asFuture(asyncio.get_event_loop()) 915 return d.asFuture(asyncio.get_event_loop())
906 916
907 def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"): 917 def image_resize(self, image_path, width, height):
908 d = self.root.callRemote("getParamA", name, category, attribute, profile_key) 918 d = self.root.callRemote("image_resize", image_path, width, height)
909 d.addErrback(self._errback) 919 d.addErrback(self._errback)
910 return d.asFuture(asyncio.get_event_loop()) 920 return d.asFuture(asyncio.get_event_loop())
911 921
912 def getParamsCategories(self): 922 def is_connected(self, profile_key="@DEFAULT@"):
913 d = self.root.callRemote("getParamsCategories") 923 d = self.root.callRemote("is_connected", profile_key)
914 d.addErrback(self._errback) 924 d.addErrback(self._errback)
915 return d.asFuture(asyncio.get_event_loop()) 925 return d.asFuture(asyncio.get_event_loop())
916 926
917 def getParamsUI(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@"): 927 def main_resource_get(self, contact_jid, profile_key="@DEFAULT@"):
918 d = self.root.callRemote("getParamsUI", security_limit, app, extra, profile_key) 928 d = self.root.callRemote("main_resource_get", contact_jid, profile_key)
919 d.addErrback(self._errback) 929 d.addErrback(self._errback)
920 return d.asFuture(asyncio.get_event_loop()) 930 return d.asFuture(asyncio.get_event_loop())
921 931
922 def getPresenceStatuses(self, profile_key="@DEFAULT@"): 932 def menu_help_get(self, menu_id, language):
923 d = self.root.callRemote("getPresenceStatuses", profile_key) 933 d = self.root.callRemote("menu_help_get", menu_id, language)
924 d.addErrback(self._errback) 934 d.addErrback(self._errback)
925 return d.asFuture(asyncio.get_event_loop()) 935 return d.asFuture(asyncio.get_event_loop())
926 936
927 def getReady(self): 937 def menu_launch(self, menu_type, path, data, security_limit, profile_key):
928 d = self.root.callRemote("getReady") 938 d = self.root.callRemote("menu_launch", menu_type, path, data, security_limit, profile_key)
929 d.addErrback(self._errback) 939 d.addErrback(self._errback)
930 return d.asFuture(asyncio.get_event_loop()) 940 return d.asFuture(asyncio.get_event_loop())
931 941
932 def getVersion(self): 942 def menus_get(self, language, security_limit):
933 d = self.root.callRemote("getVersion") 943 d = self.root.callRemote("menus_get", language, security_limit)
934 d.addErrback(self._errback) 944 d.addErrback(self._errback)
935 return d.asFuture(asyncio.get_event_loop()) 945 return d.asFuture(asyncio.get_event_loop())
936 946
937 def getWaitingSub(self, profile_key="@DEFAULT@"): 947 def message_encryption_get(self, to_jid, profile_key):
938 d = self.root.callRemote("getWaitingSub", profile_key) 948 d = self.root.callRemote("message_encryption_get", to_jid, profile_key)
939 d.addErrback(self._errback) 949 d.addErrback(self._errback)
940 return d.asFuture(asyncio.get_event_loop()) 950 return d.asFuture(asyncio.get_event_loop())
941 951
942 def historyGet(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@"): 952 def message_encryption_start(self, to_jid, namespace='', replace=False, profile_key="@NONE@"):
943 d = self.root.callRemote("historyGet", from_jid, to_jid, limit, between, filters, profile) 953 d = self.root.callRemote("message_encryption_start", to_jid, namespace, replace, profile_key)
944 d.addErrback(self._errback) 954 d.addErrback(self._errback)
945 return d.asFuture(asyncio.get_event_loop()) 955 return d.asFuture(asyncio.get_event_loop())
946 956
947 def imageCheck(self, arg_0): 957 def message_encryption_stop(self, to_jid, profile_key):
948 d = self.root.callRemote("imageCheck", arg_0) 958 d = self.root.callRemote("message_encryption_stop", to_jid, profile_key)
949 d.addErrback(self._errback) 959 d.addErrback(self._errback)
950 return d.asFuture(asyncio.get_event_loop()) 960 return d.asFuture(asyncio.get_event_loop())
951 961
952 def imageConvert(self, source, dest, arg_2, extra): 962 def message_send(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@"):
953 d = self.root.callRemote("imageConvert", source, dest, arg_2, extra) 963 d = self.root.callRemote("message_send", to_jid, message, subject, mess_type, extra, profile_key)
954 d.addErrback(self._errback) 964 d.addErrback(self._errback)
955 return d.asFuture(asyncio.get_event_loop()) 965 return d.asFuture(asyncio.get_event_loop())
956 966
957 def imageGeneratePreview(self, image_path, profile_key): 967 def namespaces_get(self):
958 d = self.root.callRemote("imageGeneratePreview", image_path, profile_key) 968 d = self.root.callRemote("namespaces_get")
959 d.addErrback(self._errback) 969 d.addErrback(self._errback)
960 return d.asFuture(asyncio.get_event_loop()) 970 return d.asFuture(asyncio.get_event_loop())
961 971
962 def imageResize(self, image_path, width, height): 972 def param_get_a(self, name, category, attribute="value", profile_key="@DEFAULT@"):
963 d = self.root.callRemote("imageResize", image_path, width, height) 973 d = self.root.callRemote("param_get_a", name, category, attribute, profile_key)
964 d.addErrback(self._errback) 974 d.addErrback(self._errback)
965 return d.asFuture(asyncio.get_event_loop()) 975 return d.asFuture(asyncio.get_event_loop())
966 976
967 def isConnected(self, profile_key="@DEFAULT@"): 977 def param_get_a_async(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@"):
968 d = self.root.callRemote("isConnected", profile_key) 978 d = self.root.callRemote("param_get_a_async", name, category, attribute, security_limit, profile_key)
969 d.addErrback(self._errback) 979 d.addErrback(self._errback)
970 return d.asFuture(asyncio.get_event_loop()) 980 return d.asFuture(asyncio.get_event_loop())
971 981
972 def launchAction(self, callback_id, data, profile_key="@DEFAULT@"): 982 def param_set(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"):
973 d = self.root.callRemote("launchAction", callback_id, data, profile_key) 983 d = self.root.callRemote("param_set", name, value, category, security_limit, profile_key)
974 d.addErrback(self._errback) 984 d.addErrback(self._errback)
975 return d.asFuture(asyncio.get_event_loop()) 985 return d.asFuture(asyncio.get_event_loop())
976 986
977 def loadParamsTemplate(self, filename): 987 def param_ui_get(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@"):
978 d = self.root.callRemote("loadParamsTemplate", filename) 988 d = self.root.callRemote("param_ui_get", security_limit, app, extra, profile_key)
979 d.addErrback(self._errback) 989 d.addErrback(self._errback)
980 return d.asFuture(asyncio.get_event_loop()) 990 return d.asFuture(asyncio.get_event_loop())
981 991
982 def menuHelpGet(self, menu_id, language): 992 def params_categories_get(self):
983 d = self.root.callRemote("menuHelpGet", menu_id, language) 993 d = self.root.callRemote("params_categories_get")
984 d.addErrback(self._errback) 994 d.addErrback(self._errback)
985 return d.asFuture(asyncio.get_event_loop()) 995 return d.asFuture(asyncio.get_event_loop())
986 996
987 def menuLaunch(self, menu_type, path, data, security_limit, profile_key): 997 def params_register_app(self, xml, security_limit=-1, app=''):
988 d = self.root.callRemote("menuLaunch", menu_type, path, data, security_limit, profile_key) 998 d = self.root.callRemote("params_register_app", xml, security_limit, app)
989 d.addErrback(self._errback) 999 d.addErrback(self._errback)
990 return d.asFuture(asyncio.get_event_loop()) 1000 return d.asFuture(asyncio.get_event_loop())
991 1001
992 def menusGet(self, language, security_limit): 1002 def params_template_load(self, filename):
993 d = self.root.callRemote("menusGet", language, security_limit) 1003 d = self.root.callRemote("params_template_load", filename)
994 d.addErrback(self._errback) 1004 d.addErrback(self._errback)
995 return d.asFuture(asyncio.get_event_loop()) 1005 return d.asFuture(asyncio.get_event_loop())
996 1006
997 def messageEncryptionGet(self, to_jid, profile_key): 1007 def params_template_save(self, filename):
998 d = self.root.callRemote("messageEncryptionGet", to_jid, profile_key) 1008 d = self.root.callRemote("params_template_save", filename)
999 d.addErrback(self._errback) 1009 d.addErrback(self._errback)
1000 return d.asFuture(asyncio.get_event_loop()) 1010 return d.asFuture(asyncio.get_event_loop())
1001 1011
1002 def messageEncryptionStart(self, to_jid, namespace='', replace=False, profile_key="@NONE@"): 1012 def params_values_from_category_get_async(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@"):
1003 d = self.root.callRemote("messageEncryptionStart", to_jid, namespace, replace, profile_key) 1013 d = self.root.callRemote("params_values_from_category_get_async", category, security_limit, app, extra, profile_key)
1004 d.addErrback(self._errback) 1014 d.addErrback(self._errback)
1005 return d.asFuture(asyncio.get_event_loop()) 1015 return d.asFuture(asyncio.get_event_loop())
1006 1016
1007 def messageEncryptionStop(self, to_jid, profile_key): 1017 def presence_set(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@"):
1008 d = self.root.callRemote("messageEncryptionStop", to_jid, profile_key) 1018 d = self.root.callRemote("presence_set", to_jid, show, statuses, profile_key)
1009 d.addErrback(self._errback) 1019 d.addErrback(self._errback)
1010 return d.asFuture(asyncio.get_event_loop()) 1020 return d.asFuture(asyncio.get_event_loop())
1011 1021
1012 def messageSend(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@"): 1022 def presence_statuses_get(self, profile_key="@DEFAULT@"):
1013 d = self.root.callRemote("messageSend", to_jid, message, subject, mess_type, extra, profile_key) 1023 d = self.root.callRemote("presence_statuses_get", profile_key)
1014 d.addErrback(self._errback) 1024 d.addErrback(self._errback)
1015 return d.asFuture(asyncio.get_event_loop()) 1025 return d.asFuture(asyncio.get_event_loop())
1016 1026
1017 def namespacesGet(self): 1027 def private_data_delete(self, namespace, key, arg_2):
1018 d = self.root.callRemote("namespacesGet") 1028 d = self.root.callRemote("private_data_delete", namespace, key, arg_2)
1019 d.addErrback(self._errback) 1029 d.addErrback(self._errback)
1020 return d.asFuture(asyncio.get_event_loop()) 1030 return d.asFuture(asyncio.get_event_loop())
1021 1031
1022 def paramsRegisterApp(self, xml, security_limit=-1, app=''): 1032 def private_data_get(self, namespace, key, profile_key):
1023 d = self.root.callRemote("paramsRegisterApp", xml, security_limit, app) 1033 d = self.root.callRemote("private_data_get", namespace, key, profile_key)
1024 d.addErrback(self._errback) 1034 d.addErrback(self._errback)
1025 return d.asFuture(asyncio.get_event_loop()) 1035 return d.asFuture(asyncio.get_event_loop())
1026 1036
1027 def privateDataDelete(self, namespace, key, arg_2): 1037 def private_data_set(self, namespace, key, data, profile_key):
1028 d = self.root.callRemote("privateDataDelete", namespace, key, arg_2) 1038 d = self.root.callRemote("private_data_set", namespace, key, data, profile_key)
1029 d.addErrback(self._errback) 1039 d.addErrback(self._errback)
1030 return d.asFuture(asyncio.get_event_loop()) 1040 return d.asFuture(asyncio.get_event_loop())
1031 1041
1032 def privateDataGet(self, namespace, key, profile_key): 1042 def profile_create(self, profile, password='', component=''):
1033 d = self.root.callRemote("privateDataGet", namespace, key, profile_key) 1043 d = self.root.callRemote("profile_create", profile, password, component)
1034 d.addErrback(self._errback) 1044 d.addErrback(self._errback)
1035 return d.asFuture(asyncio.get_event_loop()) 1045 return d.asFuture(asyncio.get_event_loop())
1036 1046
1037 def privateDataSet(self, namespace, key, data, profile_key): 1047 def profile_delete_async(self, profile):
1038 d = self.root.callRemote("privateDataSet", namespace, key, data, profile_key) 1048 d = self.root.callRemote("profile_delete_async", profile)
1039 d.addErrback(self._errback) 1049 d.addErrback(self._errback)
1040 return d.asFuture(asyncio.get_event_loop()) 1050 return d.asFuture(asyncio.get_event_loop())
1041 1051
1042 def profileCreate(self, profile, password='', component=''): 1052 def profile_is_session_started(self, profile_key="@DEFAULT@"):
1043 d = self.root.callRemote("profileCreate", profile, password, component) 1053 d = self.root.callRemote("profile_is_session_started", profile_key)
1044 d.addErrback(self._errback) 1054 d.addErrback(self._errback)
1045 return d.asFuture(asyncio.get_event_loop()) 1055 return d.asFuture(asyncio.get_event_loop())
1046 1056
1047 def profileIsSessionStarted(self, profile_key="@DEFAULT@"): 1057 def profile_name_get(self, profile_key="@DEFAULT@"):
1048 d = self.root.callRemote("profileIsSessionStarted", profile_key) 1058 d = self.root.callRemote("profile_name_get", profile_key)
1049 d.addErrback(self._errback) 1059 d.addErrback(self._errback)
1050 return d.asFuture(asyncio.get_event_loop()) 1060 return d.asFuture(asyncio.get_event_loop())
1051 1061
1052 def profileNameGet(self, profile_key="@DEFAULT@"): 1062 def profile_set_default(self, profile):
1053 d = self.root.callRemote("profileNameGet", profile_key) 1063 d = self.root.callRemote("profile_set_default", profile)
1054 d.addErrback(self._errback) 1064 d.addErrback(self._errback)
1055 return d.asFuture(asyncio.get_event_loop()) 1065 return d.asFuture(asyncio.get_event_loop())
1056 1066
1057 def profileSetDefault(self, profile): 1067 def profile_start_session(self, password='', profile_key="@DEFAULT@"):
1058 d = self.root.callRemote("profileSetDefault", profile) 1068 d = self.root.callRemote("profile_start_session", password, profile_key)
1059 d.addErrback(self._errback) 1069 d.addErrback(self._errback)
1060 return d.asFuture(asyncio.get_event_loop()) 1070 return d.asFuture(asyncio.get_event_loop())
1061 1071
1062 def profileStartSession(self, password='', profile_key="@DEFAULT@"): 1072 def profiles_list_get(self, clients=True, components=False):
1063 d = self.root.callRemote("profileStartSession", password, profile_key) 1073 d = self.root.callRemote("profiles_list_get", clients, components)
1064 d.addErrback(self._errback) 1074 d.addErrback(self._errback)
1065 return d.asFuture(asyncio.get_event_loop()) 1075 return d.asFuture(asyncio.get_event_loop())
1066 1076
1067 def profilesListGet(self, clients=True, components=False): 1077 def progress_get(self, id, profile):
1068 d = self.root.callRemote("profilesListGet", clients, components) 1078 d = self.root.callRemote("progress_get", id, profile)
1069 d.addErrback(self._errback) 1079 d.addErrback(self._errback)
1070 return d.asFuture(asyncio.get_event_loop()) 1080 return d.asFuture(asyncio.get_event_loop())
1071 1081
1072 def progressGet(self, id, profile): 1082 def progress_get_all(self, profile):
1073 d = self.root.callRemote("progressGet", id, profile) 1083 d = self.root.callRemote("progress_get_all", profile)
1074 d.addErrback(self._errback) 1084 d.addErrback(self._errback)
1075 return d.asFuture(asyncio.get_event_loop()) 1085 return d.asFuture(asyncio.get_event_loop())
1076 1086
1077 def progressGetAll(self, profile): 1087 def progress_get_all_metadata(self, profile):
1078 d = self.root.callRemote("progressGetAll", profile) 1088 d = self.root.callRemote("progress_get_all_metadata", profile)
1079 d.addErrback(self._errback) 1089 d.addErrback(self._errback)
1080 return d.asFuture(asyncio.get_event_loop()) 1090 return d.asFuture(asyncio.get_event_loop())
1081 1091
1082 def progressGetAllMetadata(self, profile): 1092 def ready_get(self):
1083 d = self.root.callRemote("progressGetAllMetadata", profile) 1093 d = self.root.callRemote("ready_get")
1084 d.addErrback(self._errback) 1094 d.addErrback(self._errback)
1085 return d.asFuture(asyncio.get_event_loop()) 1095 return d.asFuture(asyncio.get_event_loop())
1086 1096
1087 def rosterResync(self, profile_key="@DEFAULT@"): 1097 def roster_resync(self, profile_key="@DEFAULT@"):
1088 d = self.root.callRemote("rosterResync", profile_key) 1098 d = self.root.callRemote("roster_resync", profile_key)
1089 d.addErrback(self._errback) 1099 d.addErrback(self._errback)
1090 return d.asFuture(asyncio.get_event_loop()) 1100 return d.asFuture(asyncio.get_event_loop())
1091 1101
1092 def saveParamsTemplate(self, filename): 1102 def session_infos_get(self, profile_key):
1093 d = self.root.callRemote("saveParamsTemplate", filename) 1103 d = self.root.callRemote("session_infos_get", profile_key)
1094 d.addErrback(self._errback) 1104 d.addErrback(self._errback)
1095 return d.asFuture(asyncio.get_event_loop()) 1105 return d.asFuture(asyncio.get_event_loop())
1096 1106
1097 def sessionInfosGet(self, profile_key): 1107 def sub_waiting_get(self, profile_key="@DEFAULT@"):
1098 d = self.root.callRemote("sessionInfosGet", profile_key) 1108 d = self.root.callRemote("sub_waiting_get", profile_key)
1099 d.addErrback(self._errback)
1100 return d.asFuture(asyncio.get_event_loop())
1101
1102 def setParam(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"):
1103 d = self.root.callRemote("setParam", name, value, category, security_limit, profile_key)
1104 d.addErrback(self._errback)
1105 return d.asFuture(asyncio.get_event_loop())
1106
1107 def setPresence(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@"):
1108 d = self.root.callRemote("setPresence", to_jid, show, statuses, profile_key)
1109 d.addErrback(self._errback) 1109 d.addErrback(self._errback)
1110 return d.asFuture(asyncio.get_event_loop()) 1110 return d.asFuture(asyncio.get_event_loop())
1111 1111
1112 def subscription(self, sub_type, entity, profile_key="@DEFAULT@"): 1112 def subscription(self, sub_type, entity, profile_key="@DEFAULT@"):
1113 d = self.root.callRemote("subscription", sub_type, entity, profile_key) 1113 d = self.root.callRemote("subscription", sub_type, entity, profile_key)
1114 d.addErrback(self._errback) 1114 d.addErrback(self._errback)
1115 return d.asFuture(asyncio.get_event_loop()) 1115 return d.asFuture(asyncio.get_event_loop())
1116 1116
1117 def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@"): 1117 def version_get(self):
1118 d = self.root.callRemote("updateContact", entity_jid, name, groups, profile_key) 1118 d = self.root.callRemote("version_get")
1119 d.addErrback(self._errback) 1119 d.addErrback(self._errback)
1120 return d.asFuture(asyncio.get_event_loop()) 1120 return d.asFuture(asyncio.get_event_loop())