Mercurial > libervia-backend
diff 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 |
line wrap: on
line diff
--- a/sat_frontends/bridge/pb.py Fri Apr 07 15:18:39 2023 +0200 +++ b/sat_frontends/bridge/pb.py Sat Apr 08 13:54:42 2023 +0200 @@ -55,7 +55,7 @@ setattr(self, method_name, handler) -class Bridge(object): +class bridge(object): def __init__(self): self.signals_handler = SignalsHandler() @@ -75,7 +75,7 @@ ) ) - def remoteCallback(self, result, callback): + def remote_callback(self, result, callback): """call callback with argument or None if result is not None not argument is used, @@ -112,11 +112,11 @@ callback = args.pop() d = self.root.callRemote(name, *args, **kwargs) if callback is not None: - d.addCallback(self.remoteCallback, callback) + d.addCallback(self.remote_callback, callback) if errback is not None: d.addErrback(errback) - def _initBridgeEb(self, failure_): + def _init_bridge_eb(self, failure_): log.error("Can't init bridge: {msg}".format(msg=failure_)) return failure_ @@ -127,28 +127,28 @@ """ self.root = root d = root.callRemote("initBridge", self.signals_handler) - d.addErrback(self._initBridgeEb) + d.addErrback(self._init_bridge_eb) return d - def getRootObjectEb(self, failure_): + def get_root_object_eb(self, failure_): """Call errback with appropriate bridge error""" if failure_.check(ConnectionRefusedError, ConnectError): raise exceptions.BridgeExceptionNoService else: raise failure_ - def bridgeConnect(self, callback, errback): + def bridge_connect(self, callback, errback): factory = pb.PBClientFactory() - conf = config.parseMainConf() - getConf = partial(config.getConf, conf, "bridge_pb", "") - conn_type = getConf("connection_type", "unix_socket") + conf = config.parse_main_conf() + get_conf = partial(config.get_conf, conf, "bridge_pb", "") + conn_type = get_conf("connection_type", "unix_socket") if conn_type == "unix_socket": - local_dir = Path(config.getConfig(conf, "", "local_dir")).resolve() + local_dir = Path(config.config_get(conf, "", "local_dir")).resolve() socket_path = local_dir / "bridge_pb" reactor.connectUNIX(str(socket_path), factory) elif conn_type == "socket": - host = getConf("host", "localhost") - port = int(getConf("port", 8789)) + host = get_conf("host", "localhost") + port = int(get_conf("port", 8789)) reactor.connectTCP(host, port, factory) else: raise ValueError(f"Unknown pb connection type: {conn_type!r}") @@ -156,7 +156,7 @@ d.addCallback(self._set_root) if callback is not None: d.addCallback(lambda __: callback()) - d.addErrback(self.getRootObjectEb) + d.addErrback(self.get_root_object_eb) if errback is not None: d.addErrback(lambda failure_: errback(failure_.value)) return d @@ -165,8 +165,8 @@ self.signals_handler.register_signal(functionName, handler, iface) - def actionsGet(self, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("actionsGet", profile_key) + def action_launch(self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("action_launch", callback_id, data, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -174,26 +174,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def addContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("addContact", entity_jid, profile_key) - if callback is not None: - d.addCallback(lambda __: callback()) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def asyncDeleteProfile(self, profile, callback=None, errback=None): - d = self.root.callRemote("asyncDeleteProfile", profile) - if callback is not None: - d.addCallback(lambda __: callback()) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def asyncGetParamA(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("asyncGetParamA", name, category, attribute, security_limit, profile_key) + def actions_get(self, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("actions_get", profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -201,8 +183,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def asyncGetParamsValuesFromCategory(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("asyncGetParamsValuesFromCategory", category, security_limit, app, extra, profile_key) + def config_get(self, section, name, callback=None, errback=None): + d = self.root.callRemote("config_get", section, name) if callback is not None: d.addCallback(callback) if errback is None: @@ -219,8 +201,26 @@ else: d.addErrback(self._errback, ori_errback=errback) - def contactGet(self, arg_0, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("contactGet", arg_0, profile_key) + def contact_add(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("contact_add", entity_jid, profile_key) + if callback is not None: + d.addCallback(lambda __: callback()) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def contact_del(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("contact_del", entity_jid, profile_key) + if callback is not None: + d.addCallback(lambda __: callback()) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def contact_get(self, arg_0, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("contact_get", arg_0, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -228,8 +228,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("delContact", entity_jid, profile_key) + def contact_update(self, entity_jid, name, groups, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("contact_update", entity_jid, name, groups, profile_key) if callback is not None: d.addCallback(lambda __: callback()) if errback is None: @@ -237,8 +237,17 @@ else: d.addErrback(self._errback, ori_errback=errback) - def devicesInfosGet(self, bare_jid, profile_key, callback=None, errback=None): - d = self.root.callRemote("devicesInfosGet", bare_jid, profile_key) + def contacts_get(self, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("contacts_get", profile_key) + if callback is not None: + d.addCallback(callback) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def contacts_get_from_group(self, group, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("contacts_get_from_group", group, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -246,8 +255,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - 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): - d = self.root.callRemote("discoFindByFeatures", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key) + def devices_infos_get(self, bare_jid, profile_key, callback=None, errback=None): + d = self.root.callRemote("devices_infos_get", bare_jid, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -255,8 +264,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def discoInfos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("discoInfos", entity_jid, node, use_cache, profile_key) + 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): + d = self.root.callRemote("disco_find_by_features", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -264,8 +273,17 @@ else: d.addErrback(self._errback, ori_errback=errback) - def discoItems(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("discoItems", entity_jid, node, use_cache, profile_key) + def disco_infos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("disco_infos", entity_jid, node, use_cache, profile_key) + if callback is not None: + d.addCallback(callback) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def disco_items(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("disco_items", entity_jid, node, use_cache, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -282,8 +300,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def encryptionNamespaceGet(self, arg_0, callback=None, errback=None): - d = self.root.callRemote("encryptionNamespaceGet", arg_0) + def encryption_namespace_get(self, arg_0, callback=None, errback=None): + d = self.root.callRemote("encryption_namespace_get", arg_0) if callback is not None: d.addCallback(callback) if errback is None: @@ -291,8 +309,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def encryptionPluginsGet(self, callback=None, errback=None): - d = self.root.callRemote("encryptionPluginsGet") + def encryption_plugins_get(self, callback=None, errback=None): + d = self.root.callRemote("encryption_plugins_get") if callback is not None: d.addCallback(callback) if errback is None: @@ -300,8 +318,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def encryptionTrustUIGet(self, to_jid, namespace, profile_key, callback=None, errback=None): - d = self.root.callRemote("encryptionTrustUIGet", to_jid, namespace, profile_key) + def encryption_trust_ui_get(self, to_jid, namespace, profile_key, callback=None, errback=None): + d = self.root.callRemote("encryption_trust_ui_get", to_jid, namespace, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -309,8 +327,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getConfig(self, section, name, callback=None, errback=None): - d = self.root.callRemote("getConfig", section, name) + def entities_data_get(self, jids, keys, profile, callback=None, errback=None): + d = self.root.callRemote("entities_data_get", jids, keys, profile) if callback is not None: d.addCallback(callback) if errback is None: @@ -318,8 +336,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getContacts(self, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("getContacts", profile_key) + def entity_data_get(self, jid, keys, profile, callback=None, errback=None): + d = self.root.callRemote("entity_data_get", jid, keys, profile) if callback is not None: d.addCallback(callback) if errback is None: @@ -327,8 +345,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getContactsFromGroup(self, group, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("getContactsFromGroup", group, profile_key) + def features_get(self, profile_key, callback=None, errback=None): + d = self.root.callRemote("features_get", profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -336,17 +354,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getEntitiesData(self, jids, keys, profile, callback=None, errback=None): - d = self.root.callRemote("getEntitiesData", jids, keys, profile) - if callback is not None: - d.addCallback(callback) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def getEntityData(self, jid, keys, profile, callback=None, errback=None): - d = self.root.callRemote("getEntityData", jid, keys, profile) + def history_get(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@", callback=None, errback=None): + d = self.root.callRemote("history_get", from_jid, to_jid, limit, between, filters, profile) if callback is not None: d.addCallback(callback) if errback is None: @@ -354,8 +363,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getFeatures(self, profile_key, callback=None, errback=None): - d = self.root.callRemote("getFeatures", profile_key) + def image_check(self, arg_0, callback=None, errback=None): + d = self.root.callRemote("image_check", arg_0) if callback is not None: d.addCallback(callback) if errback is None: @@ -363,8 +372,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getMainResource(self, contact_jid, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("getMainResource", contact_jid, profile_key) + def image_convert(self, source, dest, arg_2, extra, callback=None, errback=None): + d = self.root.callRemote("image_convert", source, dest, arg_2, extra) if callback is not None: d.addCallback(callback) if errback is None: @@ -372,8 +381,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("getParamA", name, category, attribute, profile_key) + def image_generate_preview(self, image_path, profile_key, callback=None, errback=None): + d = self.root.callRemote("image_generate_preview", image_path, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -381,8 +390,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getParamsCategories(self, callback=None, errback=None): - d = self.root.callRemote("getParamsCategories") + def image_resize(self, image_path, width, height, callback=None, errback=None): + d = self.root.callRemote("image_resize", image_path, width, height) if callback is not None: d.addCallback(callback) if errback is None: @@ -390,8 +399,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getParamsUI(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("getParamsUI", security_limit, app, extra, profile_key) + def is_connected(self, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("is_connected", profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -399,8 +408,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getPresenceStatuses(self, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("getPresenceStatuses", profile_key) + def main_resource_get(self, contact_jid, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("main_resource_get", contact_jid, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -408,17 +417,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getReady(self, callback=None, errback=None): - d = self.root.callRemote("getReady") - if callback is not None: - d.addCallback(lambda __: callback()) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def getVersion(self, callback=None, errback=None): - d = self.root.callRemote("getVersion") + def menu_help_get(self, menu_id, language, callback=None, errback=None): + d = self.root.callRemote("menu_help_get", menu_id, language) if callback is not None: d.addCallback(callback) if errback is None: @@ -426,8 +426,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def getWaitingSub(self, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("getWaitingSub", profile_key) + def menu_launch(self, menu_type, path, data, security_limit, profile_key, callback=None, errback=None): + d = self.root.callRemote("menu_launch", menu_type, path, data, security_limit, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -435,8 +435,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def historyGet(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@", callback=None, errback=None): - d = self.root.callRemote("historyGet", from_jid, to_jid, limit, between, filters, profile) + def menus_get(self, language, security_limit, callback=None, errback=None): + d = self.root.callRemote("menus_get", language, security_limit) if callback is not None: d.addCallback(callback) if errback is None: @@ -444,26 +444,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def imageCheck(self, arg_0, callback=None, errback=None): - d = self.root.callRemote("imageCheck", arg_0) - if callback is not None: - d.addCallback(callback) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def imageConvert(self, source, dest, arg_2, extra, callback=None, errback=None): - d = self.root.callRemote("imageConvert", source, dest, arg_2, extra) - if callback is not None: - d.addCallback(callback) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def imageGeneratePreview(self, image_path, profile_key, callback=None, errback=None): - d = self.root.callRemote("imageGeneratePreview", image_path, profile_key) + def message_encryption_get(self, to_jid, profile_key, callback=None, errback=None): + d = self.root.callRemote("message_encryption_get", to_jid, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -471,8 +453,35 @@ else: d.addErrback(self._errback, ori_errback=errback) - def imageResize(self, image_path, width, height, callback=None, errback=None): - d = self.root.callRemote("imageResize", image_path, width, height) + def message_encryption_start(self, to_jid, namespace='', replace=False, profile_key="@NONE@", callback=None, errback=None): + d = self.root.callRemote("message_encryption_start", to_jid, namespace, replace, profile_key) + if callback is not None: + d.addCallback(lambda __: callback()) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def message_encryption_stop(self, to_jid, profile_key, callback=None, errback=None): + d = self.root.callRemote("message_encryption_stop", to_jid, profile_key) + if callback is not None: + d.addCallback(lambda __: callback()) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def message_send(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None): + d = self.root.callRemote("message_send", to_jid, message, subject, mess_type, extra, profile_key) + if callback is not None: + d.addCallback(lambda __: callback()) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def namespaces_get(self, callback=None, errback=None): + d = self.root.callRemote("namespaces_get") if callback is not None: d.addCallback(callback) if errback is None: @@ -480,8 +489,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def isConnected(self, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("isConnected", profile_key) + def param_get_a(self, name, category, attribute="value", profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("param_get_a", name, category, attribute, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -489,17 +498,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def launchAction(self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("launchAction", callback_id, data, profile_key) - if callback is not None: - d.addCallback(callback) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def loadParamsTemplate(self, filename, callback=None, errback=None): - d = self.root.callRemote("loadParamsTemplate", filename) + def param_get_a_async(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("param_get_a_async", name, category, attribute, security_limit, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -507,17 +507,17 @@ else: d.addErrback(self._errback, ori_errback=errback) - def menuHelpGet(self, menu_id, language, callback=None, errback=None): - d = self.root.callRemote("menuHelpGet", menu_id, language) + def param_set(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("param_set", name, value, category, security_limit, profile_key) if callback is not None: - d.addCallback(callback) + d.addCallback(lambda __: callback()) if errback is None: d.addErrback(self._generic_errback) else: d.addErrback(self._errback, ori_errback=errback) - def menuLaunch(self, menu_type, path, data, security_limit, profile_key, callback=None, errback=None): - d = self.root.callRemote("menuLaunch", menu_type, path, data, security_limit, profile_key) + def param_ui_get(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("param_ui_get", security_limit, app, extra, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -525,8 +525,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def menusGet(self, language, security_limit, callback=None, errback=None): - d = self.root.callRemote("menusGet", language, security_limit) + def params_categories_get(self, callback=None, errback=None): + d = self.root.callRemote("params_categories_get") if callback is not None: d.addCallback(callback) if errback is None: @@ -534,17 +534,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def messageEncryptionGet(self, to_jid, profile_key, callback=None, errback=None): - d = self.root.callRemote("messageEncryptionGet", to_jid, profile_key) - if callback is not None: - d.addCallback(callback) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def messageEncryptionStart(self, to_jid, namespace='', replace=False, profile_key="@NONE@", callback=None, errback=None): - d = self.root.callRemote("messageEncryptionStart", to_jid, namespace, replace, profile_key) + def params_register_app(self, xml, security_limit=-1, app='', callback=None, errback=None): + d = self.root.callRemote("params_register_app", xml, security_limit, app) if callback is not None: d.addCallback(lambda __: callback()) if errback is None: @@ -552,26 +543,26 @@ else: d.addErrback(self._errback, ori_errback=errback) - def messageEncryptionStop(self, to_jid, profile_key, callback=None, errback=None): - d = self.root.callRemote("messageEncryptionStop", to_jid, profile_key) + def params_template_load(self, filename, callback=None, errback=None): + d = self.root.callRemote("params_template_load", filename) if callback is not None: - d.addCallback(lambda __: callback()) + d.addCallback(callback) if errback is None: d.addErrback(self._generic_errback) else: d.addErrback(self._errback, ori_errback=errback) - def messageSend(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None): - d = self.root.callRemote("messageSend", to_jid, message, subject, mess_type, extra, profile_key) + def params_template_save(self, filename, callback=None, errback=None): + d = self.root.callRemote("params_template_save", filename) if callback is not None: - d.addCallback(lambda __: callback()) + d.addCallback(callback) if errback is None: d.addErrback(self._generic_errback) else: d.addErrback(self._errback, ori_errback=errback) - def namespacesGet(self, callback=None, errback=None): - d = self.root.callRemote("namespacesGet") + def params_values_from_category_get_async(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("params_values_from_category_get_async", category, security_limit, app, extra, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -579,8 +570,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def paramsRegisterApp(self, xml, security_limit=-1, app='', callback=None, errback=None): - d = self.root.callRemote("paramsRegisterApp", xml, security_limit, app) + def presence_set(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("presence_set", to_jid, show, statuses, profile_key) if callback is not None: d.addCallback(lambda __: callback()) if errback is None: @@ -588,8 +579,17 @@ else: d.addErrback(self._errback, ori_errback=errback) - def privateDataDelete(self, namespace, key, arg_2, callback=None, errback=None): - d = self.root.callRemote("privateDataDelete", namespace, key, arg_2) + def presence_statuses_get(self, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("presence_statuses_get", profile_key) + if callback is not None: + d.addCallback(callback) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def private_data_delete(self, namespace, key, arg_2, callback=None, errback=None): + d = self.root.callRemote("private_data_delete", namespace, key, arg_2) if callback is not None: d.addCallback(lambda __: callback()) if errback is None: @@ -597,8 +597,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def privateDataGet(self, namespace, key, profile_key, callback=None, errback=None): - d = self.root.callRemote("privateDataGet", namespace, key, profile_key) + def private_data_get(self, namespace, key, profile_key, callback=None, errback=None): + d = self.root.callRemote("private_data_get", namespace, key, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -606,8 +606,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def privateDataSet(self, namespace, key, data, profile_key, callback=None, errback=None): - d = self.root.callRemote("privateDataSet", namespace, key, data, profile_key) + def private_data_set(self, namespace, key, data, profile_key, callback=None, errback=None): + d = self.root.callRemote("private_data_set", namespace, key, data, profile_key) if callback is not None: d.addCallback(lambda __: callback()) if errback is None: @@ -615,8 +615,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def profileCreate(self, profile, password='', component='', callback=None, errback=None): - d = self.root.callRemote("profileCreate", profile, password, component) + def profile_create(self, profile, password='', component='', callback=None, errback=None): + d = self.root.callRemote("profile_create", profile, password, component) if callback is not None: d.addCallback(lambda __: callback()) if errback is None: @@ -624,8 +624,17 @@ else: d.addErrback(self._errback, ori_errback=errback) - def profileIsSessionStarted(self, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("profileIsSessionStarted", profile_key) + def profile_delete_async(self, profile, callback=None, errback=None): + d = self.root.callRemote("profile_delete_async", profile) + if callback is not None: + d.addCallback(lambda __: callback()) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def profile_is_session_started(self, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("profile_is_session_started", profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -633,8 +642,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def profileNameGet(self, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("profileNameGet", profile_key) + def profile_name_get(self, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("profile_name_get", profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -642,8 +651,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def profileSetDefault(self, profile, callback=None, errback=None): - d = self.root.callRemote("profileSetDefault", profile) + def profile_set_default(self, profile, callback=None, errback=None): + d = self.root.callRemote("profile_set_default", profile) if callback is not None: d.addCallback(lambda __: callback()) if errback is None: @@ -651,17 +660,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def profileStartSession(self, password='', profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("profileStartSession", password, profile_key) - if callback is not None: - d.addCallback(callback) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def profilesListGet(self, clients=True, components=False, callback=None, errback=None): - d = self.root.callRemote("profilesListGet", clients, components) + def profile_start_session(self, password='', profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("profile_start_session", password, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -669,8 +669,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def progressGet(self, id, profile, callback=None, errback=None): - d = self.root.callRemote("progressGet", id, profile) + def profiles_list_get(self, clients=True, components=False, callback=None, errback=None): + d = self.root.callRemote("profiles_list_get", clients, components) if callback is not None: d.addCallback(callback) if errback is None: @@ -678,8 +678,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def progressGetAll(self, profile, callback=None, errback=None): - d = self.root.callRemote("progressGetAll", profile) + def progress_get(self, id, profile, callback=None, errback=None): + d = self.root.callRemote("progress_get", id, profile) if callback is not None: d.addCallback(callback) if errback is None: @@ -687,8 +687,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def progressGetAllMetadata(self, profile, callback=None, errback=None): - d = self.root.callRemote("progressGetAllMetadata", profile) + def progress_get_all(self, profile, callback=None, errback=None): + d = self.root.callRemote("progress_get_all", profile) if callback is not None: d.addCallback(callback) if errback is None: @@ -696,17 +696,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def rosterResync(self, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("rosterResync", profile_key) - if callback is not None: - d.addCallback(lambda __: callback()) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def saveParamsTemplate(self, filename, callback=None, errback=None): - d = self.root.callRemote("saveParamsTemplate", filename) + def progress_get_all_metadata(self, profile, callback=None, errback=None): + d = self.root.callRemote("progress_get_all_metadata", profile) if callback is not None: d.addCallback(callback) if errback is None: @@ -714,8 +705,26 @@ else: d.addErrback(self._errback, ori_errback=errback) - def sessionInfosGet(self, profile_key, callback=None, errback=None): - d = self.root.callRemote("sessionInfosGet", profile_key) + def ready_get(self, callback=None, errback=None): + d = self.root.callRemote("ready_get") + if callback is not None: + d.addCallback(lambda __: callback()) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def roster_resync(self, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("roster_resync", profile_key) + if callback is not None: + d.addCallback(lambda __: callback()) + if errback is None: + d.addErrback(self._generic_errback) + else: + d.addErrback(self._errback, ori_errback=errback) + + def session_infos_get(self, profile_key, callback=None, errback=None): + d = self.root.callRemote("session_infos_get", profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -723,19 +732,10 @@ else: d.addErrback(self._errback, ori_errback=errback) - def setParam(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("setParam", name, value, category, security_limit, profile_key) + def sub_waiting_get(self, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("sub_waiting_get", profile_key) if callback is not None: - d.addCallback(lambda __: callback()) - if errback is None: - d.addErrback(self._generic_errback) - else: - d.addErrback(self._errback, ori_errback=errback) - - def setPresence(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("setPresence", to_jid, show, statuses, profile_key) - if callback is not None: - d.addCallback(lambda __: callback()) + d.addCallback(callback) if errback is None: d.addErrback(self._generic_errback) else: @@ -750,10 +750,10 @@ else: d.addErrback(self._errback, ori_errback=errback) - def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@", callback=None, errback=None): - d = self.root.callRemote("updateContact", entity_jid, name, groups, profile_key) + def version_get(self, callback=None, errback=None): + d = self.root.callRemote("version_get") if callback is not None: - d.addCallback(lambda __: callback()) + d.addCallback(callback) if errback is None: d.addErrback(self._generic_errback) else: @@ -768,7 +768,7 @@ return super().register_signal(name, async_handler, iface) -class AIOBridge(Bridge): +class AIOBridge(bridge): def __init__(self): self.signals_handler = AIOSignalsHandler() @@ -785,32 +785,22 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - async def bridgeConnect(self): - d = super().bridgeConnect(callback=None, errback=None) + async def bridge_connect(self): + d = super().bridge_connect(callback=None, errback=None) return await d.asFuture(asyncio.get_event_loop()) - def actionsGet(self, profile_key="@DEFAULT@"): - d = self.root.callRemote("actionsGet", profile_key) + def action_launch(self, callback_id, data, profile_key="@DEFAULT@"): + d = self.root.callRemote("action_launch", callback_id, data, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def addContact(self, entity_jid, profile_key="@DEFAULT@"): - d = self.root.callRemote("addContact", entity_jid, profile_key) + def actions_get(self, profile_key="@DEFAULT@"): + d = self.root.callRemote("actions_get", profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def asyncDeleteProfile(self, profile): - d = self.root.callRemote("asyncDeleteProfile", profile) - d.addErrback(self._errback) - return d.asFuture(asyncio.get_event_loop()) - - def asyncGetParamA(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@"): - d = self.root.callRemote("asyncGetParamA", name, category, attribute, security_limit, profile_key) - d.addErrback(self._errback) - return d.asFuture(asyncio.get_event_loop()) - - def asyncGetParamsValuesFromCategory(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@"): - d = self.root.callRemote("asyncGetParamsValuesFromCategory", category, security_limit, app, extra, profile_key) + def config_get(self, section, name): + d = self.root.callRemote("config_get", section, name) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) @@ -819,33 +809,53 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def contactGet(self, arg_0, profile_key="@DEFAULT@"): - d = self.root.callRemote("contactGet", arg_0, profile_key) + def contact_add(self, entity_jid, profile_key="@DEFAULT@"): + d = self.root.callRemote("contact_add", entity_jid, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def delContact(self, entity_jid, profile_key="@DEFAULT@"): - d = self.root.callRemote("delContact", entity_jid, profile_key) + def contact_del(self, entity_jid, profile_key="@DEFAULT@"): + d = self.root.callRemote("contact_del", entity_jid, profile_key) + d.addErrback(self._errback) + return d.asFuture(asyncio.get_event_loop()) + + def contact_get(self, arg_0, profile_key="@DEFAULT@"): + d = self.root.callRemote("contact_get", arg_0, profile_key) + d.addErrback(self._errback) + return d.asFuture(asyncio.get_event_loop()) + + def contact_update(self, entity_jid, name, groups, profile_key="@DEFAULT@"): + d = self.root.callRemote("contact_update", entity_jid, name, groups, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def devicesInfosGet(self, bare_jid, profile_key): - d = self.root.callRemote("devicesInfosGet", bare_jid, profile_key) + def contacts_get(self, profile_key="@DEFAULT@"): + d = self.root.callRemote("contacts_get", profile_key) + d.addErrback(self._errback) + return d.asFuture(asyncio.get_event_loop()) + + def contacts_get_from_group(self, group, profile_key="@DEFAULT@"): + d = self.root.callRemote("contacts_get_from_group", group, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def discoFindByFeatures(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key="@DEFAULT@"): - d = self.root.callRemote("discoFindByFeatures", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key) + def devices_infos_get(self, bare_jid, profile_key): + d = self.root.callRemote("devices_infos_get", bare_jid, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def discoInfos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): - d = self.root.callRemote("discoInfos", entity_jid, node, use_cache, profile_key) + def disco_find_by_features(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key="@DEFAULT@"): + d = self.root.callRemote("disco_find_by_features", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def discoItems(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): - d = self.root.callRemote("discoItems", entity_jid, node, use_cache, profile_key) + def disco_infos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): + d = self.root.callRemote("disco_infos", entity_jid, node, use_cache, profile_key) + d.addErrback(self._errback) + return d.asFuture(asyncio.get_event_loop()) + + def disco_items(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): + d = self.root.callRemote("disco_items", entity_jid, node, use_cache, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) @@ -854,258 +864,248 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def encryptionNamespaceGet(self, arg_0): - d = self.root.callRemote("encryptionNamespaceGet", arg_0) + def encryption_namespace_get(self, arg_0): + d = self.root.callRemote("encryption_namespace_get", arg_0) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def encryptionPluginsGet(self): - d = self.root.callRemote("encryptionPluginsGet") + def encryption_plugins_get(self): + d = self.root.callRemote("encryption_plugins_get") d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def encryptionTrustUIGet(self, to_jid, namespace, profile_key): - d = self.root.callRemote("encryptionTrustUIGet", to_jid, namespace, profile_key) + def encryption_trust_ui_get(self, to_jid, namespace, profile_key): + d = self.root.callRemote("encryption_trust_ui_get", to_jid, namespace, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getConfig(self, section, name): - d = self.root.callRemote("getConfig", section, name) + def entities_data_get(self, jids, keys, profile): + d = self.root.callRemote("entities_data_get", jids, keys, profile) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getContacts(self, profile_key="@DEFAULT@"): - d = self.root.callRemote("getContacts", profile_key) + def entity_data_get(self, jid, keys, profile): + d = self.root.callRemote("entity_data_get", jid, keys, profile) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getContactsFromGroup(self, group, profile_key="@DEFAULT@"): - d = self.root.callRemote("getContactsFromGroup", group, profile_key) + def features_get(self, profile_key): + d = self.root.callRemote("features_get", profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getEntitiesData(self, jids, keys, profile): - d = self.root.callRemote("getEntitiesData", jids, keys, profile) - d.addErrback(self._errback) - return d.asFuture(asyncio.get_event_loop()) - - def getEntityData(self, jid, keys, profile): - d = self.root.callRemote("getEntityData", jid, keys, profile) + def history_get(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@"): + d = self.root.callRemote("history_get", from_jid, to_jid, limit, between, filters, profile) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getFeatures(self, profile_key): - d = self.root.callRemote("getFeatures", profile_key) + def image_check(self, arg_0): + d = self.root.callRemote("image_check", arg_0) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getMainResource(self, contact_jid, profile_key="@DEFAULT@"): - d = self.root.callRemote("getMainResource", contact_jid, profile_key) + def image_convert(self, source, dest, arg_2, extra): + d = self.root.callRemote("image_convert", source, dest, arg_2, extra) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"): - d = self.root.callRemote("getParamA", name, category, attribute, profile_key) + def image_generate_preview(self, image_path, profile_key): + d = self.root.callRemote("image_generate_preview", image_path, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getParamsCategories(self): - d = self.root.callRemote("getParamsCategories") + def image_resize(self, image_path, width, height): + d = self.root.callRemote("image_resize", image_path, width, height) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getParamsUI(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@"): - d = self.root.callRemote("getParamsUI", security_limit, app, extra, profile_key) + def is_connected(self, profile_key="@DEFAULT@"): + d = self.root.callRemote("is_connected", profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getPresenceStatuses(self, profile_key="@DEFAULT@"): - d = self.root.callRemote("getPresenceStatuses", profile_key) + def main_resource_get(self, contact_jid, profile_key="@DEFAULT@"): + d = self.root.callRemote("main_resource_get", contact_jid, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getReady(self): - d = self.root.callRemote("getReady") + def menu_help_get(self, menu_id, language): + d = self.root.callRemote("menu_help_get", menu_id, language) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getVersion(self): - d = self.root.callRemote("getVersion") + def menu_launch(self, menu_type, path, data, security_limit, profile_key): + d = self.root.callRemote("menu_launch", menu_type, path, data, security_limit, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def getWaitingSub(self, profile_key="@DEFAULT@"): - d = self.root.callRemote("getWaitingSub", profile_key) + def menus_get(self, language, security_limit): + d = self.root.callRemote("menus_get", language, security_limit) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def historyGet(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@"): - d = self.root.callRemote("historyGet", from_jid, to_jid, limit, between, filters, profile) + def message_encryption_get(self, to_jid, profile_key): + d = self.root.callRemote("message_encryption_get", to_jid, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def imageCheck(self, arg_0): - d = self.root.callRemote("imageCheck", arg_0) + def message_encryption_start(self, to_jid, namespace='', replace=False, profile_key="@NONE@"): + d = self.root.callRemote("message_encryption_start", to_jid, namespace, replace, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def imageConvert(self, source, dest, arg_2, extra): - d = self.root.callRemote("imageConvert", source, dest, arg_2, extra) + def message_encryption_stop(self, to_jid, profile_key): + d = self.root.callRemote("message_encryption_stop", to_jid, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def imageGeneratePreview(self, image_path, profile_key): - d = self.root.callRemote("imageGeneratePreview", image_path, profile_key) + def message_send(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@"): + d = self.root.callRemote("message_send", to_jid, message, subject, mess_type, extra, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def imageResize(self, image_path, width, height): - d = self.root.callRemote("imageResize", image_path, width, height) + def namespaces_get(self): + d = self.root.callRemote("namespaces_get") d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def isConnected(self, profile_key="@DEFAULT@"): - d = self.root.callRemote("isConnected", profile_key) + def param_get_a(self, name, category, attribute="value", profile_key="@DEFAULT@"): + d = self.root.callRemote("param_get_a", name, category, attribute, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def launchAction(self, callback_id, data, profile_key="@DEFAULT@"): - d = self.root.callRemote("launchAction", callback_id, data, profile_key) + def param_get_a_async(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@"): + d = self.root.callRemote("param_get_a_async", name, category, attribute, security_limit, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def loadParamsTemplate(self, filename): - d = self.root.callRemote("loadParamsTemplate", filename) + def param_set(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"): + d = self.root.callRemote("param_set", name, value, category, security_limit, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def menuHelpGet(self, menu_id, language): - d = self.root.callRemote("menuHelpGet", menu_id, language) + def param_ui_get(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@"): + d = self.root.callRemote("param_ui_get", security_limit, app, extra, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def menuLaunch(self, menu_type, path, data, security_limit, profile_key): - d = self.root.callRemote("menuLaunch", menu_type, path, data, security_limit, profile_key) + def params_categories_get(self): + d = self.root.callRemote("params_categories_get") d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def menusGet(self, language, security_limit): - d = self.root.callRemote("menusGet", language, security_limit) + def params_register_app(self, xml, security_limit=-1, app=''): + d = self.root.callRemote("params_register_app", xml, security_limit, app) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def messageEncryptionGet(self, to_jid, profile_key): - d = self.root.callRemote("messageEncryptionGet", to_jid, profile_key) + def params_template_load(self, filename): + d = self.root.callRemote("params_template_load", filename) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def messageEncryptionStart(self, to_jid, namespace='', replace=False, profile_key="@NONE@"): - d = self.root.callRemote("messageEncryptionStart", to_jid, namespace, replace, profile_key) + def params_template_save(self, filename): + d = self.root.callRemote("params_template_save", filename) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def messageEncryptionStop(self, to_jid, profile_key): - d = self.root.callRemote("messageEncryptionStop", to_jid, profile_key) + def params_values_from_category_get_async(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@"): + d = self.root.callRemote("params_values_from_category_get_async", category, security_limit, app, extra, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def messageSend(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@"): - d = self.root.callRemote("messageSend", to_jid, message, subject, mess_type, extra, profile_key) + def presence_set(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@"): + d = self.root.callRemote("presence_set", to_jid, show, statuses, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def namespacesGet(self): - d = self.root.callRemote("namespacesGet") + def presence_statuses_get(self, profile_key="@DEFAULT@"): + d = self.root.callRemote("presence_statuses_get", profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def paramsRegisterApp(self, xml, security_limit=-1, app=''): - d = self.root.callRemote("paramsRegisterApp", xml, security_limit, app) + def private_data_delete(self, namespace, key, arg_2): + d = self.root.callRemote("private_data_delete", namespace, key, arg_2) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def privateDataDelete(self, namespace, key, arg_2): - d = self.root.callRemote("privateDataDelete", namespace, key, arg_2) + def private_data_get(self, namespace, key, profile_key): + d = self.root.callRemote("private_data_get", namespace, key, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def privateDataGet(self, namespace, key, profile_key): - d = self.root.callRemote("privateDataGet", namespace, key, profile_key) + def private_data_set(self, namespace, key, data, profile_key): + d = self.root.callRemote("private_data_set", namespace, key, data, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def privateDataSet(self, namespace, key, data, profile_key): - d = self.root.callRemote("privateDataSet", namespace, key, data, profile_key) + def profile_create(self, profile, password='', component=''): + d = self.root.callRemote("profile_create", profile, password, component) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def profileCreate(self, profile, password='', component=''): - d = self.root.callRemote("profileCreate", profile, password, component) + def profile_delete_async(self, profile): + d = self.root.callRemote("profile_delete_async", profile) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def profileIsSessionStarted(self, profile_key="@DEFAULT@"): - d = self.root.callRemote("profileIsSessionStarted", profile_key) + def profile_is_session_started(self, profile_key="@DEFAULT@"): + d = self.root.callRemote("profile_is_session_started", profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def profileNameGet(self, profile_key="@DEFAULT@"): - d = self.root.callRemote("profileNameGet", profile_key) + def profile_name_get(self, profile_key="@DEFAULT@"): + d = self.root.callRemote("profile_name_get", profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def profileSetDefault(self, profile): - d = self.root.callRemote("profileSetDefault", profile) + def profile_set_default(self, profile): + d = self.root.callRemote("profile_set_default", profile) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def profileStartSession(self, password='', profile_key="@DEFAULT@"): - d = self.root.callRemote("profileStartSession", password, profile_key) + def profile_start_session(self, password='', profile_key="@DEFAULT@"): + d = self.root.callRemote("profile_start_session", password, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def profilesListGet(self, clients=True, components=False): - d = self.root.callRemote("profilesListGet", clients, components) + def profiles_list_get(self, clients=True, components=False): + d = self.root.callRemote("profiles_list_get", clients, components) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def progressGet(self, id, profile): - d = self.root.callRemote("progressGet", id, profile) + def progress_get(self, id, profile): + d = self.root.callRemote("progress_get", id, profile) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def progressGetAll(self, profile): - d = self.root.callRemote("progressGetAll", profile) + def progress_get_all(self, profile): + d = self.root.callRemote("progress_get_all", profile) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def progressGetAllMetadata(self, profile): - d = self.root.callRemote("progressGetAllMetadata", profile) + def progress_get_all_metadata(self, profile): + d = self.root.callRemote("progress_get_all_metadata", profile) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def rosterResync(self, profile_key="@DEFAULT@"): - d = self.root.callRemote("rosterResync", profile_key) - d.addErrback(self._errback) - return d.asFuture(asyncio.get_event_loop()) - - def saveParamsTemplate(self, filename): - d = self.root.callRemote("saveParamsTemplate", filename) + def ready_get(self): + d = self.root.callRemote("ready_get") d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def sessionInfosGet(self, profile_key): - d = self.root.callRemote("sessionInfosGet", profile_key) + def roster_resync(self, profile_key="@DEFAULT@"): + d = self.root.callRemote("roster_resync", profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def setParam(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"): - d = self.root.callRemote("setParam", name, value, category, security_limit, profile_key) + def session_infos_get(self, profile_key): + d = self.root.callRemote("session_infos_get", profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def setPresence(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@"): - d = self.root.callRemote("setPresence", to_jid, show, statuses, profile_key) + def sub_waiting_get(self, profile_key="@DEFAULT@"): + d = self.root.callRemote("sub_waiting_get", profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) @@ -1114,7 +1114,7 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@"): - d = self.root.callRemote("updateContact", entity_jid, name, groups, profile_key) + def version_get(self): + d = self.root.callRemote("version_get") d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop())