Mercurial > libervia-backend
changeset 4280:4cf98f506269
bridge(constructor): fix template parsing, which was broken following `black` reformating.
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Fri, 12 Jul 2024 17:58:06 +0200 |
| parents | 6276242736c3 |
| children | 9e63e02318ec |
| files | libervia/backend/bridge/bridge_constructor/base_constructor.py libervia/backend/bridge/bridge_constructor/constructors/mediawiki/constructor.py libervia/backend/bridge/dbus_bridge.py libervia/backend/bridge/pb.py libervia/frontends/bridge/dbus_bridge.py libervia/frontends/bridge/pb.py |
| diffstat | 6 files changed, 690 insertions(+), 2320 deletions(-) [+] |
line wrap: on
line diff
--- a/libervia/backend/bridge/bridge_constructor/base_constructor.py Fri Jul 05 17:18:37 2024 +0200 +++ b/libervia/backend/bridge/bridge_constructor/base_constructor.py Fri Jul 12 17:58:06 2024 +0200 @@ -325,12 +325,12 @@ for line in template: for part, extend_list in parts.items(): - if line.startswith("##{}_PART##".format(part)): + if line.lstrip().startswith("##{}_PART##".format(part)): bridge.extend(extend_list) break else: # the line is not a magic part replacement - if line.startswith("const_"): + if line.lstrip().startswith("const_"): const_name = line[len("const_") : line.find(" = ")].strip() if const_name in const_override: print(("const {} overriden".format(const_name)))
--- a/libervia/backend/bridge/bridge_constructor/constructors/mediawiki/constructor.py Fri Jul 05 17:18:37 2024 +0200 +++ b/libervia/backend/bridge/bridge_constructor/constructors/mediawiki/constructor.py Fri Jul 12 17:58:06 2024 +0200 @@ -152,11 +152,11 @@ try: with open(template_path) as core_template: for line in core_template: - if line.startswith("##SIGNALS_PART##"): + if line.lstrip().startswith("##SIGNALS_PART##"): core_bridge.extend(signals_part) - elif line.startswith("##METHODS_PART##"): + elif line.lstrip().startswith("##METHODS_PART##"): core_bridge.extend(methods_part) - elif line.startswith("##TIMESTAMP##"): + elif line.lstrip().startswith("##TIMESTAMP##"): core_bridge.append("Generated on %s" % datetime.now()) else: core_bridge.append(line.replace("\n", ""))
--- a/libervia/backend/bridge/dbus_bridge.py Fri Jul 05 17:18:37 2024 +0200 +++ b/libervia/backend/bridge/dbus_bridge.py Fri Jul 12 17:58:06 2024 +0200 @@ -86,102 +86,96 @@ core_iface = DBusInterface( const_INT_PREFIX + const_CORE_SUFFIX, - Method("action_launch", arguments="sss", returns="s"), - Method("actions_get", arguments="s", returns="a(ssi)"), - Method("config_get", arguments="ss", returns="s"), - Method("connect", arguments="ssa{ss}", returns="b"), - Method("contact_add", arguments="ss", returns=""), - Method("contact_del", arguments="ss", returns=""), - Method("contact_get", arguments="ss", returns="(a{ss}as)"), - Method("contact_update", arguments="ssass", returns=""), - Method("contacts_get", arguments="s", returns="a(sa{ss}as)"), - Method("contacts_get_from_group", arguments="ss", returns="as"), - Method("devices_infos_get", arguments="ss", returns="s"), - Method( - "disco_find_by_features", - arguments="asa(ss)bbbbbs", - returns="(a{sa(sss)}a{sa(sss)}a{sa(sss)})", - ), - Method("disco_infos", arguments="ssbs", returns="(asa(sss)a{sa(a{ss}as)})"), - Method("disco_items", arguments="ssbs", returns="a(sss)"), - Method("disconnect", arguments="s", returns=""), - Method("encryption_namespace_get", arguments="s", returns="s"), - Method("encryption_plugins_get", arguments="", returns="s"), - Method("encryption_trust_ui_get", arguments="sss", returns="s"), - Method("entities_data_get", arguments="asass", returns="a{sa{ss}}"), - Method("entity_data_get", arguments="sass", returns="a{ss}"), - Method("features_get", arguments="s", returns="a{sa{ss}}"), - Method("history_get", arguments="ssiba{ss}s", returns="a(sdssa{ss}a{ss}ss)"), - Method("image_check", arguments="s", returns="s"), - Method("image_convert", arguments="ssss", returns="s"), - Method("image_generate_preview", arguments="ss", returns="s"), - Method("image_resize", arguments="sii", returns="s"), - Method("init_pre_script", arguments="", returns=""), - Method("is_connected", arguments="s", returns="b"), - Method("main_resource_get", arguments="ss", returns="s"), - Method("menu_help_get", arguments="ss", returns="s"), - Method("menu_launch", arguments="sasa{ss}is", returns="a{ss}"), - Method("menus_get", arguments="si", returns="a(ssasasa{ss})"), - Method("message_encryption_get", arguments="ss", returns="s"), - Method("message_encryption_start", arguments="ssbs", returns=""), - Method("message_encryption_stop", arguments="ss", returns=""), - Method("message_send", arguments="sa{ss}a{ss}sss", returns=""), - Method("namespaces_get", arguments="", returns="a{ss}"), - Method("notification_add", arguments="ssssbbsdss", returns=""), - Method("notification_delete", arguments="sbs", returns=""), - Method("notifications_expired_clean", arguments="ds", returns=""), - Method("notifications_get", arguments="ss", returns="s"), - Method("param_get_a", arguments="ssss", returns="s"), - Method("param_get_a_async", arguments="sssis", returns="s"), - Method("param_set", arguments="sssis", returns=""), - Method("param_ui_get", arguments="isss", returns="s"), - Method("params_categories_get", arguments="", returns="as"), - Method("params_register_app", arguments="sis", returns=""), - Method("params_template_load", arguments="s", returns="b"), - Method("params_template_save", arguments="s", returns="b"), - Method( - "params_values_from_category_get_async", arguments="sisss", returns="a{ss}" - ), - Method("presence_set", arguments="ssa{ss}s", returns=""), - Method("presence_statuses_get", arguments="s", returns="a{sa{s(sia{ss})}}"), - Method("private_data_delete", arguments="sss", returns=""), - Method("private_data_get", arguments="sss", returns="s"), - Method("private_data_set", arguments="ssss", returns=""), - Method("profile_create", arguments="sss", returns=""), - Method("profile_delete_async", arguments="s", returns=""), - Method("profile_is_session_started", arguments="s", returns="b"), - Method("profile_name_get", arguments="s", returns="s"), - Method("profile_set_default", arguments="s", returns=""), - Method("profile_start_session", arguments="ss", returns="b"), - Method("profiles_list_get", arguments="bb", returns="as"), - Method("progress_get", arguments="ss", returns="a{ss}"), - Method("progress_get_all", arguments="s", returns="a{sa{sa{ss}}}"), - Method("progress_get_all_metadata", arguments="s", returns="a{sa{sa{ss}}}"), - Method("ready_get", arguments="", returns=""), - Method("roster_resync", arguments="s", returns=""), - Method("session_infos_get", arguments="s", returns="a{ss}"), - Method("sub_waiting_get", arguments="s", returns="a{ss}"), - Method("subscription", arguments="sss", returns=""), - Method("version_get", arguments="", returns="s"), - Signal("_debug", "sa{ss}s"), - Signal("action_new", "ssis"), - Signal("connected", "ss"), - Signal("contact_deleted", "ss"), - Signal("contact_new", "sa{ss}ass"), - Signal("disconnected", "s"), - Signal("entity_data_updated", "ssss"), - Signal("message_encryption_started", "sss"), - Signal("message_encryption_stopped", "sa{ss}s"), - Signal("message_new", "sdssa{ss}a{ss}sss"), - Signal("message_update", "ssss"), - Signal("notification_deleted", "ss"), - Signal("notification_new", "sdssssbidss"), - Signal("param_update", "ssss"), - Signal("presence_update", "ssia{ss}s"), - Signal("progress_error", "sss"), - Signal("progress_finished", "sa{ss}s"), - Signal("progress_started", "sa{ss}s"), - Signal("subscribe", "sss"), + Method('action_launch', arguments='sss', returns='s'), + Method('actions_get', arguments='s', returns='a(ssi)'), + Method('config_get', arguments='ss', returns='s'), + Method('connect', arguments='ssa{ss}', returns='b'), + Method('contact_add', arguments='ss', returns=''), + Method('contact_del', arguments='ss', returns=''), + Method('contact_get', arguments='ss', returns='(a{ss}as)'), + Method('contact_update', arguments='ssass', returns=''), + Method('contacts_get', arguments='s', returns='a(sa{ss}as)'), + Method('contacts_get_from_group', arguments='ss', returns='as'), + Method('devices_infos_get', arguments='ss', returns='s'), + Method('disco_find_by_features', arguments='asa(ss)bbbbbs', returns='(a{sa(sss)}a{sa(sss)}a{sa(sss)})'), + Method('disco_infos', arguments='ssbs', returns='(asa(sss)a{sa(a{ss}as)})'), + Method('disco_items', arguments='ssbs', returns='a(sss)'), + Method('disconnect', arguments='s', returns=''), + Method('encryption_namespace_get', arguments='s', returns='s'), + Method('encryption_plugins_get', arguments='', returns='s'), + Method('encryption_trust_ui_get', arguments='sss', returns='s'), + Method('entities_data_get', arguments='asass', returns='a{sa{ss}}'), + Method('entity_data_get', arguments='sass', returns='a{ss}'), + Method('features_get', arguments='s', returns='a{sa{ss}}'), + Method('history_get', arguments='ssiba{ss}s', returns='a(sdssa{ss}a{ss}ss)'), + Method('image_check', arguments='s', returns='s'), + Method('image_convert', arguments='ssss', returns='s'), + Method('image_generate_preview', arguments='ss', returns='s'), + Method('image_resize', arguments='sii', returns='s'), + Method('init_pre_script', arguments='', returns=''), + Method('is_connected', arguments='s', returns='b'), + Method('main_resource_get', arguments='ss', returns='s'), + Method('menu_help_get', arguments='ss', returns='s'), + Method('menu_launch', arguments='sasa{ss}is', returns='a{ss}'), + Method('menus_get', arguments='si', returns='a(ssasasa{ss})'), + Method('message_encryption_get', arguments='ss', returns='s'), + Method('message_encryption_start', arguments='ssbs', returns=''), + Method('message_encryption_stop', arguments='ss', returns=''), + Method('message_send', arguments='sa{ss}a{ss}sss', returns=''), + Method('namespaces_get', arguments='', returns='a{ss}'), + Method('notification_add', arguments='ssssbbsdss', returns=''), + Method('notification_delete', arguments='sbs', returns=''), + Method('notifications_expired_clean', arguments='ds', returns=''), + Method('notifications_get', arguments='ss', returns='s'), + Method('param_get_a', arguments='ssss', returns='s'), + Method('param_get_a_async', arguments='sssis', returns='s'), + Method('param_set', arguments='sssis', returns=''), + Method('param_ui_get', arguments='isss', returns='s'), + Method('params_categories_get', arguments='', returns='as'), + Method('params_register_app', arguments='sis', returns=''), + Method('params_template_load', arguments='s', returns='b'), + Method('params_template_save', arguments='s', returns='b'), + Method('params_values_from_category_get_async', arguments='sisss', returns='a{ss}'), + Method('presence_set', arguments='ssa{ss}s', returns=''), + Method('presence_statuses_get', arguments='s', returns='a{sa{s(sia{ss})}}'), + Method('private_data_delete', arguments='sss', returns=''), + Method('private_data_get', arguments='sss', returns='s'), + Method('private_data_set', arguments='ssss', returns=''), + Method('profile_create', arguments='sss', returns=''), + Method('profile_delete_async', arguments='s', returns=''), + Method('profile_is_session_started', arguments='s', returns='b'), + Method('profile_name_get', arguments='s', returns='s'), + Method('profile_set_default', arguments='s', returns=''), + Method('profile_start_session', arguments='ss', returns='b'), + Method('profiles_list_get', arguments='bb', returns='as'), + Method('progress_get', arguments='ss', returns='a{ss}'), + Method('progress_get_all', arguments='s', returns='a{sa{sa{ss}}}'), + Method('progress_get_all_metadata', arguments='s', returns='a{sa{sa{ss}}}'), + Method('ready_get', arguments='', returns=''), + Method('roster_resync', arguments='s', returns=''), + Method('session_infos_get', arguments='s', returns='a{ss}'), + Method('sub_waiting_get', arguments='s', returns='a{ss}'), + Method('subscription', arguments='sss', returns=''), + Method('version_get', arguments='', returns='s'), + Signal('_debug', 'sa{ss}s'), + Signal('action_new', 'ssis'), + Signal('connected', 'ss'), + Signal('contact_deleted', 'ss'), + Signal('contact_new', 'sa{ss}ass'), + Signal('disconnected', 's'), + Signal('entity_data_updated', 'ssss'), + Signal('message_encryption_started', 'sss'), + Signal('message_encryption_stopped', 'sa{ss}s'), + Signal('message_new', 'sdssa{ss}a{ss}sss'), + Signal('message_update', 'ssss'), + Signal('notification_deleted', 'ss'), + Signal('notification_new', 'sdssssbidss'), + Signal('param_update', 'ssss'), + Signal('presence_update', 'ssia{ss}s'), + Signal('progress_error', 'sss'), + Signal('progress_finished', 'sa{ss}s'), + Signal('progress_started', 'sa{ss}s'), + Signal('subscribe', 'sss'), ) plugin_iface = DBusInterface(const_INT_PREFIX + const_PLUGIN_SUFFIX) @@ -206,6 +200,7 @@ d.addErrback(GenericException.create_and_raise) return d + def dbus_action_launch(self, callback_id, data, profile_key="@DEFAULT@"): return self._callback("action_launch", callback_id, data, profile_key) @@ -215,7 +210,7 @@ def dbus_config_get(self, section, name): return self._callback("config_get", section, name) - def dbus_connect(self, profile_key="@DEFAULT@", password="", options={}): + def dbus_connect(self, profile_key="@DEFAULT@", password='', options={}): return self._callback("connect", profile_key, password, options) def dbus_contact_add(self, entity_jid, profile_key="@DEFAULT@"): @@ -239,37 +234,13 @@ def dbus_devices_infos_get(self, bare_jid, profile_key): return self._callback("devices_infos_get", bare_jid, profile_key) - def dbus_disco_find_by_features( - self, - namespaces, - identities, - bare_jid=False, - service=True, - roster=True, - own_jid=True, - local_device=False, - profile_key="@DEFAULT@", - ): - return self._callback( - "disco_find_by_features", - namespaces, - identities, - bare_jid, - service, - roster, - own_jid, - local_device, - profile_key, - ) + def dbus_disco_find_by_features(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key="@DEFAULT@"): + return self._callback("disco_find_by_features", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key) - def dbus_disco_infos( - self, entity_jid, node="", use_cache=True, profile_key="@DEFAULT@" - ): + def dbus_disco_infos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): return self._callback("disco_infos", entity_jid, node, use_cache, profile_key) - def dbus_disco_items( - self, entity_jid, node="", use_cache=True, profile_key="@DEFAULT@" - ): + def dbus_disco_items(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): return self._callback("disco_items", entity_jid, node, use_cache, profile_key) def dbus_disconnect(self, profile_key="@DEFAULT@"): @@ -278,12 +249,8 @@ def dbus_encryption_namespace_get(self, arg_0): return self._callback("encryption_namespace_get", arg_0) - def dbus_encryption_plugins_get( - self, - ): - return self._callback( - "encryption_plugins_get", - ) + def dbus_encryption_plugins_get(self, ): + return self._callback("encryption_plugins_get", ) def dbus_encryption_trust_ui_get(self, to_jid, namespace, profile_key): return self._callback("encryption_trust_ui_get", to_jid, namespace, profile_key) @@ -297,12 +264,8 @@ def dbus_features_get(self, profile_key): return self._callback("features_get", profile_key) - def dbus_history_get( - self, from_jid, to_jid, limit, between=True, filters="", profile="@NONE@" - ): - return self._callback( - "history_get", from_jid, to_jid, limit, between, filters, profile - ) + def dbus_history_get(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@"): + return self._callback("history_get", from_jid, to_jid, limit, between, filters, profile) def dbus_image_check(self, arg_0): return self._callback("image_check", arg_0) @@ -316,12 +279,8 @@ def dbus_image_resize(self, image_path, width, height): return self._callback("image_resize", image_path, width, height) - def dbus_init_pre_script( - self, - ): - return self._callback( - "init_pre_script", - ) + def dbus_init_pre_script(self, ): + return self._callback("init_pre_script", ) def dbus_is_connected(self, profile_key="@DEFAULT@"): return self._callback("is_connected", profile_key) @@ -333,9 +292,7 @@ return self._callback("menu_help_get", menu_id, language) def dbus_menu_launch(self, menu_type, path, data, security_limit, profile_key): - return self._callback( - "menu_launch", menu_type, path, data, security_limit, profile_key - ) + return self._callback("menu_launch", menu_type, path, data, security_limit, profile_key) def dbus_menus_get(self, language, security_limit): return self._callback("menus_get", language, security_limit) @@ -343,62 +300,20 @@ def dbus_message_encryption_get(self, to_jid, profile_key): return self._callback("message_encryption_get", to_jid, profile_key) - def dbus_message_encryption_start( - self, to_jid, namespace="", replace=False, profile_key="@NONE@" - ): - return self._callback( - "message_encryption_start", to_jid, namespace, replace, profile_key - ) + def dbus_message_encryption_start(self, to_jid, namespace='', replace=False, profile_key="@NONE@"): + return self._callback("message_encryption_start", to_jid, namespace, replace, profile_key) def dbus_message_encryption_stop(self, to_jid, profile_key): return self._callback("message_encryption_stop", to_jid, profile_key) - def dbus_message_send( - self, - to_jid, - message, - subject={}, - mess_type="auto", - extra={}, - profile_key="@NONE@", - ): - return self._callback( - "message_send", to_jid, message, subject, mess_type, extra, profile_key - ) - - def dbus_namespaces_get( - self, - ): - return self._callback( - "namespaces_get", - ) + def dbus_message_send(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@"): + return self._callback("message_send", to_jid, message, subject, mess_type, extra, profile_key) - def dbus_notification_add( - self, - type_, - body_plain, - body_rich, - title, - is_global, - requires_action, - arg_6, - priority, - expire_at, - extra, - ): - return self._callback( - "notification_add", - type_, - body_plain, - body_rich, - title, - is_global, - requires_action, - arg_6, - priority, - expire_at, - extra, - ) + def dbus_namespaces_get(self, ): + return self._callback("namespaces_get", ) + + def dbus_notification_add(self, type_, body_plain, body_rich, title, is_global, requires_action, arg_6, priority, expire_at, extra): + return self._callback("notification_add", type_, body_plain, body_rich, title, is_global, requires_action, arg_6, priority, expire_at, extra) def dbus_notification_delete(self, id_, is_global, profile_key): return self._callback("notification_delete", id_, is_global, profile_key) @@ -409,43 +324,22 @@ def dbus_notifications_get(self, filters, profile_key): return self._callback("notifications_get", filters, profile_key) - def dbus_param_get_a( - self, name, category, attribute="value", profile_key="@DEFAULT@" - ): + def dbus_param_get_a(self, name, category, attribute="value", profile_key="@DEFAULT@"): return self._callback("param_get_a", name, category, attribute, profile_key) - def dbus_param_get_a_async( - self, - name, - category, - attribute="value", - security_limit=-1, - profile_key="@DEFAULT@", - ): - return self._callback( - "param_get_a_async", name, category, attribute, security_limit, profile_key - ) + def dbus_param_get_a_async(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@"): + return self._callback("param_get_a_async", name, category, attribute, security_limit, profile_key) - def dbus_param_set( - self, name, value, category, security_limit=-1, profile_key="@DEFAULT@" - ): - return self._callback( - "param_set", name, value, category, security_limit, profile_key - ) + def dbus_param_set(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"): + return self._callback("param_set", name, value, category, security_limit, profile_key) - def dbus_param_ui_get( - self, security_limit=-1, app="", extra="", profile_key="@DEFAULT@" - ): + def dbus_param_ui_get(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@"): return self._callback("param_ui_get", security_limit, app, extra, profile_key) - def dbus_params_categories_get( - self, - ): - return self._callback( - "params_categories_get", - ) + def dbus_params_categories_get(self, ): + return self._callback("params_categories_get", ) - def dbus_params_register_app(self, xml, security_limit=-1, app=""): + def dbus_params_register_app(self, xml, security_limit=-1, app=''): return self._callback("params_register_app", xml, security_limit, app) def dbus_params_template_load(self, filename): @@ -454,19 +348,10 @@ def dbus_params_template_save(self, filename): return self._callback("params_template_save", filename) - def dbus_params_values_from_category_get_async( - self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@" - ): - return self._callback( - "params_values_from_category_get_async", - category, - security_limit, - app, - extra, - profile_key, - ) + def dbus_params_values_from_category_get_async(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@"): + return self._callback("params_values_from_category_get_async", category, security_limit, app, extra, profile_key) - def dbus_presence_set(self, to_jid="", show="", statuses={}, profile_key="@DEFAULT@"): + def dbus_presence_set(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@"): return self._callback("presence_set", to_jid, show, statuses, profile_key) def dbus_presence_statuses_get(self, profile_key="@DEFAULT@"): @@ -481,7 +366,7 @@ def dbus_private_data_set(self, namespace, key, data, profile_key): return self._callback("private_data_set", namespace, key, data, profile_key) - def dbus_profile_create(self, profile, password="", component=""): + def dbus_profile_create(self, profile, password='', component=''): return self._callback("profile_create", profile, password, component) def dbus_profile_delete_async(self, profile): @@ -496,7 +381,7 @@ def dbus_profile_set_default(self, profile): return self._callback("profile_set_default", profile) - def dbus_profile_start_session(self, password="", profile_key="@DEFAULT@"): + def dbus_profile_start_session(self, password='', profile_key="@DEFAULT@"): return self._callback("profile_start_session", password, profile_key) def dbus_profiles_list_get(self, clients=True, components=False): @@ -511,12 +396,8 @@ def dbus_progress_get_all_metadata(self, profile): return self._callback("progress_get_all_metadata", profile) - def dbus_ready_get( - self, - ): - return self._callback( - "ready_get", - ) + def dbus_ready_get(self, ): + return self._callback("ready_get", ) def dbus_roster_resync(self, profile_key="@DEFAULT@"): return self._callback("roster_resync", profile_key) @@ -530,12 +411,9 @@ def dbus_subscription(self, sub_type, entity, profile_key="@DEFAULT@"): return self._callback("subscription", sub_type, entity, profile_key) - def dbus_version_get( - self, - ): - return self._callback( - "version_get", - ) + def dbus_version_get(self, ): + return self._callback("version_get", ) + class bridge: @@ -582,39 +460,13 @@ self._obj.emitSignal("entity_data_updated", jid, name, value, profile) def message_encryption_started(self, to_jid, encryption_data, profile_key): - self._obj.emitSignal( - "message_encryption_started", to_jid, encryption_data, profile_key - ) + self._obj.emitSignal("message_encryption_started", to_jid, encryption_data, profile_key) def message_encryption_stopped(self, to_jid, encryption_data, profile_key): - self._obj.emitSignal( - "message_encryption_stopped", to_jid, encryption_data, profile_key - ) + self._obj.emitSignal("message_encryption_stopped", to_jid, encryption_data, profile_key) - def message_new( - self, - uid, - timestamp, - from_jid, - to_jid, - message, - subject, - mess_type, - extra, - profile, - ): - self._obj.emitSignal( - "message_new", - uid, - timestamp, - from_jid, - to_jid, - message, - subject, - mess_type, - extra, - profile, - ) + def message_new(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile): + self._obj.emitSignal("message_new", uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile) def message_update(self, uid, message_type, message_data, profile): self._obj.emitSignal("message_update", uid, message_type, message_data, profile) @@ -622,42 +474,14 @@ def notification_deleted(self, id, profile): self._obj.emitSignal("notification_deleted", id, profile) - def notification_new( - self, - id, - timestamp, - type, - body_plain, - body_rich, - title, - requires_action, - priority, - expire_at, - extra, - profile, - ): - self._obj.emitSignal( - "notification_new", - id, - timestamp, - type, - body_plain, - body_rich, - title, - requires_action, - priority, - expire_at, - extra, - profile, - ) + def notification_new(self, id, timestamp, type, body_plain, body_rich, title, requires_action, priority, expire_at, extra, profile): + self._obj.emitSignal("notification_new", id, timestamp, type, body_plain, body_rich, title, requires_action, priority, expire_at, extra, profile) def param_update(self, name, value, category, profile): self._obj.emitSignal("param_update", name, value, category, profile) def presence_update(self, entity_jid, show, priority, statuses, profile): - self._obj.emitSignal( - "presence_update", entity_jid, show, priority, statuses, profile - ) + self._obj.emitSignal("presence_update", entity_jid, show, priority, statuses, profile) def progress_error(self, id, error, profile): self._obj.emitSignal("progress_error", id, error, profile) @@ -700,4 +524,4 @@ """Dynamically add a signal to D-Bus bridge""" log.debug(f"Adding signal {name!r} to D-Bus bridge") self._obj.plugin_iface.addSignal(Signal(name, signature)) - setattr(bridge, name, partialmethod(bridge.emit_signal, name)) + setattr(bridge, name, partialmethod(bridge.emit_signal, name)) \ No newline at end of file
--- a/libervia/backend/bridge/pb.py Fri Jul 05 17:18:37 2024 +0200 +++ b/libervia/backend/bridge/pb.py Fri Jul 12 17:58:06 2024 +0200 @@ -164,6 +164,7 @@ """ self.root._bridge_reactivate_signals() + def _debug(self, action, params, profile): self.send_signal("_debug", action, params, profile) @@ -186,39 +187,13 @@ self.send_signal("entity_data_updated", jid, name, value, profile) def message_encryption_started(self, to_jid, encryption_data, profile_key): - self.send_signal( - "message_encryption_started", to_jid, encryption_data, profile_key - ) + self.send_signal("message_encryption_started", to_jid, encryption_data, profile_key) def message_encryption_stopped(self, to_jid, encryption_data, profile_key): - self.send_signal( - "message_encryption_stopped", to_jid, encryption_data, profile_key - ) + self.send_signal("message_encryption_stopped", to_jid, encryption_data, profile_key) - def message_new( - self, - uid, - timestamp, - from_jid, - to_jid, - message, - subject, - mess_type, - extra, - profile, - ): - self.send_signal( - "message_new", - uid, - timestamp, - from_jid, - to_jid, - message, - subject, - mess_type, - extra, - profile, - ) + def message_new(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile): + self.send_signal("message_new", uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile) def message_update(self, uid, message_type, message_data, profile): self.send_signal("message_update", uid, message_type, message_data, profile) @@ -226,34 +201,8 @@ def notification_deleted(self, id, profile): self.send_signal("notification_deleted", id, profile) - def notification_new( - self, - id, - timestamp, - type, - body_plain, - body_rich, - title, - requires_action, - priority, - expire_at, - extra, - profile, - ): - self.send_signal( - "notification_new", - id, - timestamp, - type, - body_plain, - body_rich, - title, - requires_action, - priority, - expire_at, - extra, - profile, - ) + def notification_new(self, id, timestamp, type, body_plain, body_rich, title, requires_action, priority, expire_at, extra, profile): + self.send_signal("notification_new", id, timestamp, type, body_plain, body_rich, title, requires_action, priority, expire_at, extra, profile) def param_update(self, name, value, category, profile): self.send_signal("param_update", name, value, category, profile)
--- a/libervia/frontends/bridge/dbus_bridge.py Fri Jul 05 17:18:37 2024 +0200 +++ b/libervia/frontends/bridge/dbus_bridge.py Fri Jul 12 17:58:06 2024 +0200 @@ -173,25 +173,15 @@ return get_plugin_method - def action_launch( - self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None - ): + + def action_launch(self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return str( - self.db_core_iface.action_launch( - callback_id, - data, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return str(self.db_core_iface.action_launch(callback_id, data, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)) def actions_get(self, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: @@ -199,12 +189,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.actions_get(profile_key, **kwargs) def config_get(self, section, name, callback=None, errback=None): @@ -213,69 +203,45 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return str(self.db_core_iface.config_get(section, name, **kwargs)) - def connect( - self, - profile_key="@DEFAULT@", - password="", - options={}, - callback=None, - errback=None, - ): + def connect(self, profile_key="@DEFAULT@", password='', options={}, callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.connect( - profile_key, - password, - options, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.connect(profile_key, password, options, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def contact_add( - self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None - ): + def contact_add(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.contact_add(entity_jid, profile_key, **kwargs) - def contact_del( - self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None - ): + def contact_del(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.contact_del( - entity_jid, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.contact_del(entity_jid, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def contact_get(self, arg_0, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: @@ -283,38 +249,22 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.contact_get( - arg_0, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.contact_get(arg_0, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def contact_update( - self, - entity_jid, - name, - groups, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def contact_update(self, entity_jid, name, groups, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler - return self.db_core_iface.contact_update( - entity_jid, name, groups, profile_key, **kwargs - ) + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler + return self.db_core_iface.contact_update(entity_jid, name, groups, profile_key, **kwargs) def contacts_get(self, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: @@ -322,28 +272,21 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.contacts_get( - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.contacts_get(profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def contacts_get_from_group( - self, group, profile_key="@DEFAULT@", callback=None, errback=None - ): + def contacts_get_from_group(self, group, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.contacts_get_from_group(group, profile_key, **kwargs) def devices_infos_get(self, bare_jid, profile_key, callback=None, errback=None): @@ -352,99 +295,35 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return str( - self.db_core_iface.devices_infos_get( - bare_jid, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return str(self.db_core_iface.devices_infos_get(bare_jid, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)) - 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, - ): + 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): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.disco_find_by_features( - namespaces, - identities, - bare_jid, - service, - roster, - own_jid, - local_device, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.disco_find_by_features(namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def disco_infos( - self, - entity_jid, - node="", - use_cache=True, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def disco_infos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.disco_infos( - entity_jid, - node, - use_cache, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.disco_infos(entity_jid, node, use_cache, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def disco_items( - self, - entity_jid, - node="", - use_cache=True, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def disco_items(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.disco_items( - entity_jid, - node, - use_cache, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.disco_items(entity_jid, node, use_cache, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def disconnect(self, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: @@ -452,13 +331,8 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.disconnect( - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.disconnect(profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def encryption_namespace_get(self, arg_0, callback=None, errback=None): if callback is None: @@ -466,12 +340,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return str(self.db_core_iface.encryption_namespace_get(arg_0, **kwargs)) def encryption_plugins_get(self, callback=None, errback=None): @@ -480,33 +354,22 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return str(self.db_core_iface.encryption_plugins_get(**kwargs)) - def encryption_trust_ui_get( - self, to_jid, namespace, profile_key, callback=None, errback=None - ): + def encryption_trust_ui_get(self, to_jid, namespace, profile_key, callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return str( - self.db_core_iface.encryption_trust_ui_get( - to_jid, - namespace, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return str(self.db_core_iface.encryption_trust_ui_get(to_jid, namespace, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)) def entities_data_get(self, jids, keys, profile, callback=None, errback=None): if callback is None: @@ -514,12 +377,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.entities_data_get(jids, keys, profile, **kwargs) def entity_data_get(self, jid, keys, profile, callback=None, errback=None): @@ -528,12 +391,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.entity_data_get(jid, keys, profile, **kwargs) def features_get(self, profile_key, callback=None, errback=None): @@ -542,42 +405,17 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.features_get( - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.features_get(profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def history_get( - self, - from_jid, - to_jid, - limit, - between=True, - filters="", - profile="@NONE@", - callback=None, - errback=None, - ): + def history_get(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.history_get( - from_jid, - to_jid, - limit, - between, - filters, - profile, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.history_get(from_jid, to_jid, limit, between, filters, profile, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def image_check(self, arg_0, callback=None, errback=None): if callback is None: @@ -585,12 +423,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return str(self.db_core_iface.image_check(arg_0, **kwargs)) def image_convert(self, source, dest, arg_2, extra, callback=None, errback=None): @@ -599,37 +437,17 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return str( - self.db_core_iface.image_convert( - source, - dest, - arg_2, - extra, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return str(self.db_core_iface.image_convert(source, dest, arg_2, extra, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)) - def image_generate_preview( - self, image_path, profile_key, callback=None, errback=None - ): + def image_generate_preview(self, image_path, profile_key, callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return str( - self.db_core_iface.image_generate_preview( - image_path, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return str(self.db_core_iface.image_generate_preview(image_path, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)) def image_resize(self, image_path, width, height, callback=None, errback=None): if callback is None: @@ -637,17 +455,8 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return str( - self.db_core_iface.image_resize( - image_path, - width, - height, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return str(self.db_core_iface.image_resize(image_path, width, height, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)) def init_pre_script(self, callback=None, errback=None): if callback is None: @@ -655,10 +464,8 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.init_pre_script( - timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.init_pre_script(timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def is_connected(self, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: @@ -666,31 +473,27 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.is_connected(profile_key, **kwargs) - def main_resource_get( - self, contact_jid, profile_key="@DEFAULT@", callback=None, errback=None - ): + def main_resource_get(self, contact_jid, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler - return str( - self.db_core_iface.main_resource_get(contact_jid, profile_key, **kwargs) - ) + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler + return str(self.db_core_iface.main_resource_get(contact_jid, profile_key, **kwargs)) def menu_help_get(self, menu_id, language, callback=None, errback=None): if callback is None: @@ -698,40 +501,22 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return str(self.db_core_iface.menu_help_get(menu_id, language, **kwargs)) - def menu_launch( - self, - menu_type, - path, - data, - security_limit, - profile_key, - callback=None, - errback=None, - ): + def menu_launch(self, menu_type, path, data, security_limit, profile_key, callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.menu_launch( - menu_type, - path, - data, - security_limit, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.menu_launch(menu_type, path, data, security_limit, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def menus_get(self, language, security_limit, callback=None, errback=None): if callback is None: @@ -739,12 +524,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.menus_get(language, security_limit, **kwargs) def message_encryption_get(self, to_jid, profile_key, callback=None, errback=None): @@ -753,40 +538,22 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler - return str( - self.db_core_iface.message_encryption_get(to_jid, profile_key, **kwargs) - ) + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler + return str(self.db_core_iface.message_encryption_get(to_jid, profile_key, **kwargs)) - def message_encryption_start( - self, - to_jid, - namespace="", - replace=False, - profile_key="@NONE@", - callback=None, - errback=None, - ): + def message_encryption_start(self, to_jid, namespace='', replace=False, profile_key="@NONE@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.message_encryption_start( - to_jid, - namespace, - replace, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.message_encryption_start(to_jid, namespace, replace, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def message_encryption_stop(self, to_jid, profile_key, callback=None, errback=None): if callback is None: @@ -794,43 +561,17 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.message_encryption_stop( - to_jid, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.message_encryption_stop(to_jid, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def message_send( - self, - to_jid, - message, - subject={}, - mess_type="auto", - extra={}, - profile_key="@NONE@", - callback=None, - errback=None, - ): + def message_send(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.message_send( - to_jid, - message, - subject, - mess_type, - extra, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.message_send(to_jid, message, subject, mess_type, extra, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def namespaces_get(self, callback=None, errback=None): if callback is None: @@ -838,89 +579,55 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.namespaces_get(**kwargs) - def notification_add( - self, - type_, - body_plain, - body_rich, - title, - is_global, - requires_action, - arg_6, - priority, - expire_at, - extra, - callback=None, - errback=None, - ): + def notification_add(self, type_, body_plain, body_rich, title, is_global, requires_action, arg_6, priority, expire_at, extra, callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler - return self.db_core_iface.notification_add( - type_, - body_plain, - body_rich, - title, - is_global, - requires_action, - arg_6, - priority, - expire_at, - extra, - **kwargs, - ) + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler + return self.db_core_iface.notification_add(type_, body_plain, body_rich, title, is_global, requires_action, arg_6, priority, expire_at, extra, **kwargs) - def notification_delete( - self, id_, is_global, profile_key, callback=None, errback=None - ): + def notification_delete(self, id_, is_global, profile_key, callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler - return self.db_core_iface.notification_delete( - id_, is_global, profile_key, **kwargs - ) + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler + return self.db_core_iface.notification_delete(id_, is_global, profile_key, **kwargs) - def notifications_expired_clean( - self, limit_timestamp, profile_key, callback=None, errback=None - ): + def notifications_expired_clean(self, limit_timestamp, profile_key, callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler - return self.db_core_iface.notifications_expired_clean( - limit_timestamp, profile_key, **kwargs - ) + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler + return self.db_core_iface.notifications_expired_clean(limit_timestamp, profile_key, **kwargs) def notifications_get(self, filters, profile_key, callback=None, errback=None): if callback is None: @@ -928,120 +635,59 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return str(self.db_core_iface.notifications_get(filters, profile_key, **kwargs)) - def param_get_a( - self, - name, - category, - attribute="value", - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): - if callback is None: - error_handler = None - else: - if errback is None: - errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} - if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler - return str( - self.db_core_iface.param_get_a( - name, category, attribute, profile_key, **kwargs - ) - ) - - def param_get_a_async( - self, - name, - category, - attribute="value", - security_limit=-1, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def param_get_a(self, name, category, attribute="value", profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return str( - self.db_core_iface.param_get_a_async( - name, - category, - attribute, - security_limit, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} + if callback is not None: + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler + return str(self.db_core_iface.param_get_a(name, category, attribute, profile_key, **kwargs)) - def param_set( - self, - name, - value, - category, - security_limit=-1, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def param_get_a_async(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} - if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler - return self.db_core_iface.param_set( - name, value, category, security_limit, profile_key, **kwargs - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return str(self.db_core_iface.param_get_a_async(name, category, attribute, security_limit, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)) - def param_ui_get( - self, - security_limit=-1, - app="", - extra="", - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def param_set(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return str( - self.db_core_iface.param_ui_get( - security_limit, - app, - extra, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} + if callback is not None: + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler + return self.db_core_iface.param_set(name, value, category, security_limit, profile_key, **kwargs) + + def param_ui_get(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@", callback=None, errback=None): + if callback is None: + error_handler = None + else: + if errback is None: + errback = log.error + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return str(self.db_core_iface.param_ui_get(security_limit, app, extra, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)) def params_categories_get(self, callback=None, errback=None): if callback is None: @@ -1049,28 +695,26 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.params_categories_get(**kwargs) - def params_register_app( - self, xml, security_limit=-1, app="", callback=None, errback=None - ): + def params_register_app(self, xml, security_limit=-1, app='', callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.params_register_app(xml, security_limit, app, **kwargs) def params_template_load(self, filename, callback=None, errback=None): @@ -1079,12 +723,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.params_template_load(filename, **kwargs) def params_template_save(self, filename, callback=None, errback=None): @@ -1093,64 +737,36 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.params_template_save(filename, **kwargs) - def params_values_from_category_get_async( - self, - category, - security_limit=-1, - app="", - extra="", - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def params_values_from_category_get_async(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.params_values_from_category_get_async( - category, - security_limit, - app, - extra, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.params_values_from_category_get_async(category, security_limit, app, extra, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def presence_set( - self, - to_jid="", - show="", - statuses={}, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def presence_set(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler - return self.db_core_iface.presence_set( - to_jid, show, statuses, profile_key, **kwargs - ) + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler + return self.db_core_iface.presence_set(to_jid, show, statuses, profile_key, **kwargs) def presence_statuses_get(self, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: @@ -1158,12 +774,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.presence_statuses_get(profile_key, **kwargs) def private_data_delete(self, namespace, key, arg_2, callback=None, errback=None): @@ -1172,15 +788,8 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.private_data_delete( - namespace, - key, - arg_2, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.private_data_delete(namespace, key, arg_2, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def private_data_get(self, namespace, key, profile_key, callback=None, errback=None): if callback is None: @@ -1188,54 +797,26 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return str( - self.db_core_iface.private_data_get( - namespace, - key, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return str(self.db_core_iface.private_data_get(namespace, key, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler)) - def private_data_set( - self, namespace, key, data, profile_key, callback=None, errback=None - ): + def private_data_set(self, namespace, key, data, profile_key, callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.private_data_set( - namespace, - key, - data, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.private_data_set(namespace, key, data, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def profile_create( - self, profile, password="", component="", callback=None, errback=None - ): + def profile_create(self, profile, password='', component='', callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.profile_create( - profile, - password, - component, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.profile_create(profile, password, component, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def profile_delete_async(self, profile, callback=None, errback=None): if callback is None: @@ -1243,28 +824,21 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.profile_delete_async( - profile, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.profile_delete_async(profile, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def profile_is_session_started( - self, profile_key="@DEFAULT@", callback=None, errback=None - ): + def profile_is_session_started(self, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.profile_is_session_started(profile_key, **kwargs) def profile_name_get(self, profile_key="@DEFAULT@", callback=None, errback=None): @@ -1273,12 +847,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return str(self.db_core_iface.profile_name_get(profile_key, **kwargs)) def profile_set_default(self, profile, callback=None, errback=None): @@ -1287,45 +861,35 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.profile_set_default(profile, **kwargs) - def profile_start_session( - self, password="", profile_key="@DEFAULT@", callback=None, errback=None - ): + def profile_start_session(self, password='', profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.profile_start_session( - password, - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.profile_start_session(password, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def profiles_list_get( - self, clients=True, components=False, callback=None, errback=None - ): + def profiles_list_get(self, clients=True, components=False, callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.profiles_list_get(clients, components, **kwargs) def progress_get(self, id, profile, callback=None, errback=None): @@ -1334,12 +898,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.progress_get(id, profile, **kwargs) def progress_get_all(self, profile, callback=None, errback=None): @@ -1348,12 +912,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.progress_get_all(profile, **kwargs) def progress_get_all_metadata(self, profile, callback=None, errback=None): @@ -1362,12 +926,12 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.progress_get_all_metadata(profile, **kwargs) def ready_get(self, callback=None, errback=None): @@ -1376,10 +940,8 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.ready_get( - timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.ready_get(timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def roster_resync(self, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: @@ -1387,13 +949,8 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.roster_resync( - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.roster_resync(profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def session_infos_get(self, profile_key, callback=None, errback=None): if callback is None: @@ -1401,13 +958,8 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.session_infos_get( - profile_key, - timeout=const_TIMEOUT, - reply_handler=callback, - error_handler=error_handler, - ) + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.session_infos_get(profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) def sub_waiting_get(self, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: @@ -1415,28 +967,26 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.sub_waiting_get(profile_key, **kwargs) - def subscription( - self, sub_type, entity, profile_key="@DEFAULT@", callback=None, errback=None - ): + def subscription(self, sub_type, entity, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return self.db_core_iface.subscription(sub_type, entity, profile_key, **kwargs) def version_get(self, callback=None, errback=None): @@ -1445,15 +995,16 @@ else: if errback is None: errback = log.error - error_handler = lambda err: errback(dbus_to_bridge_exception(err)) - kwargs = {} + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + kwargs={} if callback is not None: - kwargs["timeout"] = const_TIMEOUT - kwargs["reply_handler"] = callback - kwargs["error_handler"] = error_handler + kwargs['timeout'] = const_TIMEOUT + kwargs['reply_handler'] = callback + kwargs['error_handler'] = error_handler return str(self.db_core_iface.version_get(**kwargs)) + class AIOBridge(bridge): def register_signal(self, functionName, handler, iface="core"): @@ -1518,1216 +1069,571 @@ ) return fut + def action_launch(self, callback_id, data, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.action_launch( - callback_id, - data, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.action_launch(callback_id, data, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def actions_get(self, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.actions_get( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.actions_get(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def config_get(self, section, name): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.config_get( - section, - name, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.config_get(section, name, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def connect(self, profile_key="@DEFAULT@", password="", options={}): + def connect(self, profile_key="@DEFAULT@", password='', options={}): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.connect( - profile_key, - password, - options, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.connect(profile_key, password, options, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def contact_add(self, entity_jid, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.contact_add( - entity_jid, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.contact_add(entity_jid, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def contact_del(self, entity_jid, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.contact_del( - entity_jid, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.contact_del(entity_jid, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def contact_get(self, arg_0, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.contact_get( - arg_0, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.contact_get(arg_0, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def contact_update(self, entity_jid, name, groups, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.contact_update( - entity_jid, - name, - groups, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.contact_update(entity_jid, name, groups, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def contacts_get(self, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.contacts_get( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.contacts_get(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def contacts_get_from_group(self, group, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.contacts_get_from_group( - group, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.contacts_get_from_group(group, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def devices_infos_get(self, bare_jid, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.devices_infos_get( - bare_jid, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.devices_infos_get(bare_jid, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def disco_find_by_features( - self, - namespaces, - identities, - bare_jid=False, - service=True, - roster=True, - own_jid=True, - local_device=False, - profile_key="@DEFAULT@", - ): + def disco_find_by_features(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.disco_find_by_features( - namespaces, - identities, - bare_jid, - service, - roster, - own_jid, - local_device, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.disco_find_by_features(namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def disco_infos(self, entity_jid, node="", use_cache=True, profile_key="@DEFAULT@"): + def disco_infos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.disco_infos( - entity_jid, - node, - use_cache, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.disco_infos(entity_jid, node, use_cache, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def disco_items(self, entity_jid, node="", use_cache=True, profile_key="@DEFAULT@"): + def disco_items(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.disco_items( - entity_jid, - node, - use_cache, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.disco_items(entity_jid, node, use_cache, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def disconnect(self, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.disconnect( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.disconnect(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def encryption_namespace_get(self, arg_0): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.encryption_namespace_get( - arg_0, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.encryption_namespace_get(arg_0, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def encryption_plugins_get(self): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.encryption_plugins_get( - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.encryption_plugins_get(timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def encryption_trust_ui_get(self, to_jid, namespace, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.encryption_trust_ui_get( - to_jid, - namespace, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.encryption_trust_ui_get(to_jid, namespace, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def entities_data_get(self, jids, keys, profile): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.entities_data_get( - jids, - keys, - profile, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.entities_data_get(jids, keys, profile, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def entity_data_get(self, jid, keys, profile): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.entity_data_get( - jid, - keys, - profile, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.entity_data_get(jid, keys, profile, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def features_get(self, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.features_get( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.features_get(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def history_get( - self, from_jid, to_jid, limit, between=True, filters="", profile="@NONE@" - ): + def history_get(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.history_get( - from_jid, - to_jid, - limit, - between, - filters, - profile, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.history_get(from_jid, to_jid, limit, between, filters, profile, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def image_check(self, arg_0): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.image_check( - arg_0, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.image_check(arg_0, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def image_convert(self, source, dest, arg_2, extra): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.image_convert( - source, - dest, - arg_2, - extra, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.image_convert(source, dest, arg_2, extra, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def image_generate_preview(self, image_path, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.image_generate_preview( - image_path, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.image_generate_preview(image_path, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def image_resize(self, image_path, width, height): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.image_resize( - image_path, - width, - height, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.image_resize(image_path, width, height, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def init_pre_script(self): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.init_pre_script( - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.init_pre_script(timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def is_connected(self, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.is_connected( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.is_connected(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def main_resource_get(self, contact_jid, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.main_resource_get( - contact_jid, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.main_resource_get(contact_jid, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def menu_help_get(self, menu_id, language): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.menu_help_get( - menu_id, - language, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.menu_help_get(menu_id, language, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def menu_launch(self, menu_type, path, data, security_limit, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.menu_launch( - menu_type, - path, - data, - security_limit, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.menu_launch(menu_type, path, data, security_limit, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def menus_get(self, language, security_limit): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.menus_get( - language, - security_limit, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.menus_get(language, security_limit, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def message_encryption_get(self, to_jid, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.message_encryption_get( - to_jid, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.message_encryption_get(to_jid, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def message_encryption_start( - self, to_jid, namespace="", replace=False, profile_key="@NONE@" - ): + def message_encryption_start(self, to_jid, namespace='', replace=False, profile_key="@NONE@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.message_encryption_start( - to_jid, - namespace, - replace, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.message_encryption_start(to_jid, namespace, replace, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def message_encryption_stop(self, to_jid, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.message_encryption_stop( - to_jid, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.message_encryption_stop(to_jid, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def message_send( - self, - to_jid, - message, - subject={}, - mess_type="auto", - extra={}, - profile_key="@NONE@", - ): + def message_send(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.message_send( - to_jid, - message, - subject, - mess_type, - extra, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.message_send(to_jid, message, subject, mess_type, extra, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def namespaces_get(self): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.namespaces_get( - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.namespaces_get(timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def notification_add( - self, - type_, - body_plain, - body_rich, - title, - is_global, - requires_action, - arg_6, - priority, - expire_at, - extra, - ): + def notification_add(self, type_, body_plain, body_rich, title, is_global, requires_action, arg_6, priority, expire_at, extra): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.notification_add( - type_, - body_plain, - body_rich, - title, - is_global, - requires_action, - arg_6, - priority, - expire_at, - extra, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.notification_add(type_, body_plain, body_rich, title, is_global, requires_action, arg_6, priority, expire_at, extra, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def notification_delete(self, id_, is_global, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.notification_delete( - id_, - is_global, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.notification_delete(id_, is_global, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def notifications_expired_clean(self, limit_timestamp, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.notifications_expired_clean( - limit_timestamp, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.notifications_expired_clean(limit_timestamp, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def notifications_get(self, filters, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.notifications_get( - filters, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.notifications_get(filters, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def param_get_a(self, name, category, attribute="value", profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.param_get_a( - name, - category, - attribute, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.param_get_a(name, category, attribute, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def param_get_a_async( - self, - name, - category, - attribute="value", - security_limit=-1, - profile_key="@DEFAULT@", - ): + def param_get_a_async(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.param_get_a_async( - name, - category, - attribute, - security_limit, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.param_get_a_async(name, category, attribute, security_limit, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def param_set( - self, name, value, category, security_limit=-1, profile_key="@DEFAULT@" - ): + def param_set(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.param_set( - name, - value, - category, - security_limit, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.param_set(name, value, category, security_limit, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def param_ui_get(self, security_limit=-1, app="", extra="", profile_key="@DEFAULT@"): + def param_ui_get(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.param_ui_get( - security_limit, - app, - extra, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.param_ui_get(security_limit, app, extra, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def params_categories_get(self): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.params_categories_get( - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.params_categories_get(timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def params_register_app(self, xml, security_limit=-1, app=""): + def params_register_app(self, xml, security_limit=-1, app=''): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.params_register_app( - xml, - security_limit, - app, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.params_register_app(xml, security_limit, app, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def params_template_load(self, filename): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.params_template_load( - filename, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.params_template_load(filename, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def params_template_save(self, filename): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.params_template_save( - filename, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.params_template_save(filename, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def params_values_from_category_get_async( - self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@" - ): + def params_values_from_category_get_async(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.params_values_from_category_get_async( - category, - security_limit, - app, - extra, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.params_values_from_category_get_async(category, security_limit, app, extra, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def presence_set(self, to_jid="", show="", statuses={}, profile_key="@DEFAULT@"): + def presence_set(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.presence_set( - to_jid, - show, - statuses, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.presence_set(to_jid, show, statuses, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def presence_statuses_get(self, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.presence_statuses_get( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.presence_statuses_get(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def private_data_delete(self, namespace, key, arg_2): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.private_data_delete( - namespace, - key, - arg_2, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.private_data_delete(namespace, key, arg_2, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def private_data_get(self, namespace, key, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.private_data_get( - namespace, - key, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.private_data_get(namespace, key, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def private_data_set(self, namespace, key, data, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.private_data_set( - namespace, - key, - data, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.private_data_set(namespace, key, data, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def profile_create(self, profile, password="", component=""): + def profile_create(self, profile, password='', component=''): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.profile_create( - profile, - password, - component, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.profile_create(profile, password, component, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def profile_delete_async(self, profile): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.profile_delete_async( - profile, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.profile_delete_async(profile, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def profile_is_session_started(self, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.profile_is_session_started( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.profile_is_session_started(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def profile_name_get(self, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.profile_name_get( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.profile_name_get(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def profile_set_default(self, profile): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.profile_set_default( - profile, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.profile_set_default(profile, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut - def profile_start_session(self, password="", profile_key="@DEFAULT@"): + def profile_start_session(self, password='', profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.profile_start_session( - password, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.profile_start_session(password, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def profiles_list_get(self, clients=True, components=False): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.profiles_list_get( - clients, - components, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.profiles_list_get(clients, components, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def progress_get(self, id, profile): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.progress_get( - id, - profile, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.progress_get(id, profile, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def progress_get_all(self, profile): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.progress_get_all( - profile, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.progress_get_all(profile, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def progress_get_all_metadata(self, profile): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.progress_get_all_metadata( - profile, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.progress_get_all_metadata(profile, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def ready_get(self): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.ready_get( - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.ready_get(timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def roster_resync(self, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.roster_resync( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.roster_resync(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def session_infos_get(self, profile_key): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.session_infos_get( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.session_infos_get(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def sub_waiting_get(self, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.sub_waiting_get( - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.sub_waiting_get(profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def subscription(self, sub_type, entity, profile_key="@DEFAULT@"): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.subscription( - sub_type, - entity, - profile_key, - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.subscription(sub_type, entity, profile_key, timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut def version_get(self): loop = asyncio.get_running_loop() fut = loop.create_future() reply_handler = lambda ret=None: loop.call_soon_threadsafe(fut.set_result, ret) - error_handler = lambda err: loop.call_soon_threadsafe( - fut.set_exception, dbus_to_bridge_exception(err) - ) - self.db_core_iface.version_get( - timeout=const_TIMEOUT, - reply_handler=reply_handler, - error_handler=error_handler, - ) + error_handler = lambda err: loop.call_soon_threadsafe(fut.set_exception, dbus_to_bridge_exception(err)) + self.db_core_iface.version_get(timeout=const_TIMEOUT, reply_handler=reply_handler, error_handler=error_handler) return fut
--- a/libervia/frontends/bridge/pb.py Fri Jul 05 17:18:37 2024 +0200 +++ b/libervia/frontends/bridge/pb.py Fri Jul 12 17:58:06 2024 +0200 @@ -161,9 +161,8 @@ def register_signal(self, functionName, handler, iface="core"): self.signals_handler.register_signal(functionName, handler, iface) - def action_launch( - self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None - ): + + 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) @@ -190,14 +189,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def connect( - self, - profile_key="@DEFAULT@", - password="", - options={}, - callback=None, - errback=None, - ): + def connect(self, profile_key="@DEFAULT@", password='', options={}, callback=None, errback=None): d = self.root.callRemote("connect", profile_key, password, options) if callback is not None: d.addCallback(callback) @@ -206,9 +198,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def contact_add( - self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None - ): + 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()) @@ -217,9 +207,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def contact_del( - self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None - ): + 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()) @@ -237,15 +225,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def contact_update( - self, - entity_jid, - name, - groups, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + 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()) @@ -263,9 +243,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def contacts_get_from_group( - self, group, profile_key="@DEFAULT@", callback=None, errback=None - ): + 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) @@ -283,30 +261,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - 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, - ) + 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: @@ -314,15 +270,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def disco_infos( - self, - entity_jid, - node="", - use_cache=True, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + 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) @@ -331,15 +279,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def disco_items( - self, - entity_jid, - node="", - use_cache=True, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + 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) @@ -375,12 +315,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - 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 - ) + 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: @@ -415,20 +351,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - 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 - ) + 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: @@ -454,9 +378,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def image_generate_preview( - self, image_path, profile_key, callback=None, errback=None - ): + 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) @@ -492,9 +414,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def main_resource_get( - self, contact_jid, profile_key="@DEFAULT@", callback=None, errback=None - ): + 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) @@ -512,19 +432,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - 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 - ) + 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: @@ -550,18 +459,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - 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 - ) + 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: @@ -578,20 +477,8 @@ 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 - ) + 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: @@ -608,34 +495,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def notification_add( - self, - type_, - body_plain, - body_rich, - title, - is_global, - requires_action, - arg_6, - priority, - expire_at, - extra, - callback=None, - errback=None, - ): - d = self.root.callRemote( - "notification_add", - type_, - body_plain, - body_rich, - title, - is_global, - requires_action, - arg_6, - priority, - expire_at, - extra, - ) + def notification_add(self, type_, body_plain, body_rich, title, is_global, requires_action, arg_6, priority, expire_at, extra, callback=None, errback=None): + d = self.root.callRemote("notification_add", type_, body_plain, body_rich, title, is_global, requires_action, arg_6, priority, expire_at, extra) if callback is not None: d.addCallback(lambda __: callback()) if errback is None: @@ -643,9 +504,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def notification_delete( - self, id_, is_global, profile_key, callback=None, errback=None - ): + def notification_delete(self, id_, is_global, profile_key, callback=None, errback=None): d = self.root.callRemote("notification_delete", id_, is_global, profile_key) if callback is not None: d.addCallback(lambda __: callback()) @@ -654,12 +513,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - def notifications_expired_clean( - self, limit_timestamp, profile_key, callback=None, errback=None - ): - d = self.root.callRemote( - "notifications_expired_clean", limit_timestamp, profile_key - ) + def notifications_expired_clean(self, limit_timestamp, profile_key, callback=None, errback=None): + d = self.root.callRemote("notifications_expired_clean", limit_timestamp, profile_key) if callback is not None: d.addCallback(lambda __: callback()) if errback is None: @@ -676,15 +531,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def param_get_a( - self, - name, - category, - attribute="value", - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + 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) @@ -693,19 +540,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - 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 - ) + 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: @@ -713,19 +549,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - 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 - ) + 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(lambda __: callback()) if errback is None: @@ -733,15 +558,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def param_ui_get( - self, - security_limit=-1, - app="", - extra="", - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + 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) @@ -759,9 +576,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def params_register_app( - self, xml, security_limit=-1, app="", callback=None, errback=None - ): + 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()) @@ -788,24 +603,8 @@ else: d.addErrback(self._errback, ori_errback=errback) - 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, - ) + 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: @@ -813,15 +612,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def presence_set( - self, - to_jid="", - show="", - statuses={}, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + 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()) @@ -857,9 +648,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def private_data_set( - self, namespace, key, data, profile_key, callback=None, errback=None - ): + 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()) @@ -868,9 +657,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def profile_create( - self, profile, password="", component="", callback=None, errback=None - ): + 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()) @@ -888,9 +675,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def profile_is_session_started( - self, profile_key="@DEFAULT@", callback=None, errback=None - ): + 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) @@ -917,9 +702,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def profile_start_session( - self, password="", profile_key="@DEFAULT@", callback=None, errback=None - ): + 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) @@ -928,9 +711,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def profiles_list_get( - self, clients=True, components=False, callback=None, errback=None - ): + 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) @@ -1002,9 +783,7 @@ else: d.addErrback(self._errback, ori_errback=errback) - def subscription( - self, sub_type, entity, profile_key="@DEFAULT@", callback=None, errback=None - ): + def subscription(self, sub_type, entity, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("subscription", sub_type, entity, profile_key) if callback is not None: d.addCallback(lambda __: callback()) @@ -1023,6 +802,7 @@ d.addErrback(self._errback, ori_errback=errback) + class AIOSignalsHandler(SignalsHandler): def register_signal(self, name, handler, iface="core"): @@ -1052,6 +832,7 @@ d = super().bridge_connect(callback=None, errback=None) return await d.asFuture(asyncio.get_event_loop()) + 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) @@ -1067,7 +848,7 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def connect(self, profile_key="@DEFAULT@", password="", options={}): + def connect(self, profile_key="@DEFAULT@", password='', options={}): d = self.root.callRemote("connect", profile_key, password, options) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) @@ -1107,37 +888,17 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - 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, - ) + 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 disco_infos(self, entity_jid, node="", use_cache=True, profile_key="@DEFAULT@"): + 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="", use_cache=True, profile_key="@DEFAULT@"): + 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()) @@ -1158,9 +919,7 @@ return d.asFuture(asyncio.get_event_loop()) 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 = self.root.callRemote("encryption_trust_ui_get", to_jid, namespace, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) @@ -1179,12 +938,8 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - 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 - ) + 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()) @@ -1229,9 +984,7 @@ return d.asFuture(asyncio.get_event_loop()) 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 = self.root.callRemote("menu_launch", menu_type, path, data, security_limit, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) @@ -1245,12 +998,8 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - 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 - ) + 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()) @@ -1259,18 +1008,8 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - 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 - ) + 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()) @@ -1279,32 +1018,8 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def notification_add( - self, - type_, - body_plain, - body_rich, - title, - is_global, - requires_action, - arg_6, - priority, - expire_at, - extra, - ): - d = self.root.callRemote( - "notification_add", - type_, - body_plain, - body_rich, - title, - is_global, - requires_action, - arg_6, - priority, - expire_at, - extra, - ) + def notification_add(self, type_, body_plain, body_rich, title, is_global, requires_action, arg_6, priority, expire_at, extra): + d = self.root.callRemote("notification_add", type_, body_plain, body_rich, title, is_global, requires_action, arg_6, priority, expire_at, extra) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) @@ -1314,9 +1029,7 @@ return d.asFuture(asyncio.get_event_loop()) def notifications_expired_clean(self, limit_timestamp, profile_key): - d = self.root.callRemote( - "notifications_expired_clean", limit_timestamp, profile_key - ) + d = self.root.callRemote("notifications_expired_clean", limit_timestamp, profile_key) d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) @@ -1330,30 +1043,17 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - 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 - ) + 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 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 - ) + 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 param_ui_get(self, security_limit=-1, app="", extra="", profile_key="@DEFAULT@"): + 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()) @@ -1363,7 +1063,7 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def params_register_app(self, xml, security_limit=-1, app=""): + 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()) @@ -1378,21 +1078,12 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - 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, - ) + 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 presence_set(self, to_jid="", show="", statuses={}, profile_key="@DEFAULT@"): + 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()) @@ -1417,7 +1108,7 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def profile_create(self, profile, password="", component=""): + 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()) @@ -1442,7 +1133,7 @@ d.addErrback(self._errback) return d.asFuture(asyncio.get_event_loop()) - def profile_start_session(self, password="", profile_key="@DEFAULT@"): + 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())