Mercurial > libervia-backend

comparison sat/bridge/dbus_bridge.py @ 4037:524856bd7b19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
massive refactoring to switch from camelCase to snake_case: historically, Libervia (SàT before) was using camelCase as allowed by PEP8 when using a pre-PEP8 code, to use the same coding style as in Twisted. However, snake_case is more readable and it's better to follow PEP8 best practices, so it has been decided to move on full snake_case. Because Libervia has a huge codebase, this ended with a ugly mix of camelCase and snake_case. To fix that, this patch does a big refactoring by renaming every function and method (including bridge) that are not coming from Twisted or Wokkel, to use fully snake_case. This is a massive change, and may result in some bugs.
author Goffi <goffi@goffi.org>
date Sat, 08 Apr 2023 13:54:42 +0200
parents 60d3861e5996
children 2594e1951cf7
comparison
equal deleted inserted replaced
4036:c4464d7ae97b 4037:524856bd7b19
28 28
29 29
30 log = getLogger(__name__) 30 log = getLogger(__name__)
31 31
32 # Interface prefix 32 # Interface prefix
33 const_INT_PREFIX = config.getConfig( 33 const_INT_PREFIX = config.config_get(
34 config.parseMainConf(), 34 config.parse_main_conf(),
35 "", 35 "",
36 "bridge_dbus_int_prefix", 36 "bridge_dbus_int_prefix",
37 "org.libervia.Libervia") 37 "org.libervia.Libervia")
38 const_ERROR_PREFIX = const_INT_PREFIX + ".error" 38 const_ERROR_PREFIX = const_INT_PREFIX + ".error"
39 const_OBJ_PATH = "/org/libervia/Libervia/bridge" 39 const_OBJ_PATH = "/org/libervia/Libervia/bridge"
86 86
87 class DBusObject(objects.DBusObject): 87 class DBusObject(objects.DBusObject):
88 88
89 core_iface = DBusInterface( 89 core_iface = DBusInterface(
90 const_INT_PREFIX + const_CORE_SUFFIX, 90 const_INT_PREFIX + const_CORE_SUFFIX,
91 Method('actionsGet', arguments='s', returns='a(a{ss}si)'), 91 Method('action_launch', arguments='sa{ss}s', returns='a{ss}'),
92 Method('addContact', arguments='ss', returns=''), 92 Method('actions_get', arguments='s', returns='a(a{ss}si)'),
93 Method('asyncDeleteProfile', arguments='s', returns=''), 93 Method('config_get', arguments='ss', returns='s'),
94 Method('asyncGetParamA', arguments='sssis', returns='s'),
95 Method('asyncGetParamsValuesFromCategory', arguments='sisss', returns='a{ss}'),
96 Method('connect', arguments='ssa{ss}', returns='b'), 94 Method('connect', arguments='ssa{ss}', returns='b'),
97 Method('contactGet', arguments='ss', returns='(a{ss}as)'), 95 Method('contact_add', arguments='ss', returns=''),
98 Method('delContact', arguments='ss', returns=''), 96 Method('contact_del', arguments='ss', returns=''),
99 Method('devicesInfosGet', arguments='ss', returns='s'), 97 Method('contact_get', arguments='ss', returns='(a{ss}as)'),
100 Method('discoFindByFeatures', arguments='asa(ss)bbbbbs', returns='(a{sa(sss)}a{sa(sss)}a{sa(sss)})'), 98 Method('contact_update', arguments='ssass', returns=''),
101 Method('discoInfos', arguments='ssbs', returns='(asa(sss)a{sa(a{ss}as)})'), 99 Method('contacts_get', arguments='s', returns='a(sa{ss}as)'),
102 Method('discoItems', arguments='ssbs', returns='a(sss)'), 100 Method('contacts_get_from_group', arguments='ss', returns='as'),
101 Method('devices_infos_get', arguments='ss', returns='s'),
102 Method('disco_find_by_features', arguments='asa(ss)bbbbbs', returns='(a{sa(sss)}a{sa(sss)}a{sa(sss)})'),
103 Method('disco_infos', arguments='ssbs', returns='(asa(sss)a{sa(a{ss}as)})'),
104 Method('disco_items', arguments='ssbs', returns='a(sss)'),
103 Method('disconnect', arguments='s', returns=''), 105 Method('disconnect', arguments='s', returns=''),
104 Method('encryptionNamespaceGet', arguments='s', returns='s'), 106 Method('encryption_namespace_get', arguments='s', returns='s'),
105 Method('encryptionPluginsGet', arguments='', returns='s'), 107 Method('encryption_plugins_get', arguments='', returns='s'),
106 Method('encryptionTrustUIGet', arguments='sss', returns='s'), 108 Method('encryption_trust_ui_get', arguments='sss', returns='s'),
107 Method('getConfig', arguments='ss', returns='s'), 109 Method('entities_data_get', arguments='asass', returns='a{sa{ss}}'),
108 Method('getContacts', arguments='s', returns='a(sa{ss}as)'), 110 Method('entity_data_get', arguments='sass', returns='a{ss}'),
109 Method('getContactsFromGroup', arguments='ss', returns='as'), 111 Method('features_get', arguments='s', returns='a{sa{ss}}'),
110 Method('getEntitiesData', arguments='asass', returns='a{sa{ss}}'), 112 Method('history_get', arguments='ssiba{ss}s', returns='a(sdssa{ss}a{ss}ss)'),
111 Method('getEntityData', arguments='sass', returns='a{ss}'), 113 Method('image_check', arguments='s', returns='s'),
112 Method('getFeatures', arguments='s', returns='a{sa{ss}}'), 114 Method('image_convert', arguments='ssss', returns='s'),
113 Method('getMainResource', arguments='ss', returns='s'), 115 Method('image_generate_preview', arguments='ss', returns='s'),
114 Method('getParamA', arguments='ssss', returns='s'), 116 Method('image_resize', arguments='sii', returns='s'),
115 Method('getParamsCategories', arguments='', returns='as'), 117 Method('is_connected', arguments='s', returns='b'),
116 Method('getParamsUI', arguments='isss', returns='s'), 118 Method('main_resource_get', arguments='ss', returns='s'),
117 Method('getPresenceStatuses', arguments='s', returns='a{sa{s(sia{ss})}}'), 119 Method('menu_help_get', arguments='ss', returns='s'),
118 Method('getReady', arguments='', returns=''), 120 Method('menu_launch', arguments='sasa{ss}is', returns='a{ss}'),
119 Method('getVersion', arguments='', returns='s'), 121 Method('menus_get', arguments='si', returns='a(ssasasa{ss})'),
120 Method('getWaitingSub', arguments='s', returns='a{ss}'), 122 Method('message_encryption_get', arguments='ss', returns='s'),
121 Method('historyGet', arguments='ssiba{ss}s', returns='a(sdssa{ss}a{ss}ss)'), 123 Method('message_encryption_start', arguments='ssbs', returns=''),
122 Method('imageCheck', arguments='s', returns='s'), 124 Method('message_encryption_stop', arguments='ss', returns=''),
123 Method('imageConvert', arguments='ssss', returns='s'), 125 Method('message_send', arguments='sa{ss}a{ss}sss', returns=''),
124 Method('imageGeneratePreview', arguments='ss', returns='s'), 126 Method('namespaces_get', arguments='', returns='a{ss}'),
125 Method('imageResize', arguments='sii', returns='s'), 127 Method('param_get_a', arguments='ssss', returns='s'),
126 Method('isConnected', arguments='s', returns='b'), 128 Method('param_get_a_async', arguments='sssis', returns='s'),
127 Method('launchAction', arguments='sa{ss}s', returns='a{ss}'), 129 Method('param_set', arguments='sssis', returns=''),
128 Method('loadParamsTemplate', arguments='s', returns='b'), 130 Method('param_ui_get', arguments='isss', returns='s'),
129 Method('menuHelpGet', arguments='ss', returns='s'), 131 Method('params_categories_get', arguments='', returns='as'),
130 Method('menuLaunch', arguments='sasa{ss}is', returns='a{ss}'), 132 Method('params_register_app', arguments='sis', returns=''),
131 Method('menusGet', arguments='si', returns='a(ssasasa{ss})'), 133 Method('params_template_load', arguments='s', returns='b'),
132 Method('messageEncryptionGet', arguments='ss', returns='s'), 134 Method('params_template_save', arguments='s', returns='b'),
133 Method('messageEncryptionStart', arguments='ssbs', returns=''), 135 Method('params_values_from_category_get_async', arguments='sisss', returns='a{ss}'),
134 Method('messageEncryptionStop', arguments='ss', returns=''), 136 Method('presence_set', arguments='ssa{ss}s', returns=''),
135 Method('messageSend', arguments='sa{ss}a{ss}sss', returns=''), 137 Method('presence_statuses_get', arguments='s', returns='a{sa{s(sia{ss})}}'),
136 Method('namespacesGet', arguments='', returns='a{ss}'), 138 Method('private_data_delete', arguments='sss', returns=''),
137 Method('paramsRegisterApp', arguments='sis', returns=''), 139 Method('private_data_get', arguments='sss', returns='s'),
138 Method('privateDataDelete', arguments='sss', returns=''), 140 Method('private_data_set', arguments='ssss', returns=''),
139 Method('privateDataGet', arguments='sss', returns='s'), 141 Method('profile_create', arguments='sss', returns=''),
140 Method('privateDataSet', arguments='ssss', returns=''), 142 Method('profile_delete_async', arguments='s', returns=''),
141 Method('profileCreate', arguments='sss', returns=''), 143 Method('profile_is_session_started', arguments='s', returns='b'),
142 Method('profileIsSessionStarted', arguments='s', returns='b'), 144 Method('profile_name_get', arguments='s', returns='s'),
143 Method('profileNameGet', arguments='s', returns='s'), 145 Method('profile_set_default', arguments='s', returns=''),
144 Method('profileSetDefault', arguments='s', returns=''), 146 Method('profile_start_session', arguments='ss', returns='b'),
145 Method('profileStartSession', arguments='ss', returns='b'), 147 Method('profiles_list_get', arguments='bb', returns='as'),
146 Method('profilesListGet', arguments='bb', returns='as'), 148 Method('progress_get', arguments='ss', returns='a{ss}'),
147 Method('progressGet', arguments='ss', returns='a{ss}'), 149 Method('progress_get_all', arguments='s', returns='a{sa{sa{ss}}}'),
148 Method('progressGetAll', arguments='s', returns='a{sa{sa{ss}}}'), 150 Method('progress_get_all_metadata', arguments='s', returns='a{sa{sa{ss}}}'),
149 Method('progressGetAllMetadata', arguments='s', returns='a{sa{sa{ss}}}'), 151 Method('ready_get', arguments='', returns=''),
150 Method('rosterResync', arguments='s', returns=''), 152 Method('roster_resync', arguments='s', returns=''),
151 Method('saveParamsTemplate', arguments='s', returns='b'), 153 Method('session_infos_get', arguments='s', returns='a{ss}'),
152 Method('sessionInfosGet', arguments='s', returns='a{ss}'), 154 Method('sub_waiting_get', arguments='s', returns='a{ss}'),
153 Method('setParam', arguments='sssis', returns=''),
154 Method('setPresence', arguments='ssa{ss}s', returns=''),
155 Method('subscription', arguments='sss', returns=''), 155 Method('subscription', arguments='sss', returns=''),
156 Method('updateContact', arguments='ssass', returns=''), 156 Method('version_get', arguments='', returns='s'),
157 Signal('_debug', 'sa{ss}s'), 157 Signal('_debug', 'sa{ss}s'),
158 Signal('actionNew', 'a{ss}sis'), 158 Signal('action_new', 'a{ss}sis'),
159 Signal('connected', 'ss'), 159 Signal('connected', 'ss'),
160 Signal('contactDeleted', 'ss'), 160 Signal('contact_deleted', 'ss'),
161 Signal('contact_new', 'sa{ss}ass'),
161 Signal('disconnected', 's'), 162 Signal('disconnected', 's'),
162 Signal('entityDataUpdated', 'ssss'), 163 Signal('entity_data_updated', 'ssss'),
163 Signal('messageEncryptionStarted', 'sss'), 164 Signal('message_encryption_started', 'sss'),
164 Signal('messageEncryptionStopped', 'sa{ss}s'), 165 Signal('message_encryption_stopped', 'sa{ss}s'),
165 Signal('messageNew', 'sdssa{ss}a{ss}sss'), 166 Signal('message_new', 'sdssa{ss}a{ss}sss'),
166 Signal('newContact', 'sa{ss}ass'), 167 Signal('param_update', 'ssss'),
167 Signal('paramUpdate', 'ssss'), 168 Signal('presence_update', 'ssia{ss}s'),
168 Signal('presenceUpdate', 'ssia{ss}s'), 169 Signal('progress_error', 'sss'),
169 Signal('progressError', 'sss'), 170 Signal('progress_finished', 'sa{ss}s'),
170 Signal('progressFinished', 'sa{ss}s'), 171 Signal('progress_started', 'sa{ss}s'),
171 Signal('progressStarted', 'sa{ss}s'),
172 Signal('subscribe', 'sss'), 172 Signal('subscribe', 'sss'),
173 ) 173 )
174 plugin_iface = DBusInterface( 174 plugin_iface = DBusInterface(
175 const_INT_PREFIX + const_PLUGIN_SUFFIX 175 const_INT_PREFIX + const_PLUGIN_SUFFIX
176 ) 176 )
194 else: 194 else:
195 d = defer.maybeDeferred(cb, *args, **kwargs) 195 d = defer.maybeDeferred(cb, *args, **kwargs)
196 d.addErrback(GenericException.create_and_raise) 196 d.addErrback(GenericException.create_and_raise)
197 return d 197 return d
198 198
199 def dbus_actionsGet(self, profile_key="@DEFAULT@"): 199 def dbus_action_launch(self, callback_id, data, profile_key="@DEFAULT@"):
200 return self._callback("actionsGet", profile_key) 200 return self._callback("action_launch", callback_id, data, profile_key)
201 201
202 def dbus_addContact(self, entity_jid, profile_key="@DEFAULT@"): 202 def dbus_actions_get(self, profile_key="@DEFAULT@"):
203 return self._callback("addContact", entity_jid, profile_key) 203 return self._callback("actions_get", profile_key)
204 204
205 def dbus_asyncDeleteProfile(self, profile): 205 def dbus_config_get(self, section, name):
206 return self._callback("asyncDeleteProfile", profile) 206 return self._callback("config_get", section, name)
207
208 def dbus_asyncGetParamA(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@"):
209 return self._callback("asyncGetParamA", name, category, attribute, security_limit, profile_key)
210
211 def dbus_asyncGetParamsValuesFromCategory(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@"):
212 return self._callback("asyncGetParamsValuesFromCategory", category, security_limit, app, extra, profile_key)
213 207
214 def dbus_connect(self, profile_key="@DEFAULT@", password='', options={}): 208 def dbus_connect(self, profile_key="@DEFAULT@", password='', options={}):
215 return self._callback("connect", profile_key, password, options) 209 return self._callback("connect", profile_key, password, options)
216 210
217 def dbus_contactGet(self, arg_0, profile_key="@DEFAULT@"): 211 def dbus_contact_add(self, entity_jid, profile_key="@DEFAULT@"):
218 return self._callback("contactGet", arg_0, profile_key) 212 return self._callback("contact_add", entity_jid, profile_key)
219 213
220 def dbus_delContact(self, entity_jid, profile_key="@DEFAULT@"): 214 def dbus_contact_del(self, entity_jid, profile_key="@DEFAULT@"):
221 return self._callback("delContact", entity_jid, profile_key) 215 return self._callback("contact_del", entity_jid, profile_key)
222 216
223 def dbus_devicesInfosGet(self, bare_jid, profile_key): 217 def dbus_contact_get(self, arg_0, profile_key="@DEFAULT@"):
224 return self._callback("devicesInfosGet", bare_jid, profile_key) 218 return self._callback("contact_get", arg_0, profile_key)
225 219
226 def dbus_discoFindByFeatures(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key="@DEFAULT@"): 220 def dbus_contact_update(self, entity_jid, name, groups, profile_key="@DEFAULT@"):
227 return self._callback("discoFindByFeatures", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key) 221 return self._callback("contact_update", entity_jid, name, groups, profile_key)
228 222
229 def dbus_discoInfos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): 223 def dbus_contacts_get(self, profile_key="@DEFAULT@"):
230 return self._callback("discoInfos", entity_jid, node, use_cache, profile_key) 224 return self._callback("contacts_get", profile_key)
231 225
232 def dbus_discoItems(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"): 226 def dbus_contacts_get_from_group(self, group, profile_key="@DEFAULT@"):
233 return self._callback("discoItems", entity_jid, node, use_cache, profile_key) 227 return self._callback("contacts_get_from_group", group, profile_key)
228
229 def dbus_devices_infos_get(self, bare_jid, profile_key):
230 return self._callback("devices_infos_get", bare_jid, profile_key)
231
232 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@"):
233 return self._callback("disco_find_by_features", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key)
234
235 def dbus_disco_infos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"):
236 return self._callback("disco_infos", entity_jid, node, use_cache, profile_key)
237
238 def dbus_disco_items(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@"):
239 return self._callback("disco_items", entity_jid, node, use_cache, profile_key)
234 240
235 def dbus_disconnect(self, profile_key="@DEFAULT@"): 241 def dbus_disconnect(self, profile_key="@DEFAULT@"):
236 return self._callback("disconnect", profile_key) 242 return self._callback("disconnect", profile_key)
237 243
238 def dbus_encryptionNamespaceGet(self, arg_0): 244 def dbus_encryption_namespace_get(self, arg_0):
239 return self._callback("encryptionNamespaceGet", arg_0) 245 return self._callback("encryption_namespace_get", arg_0)
240 246
241 def dbus_encryptionPluginsGet(self, ): 247 def dbus_encryption_plugins_get(self, ):
242 return self._callback("encryptionPluginsGet", ) 248 return self._callback("encryption_plugins_get", )
243 249
244 def dbus_encryptionTrustUIGet(self, to_jid, namespace, profile_key): 250 def dbus_encryption_trust_ui_get(self, to_jid, namespace, profile_key):
245 return self._callback("encryptionTrustUIGet", to_jid, namespace, profile_key) 251 return self._callback("encryption_trust_ui_get", to_jid, namespace, profile_key)
246 252
247 def dbus_getConfig(self, section, name): 253 def dbus_entities_data_get(self, jids, keys, profile):
248 return self._callback("getConfig", section, name) 254 return self._callback("entities_data_get", jids, keys, profile)
249 255
250 def dbus_getContacts(self, profile_key="@DEFAULT@"): 256 def dbus_entity_data_get(self, jid, keys, profile):
251 return self._callback("getContacts", profile_key) 257 return self._callback("entity_data_get", jid, keys, profile)
252 258
253 def dbus_getContactsFromGroup(self, group, profile_key="@DEFAULT@"): 259 def dbus_features_get(self, profile_key):
254 return self._callback("getContactsFromGroup", group, profile_key) 260 return self._callback("features_get", profile_key)
255 261
256 def dbus_getEntitiesData(self, jids, keys, profile): 262 def dbus_history_get(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@"):
257 return self._callback("getEntitiesData", jids, keys, profile) 263 return self._callback("history_get", from_jid, to_jid, limit, between, filters, profile)
258 264
259 def dbus_getEntityData(self, jid, keys, profile): 265 def dbus_image_check(self, arg_0):
260 return self._callback("getEntityData", jid, keys, profile) 266 return self._callback("image_check", arg_0)
261 267
262 def dbus_getFeatures(self, profile_key): 268 def dbus_image_convert(self, source, dest, arg_2, extra):
263 return self._callback("getFeatures", profile_key) 269 return self._callback("image_convert", source, dest, arg_2, extra)
264 270
265 def dbus_getMainResource(self, contact_jid, profile_key="@DEFAULT@"): 271 def dbus_image_generate_preview(self, image_path, profile_key):
266 return self._callback("getMainResource", contact_jid, profile_key) 272 return self._callback("image_generate_preview", image_path, profile_key)
267 273
268 def dbus_getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"): 274 def dbus_image_resize(self, image_path, width, height):
269 return self._callback("getParamA", name, category, attribute, profile_key) 275 return self._callback("image_resize", image_path, width, height)
270 276
271 def dbus_getParamsCategories(self, ): 277 def dbus_is_connected(self, profile_key="@DEFAULT@"):
272 return self._callback("getParamsCategories", ) 278 return self._callback("is_connected", profile_key)
273 279
274 def dbus_getParamsUI(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@"): 280 def dbus_main_resource_get(self, contact_jid, profile_key="@DEFAULT@"):
275 return self._callback("getParamsUI", security_limit, app, extra, profile_key) 281 return self._callback("main_resource_get", contact_jid, profile_key)
276 282
277 def dbus_getPresenceStatuses(self, profile_key="@DEFAULT@"): 283 def dbus_menu_help_get(self, menu_id, language):
278 return self._callback("getPresenceStatuses", profile_key) 284 return self._callback("menu_help_get", menu_id, language)
279 285
280 def dbus_getReady(self, ): 286 def dbus_menu_launch(self, menu_type, path, data, security_limit, profile_key):
281 return self._callback("getReady", ) 287 return self._callback("menu_launch", menu_type, path, data, security_limit, profile_key)
282 288
283 def dbus_getVersion(self, ): 289 def dbus_menus_get(self, language, security_limit):
284 return self._callback("getVersion", ) 290 return self._callback("menus_get", language, security_limit)
285 291
286 def dbus_getWaitingSub(self, profile_key="@DEFAULT@"): 292 def dbus_message_encryption_get(self, to_jid, profile_key):
287 return self._callback("getWaitingSub", profile_key) 293 return self._callback("message_encryption_get", to_jid, profile_key)
288 294
289 def dbus_historyGet(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@"): 295 def dbus_message_encryption_start(self, to_jid, namespace='', replace=False, profile_key="@NONE@"):
290 return self._callback("historyGet", from_jid, to_jid, limit, between, filters, profile) 296 return self._callback("message_encryption_start", to_jid, namespace, replace, profile_key)
291 297
292 def dbus_imageCheck(self, arg_0): 298 def dbus_message_encryption_stop(self, to_jid, profile_key):
293 return self._callback("imageCheck", arg_0) 299 return self._callback("message_encryption_stop", to_jid, profile_key)
294 300
295 def dbus_imageConvert(self, source, dest, arg_2, extra): 301 def dbus_message_send(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@"):
296 return self._callback("imageConvert", source, dest, arg_2, extra) 302 return self._callback("message_send", to_jid, message, subject, mess_type, extra, profile_key)
297 303
298 def dbus_imageGeneratePreview(self, image_path, profile_key): 304 def dbus_namespaces_get(self, ):
299 return self._callback("imageGeneratePreview", image_path, profile_key) 305 return self._callback("namespaces_get", )
300 306
301 def dbus_imageResize(self, image_path, width, height): 307 def dbus_param_get_a(self, name, category, attribute="value", profile_key="@DEFAULT@"):
302 return self._callback("imageResize", image_path, width, height) 308 return self._callback("param_get_a", name, category, attribute, profile_key)
303 309
304 def dbus_isConnected(self, profile_key="@DEFAULT@"): 310 def dbus_param_get_a_async(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@"):
305 return self._callback("isConnected", profile_key) 311 return self._callback("param_get_a_async", name, category, attribute, security_limit, profile_key)
306 312
307 def dbus_launchAction(self, callback_id, data, profile_key="@DEFAULT@"): 313 def dbus_param_set(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"):
308 return self._callback("launchAction", callback_id, data, profile_key) 314 return self._callback("param_set", name, value, category, security_limit, profile_key)
309 315
310 def dbus_loadParamsTemplate(self, filename): 316 def dbus_param_ui_get(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@"):
311 return self._callback("loadParamsTemplate", filename) 317 return self._callback("param_ui_get", security_limit, app, extra, profile_key)
312 318
313 def dbus_menuHelpGet(self, menu_id, language): 319 def dbus_params_categories_get(self, ):
314 return self._callback("menuHelpGet", menu_id, language) 320 return self._callback("params_categories_get", )
315 321
316 def dbus_menuLaunch(self, menu_type, path, data, security_limit, profile_key): 322 def dbus_params_register_app(self, xml, security_limit=-1, app=''):
317 return self._callback("menuLaunch", menu_type, path, data, security_limit, profile_key) 323 return self._callback("params_register_app", xml, security_limit, app)
318 324
319 def dbus_menusGet(self, language, security_limit): 325 def dbus_params_template_load(self, filename):
320 return self._callback("menusGet", language, security_limit) 326 return self._callback("params_template_load", filename)
321 327
322 def dbus_messageEncryptionGet(self, to_jid, profile_key): 328 def dbus_params_template_save(self, filename):
323 return self._callback("messageEncryptionGet", to_jid, profile_key) 329 return self._callback("params_template_save", filename)
324 330
325 def dbus_messageEncryptionStart(self, to_jid, namespace='', replace=False, profile_key="@NONE@"): 331 def dbus_params_values_from_category_get_async(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@"):
326 return self._callback("messageEncryptionStart", to_jid, namespace, replace, profile_key) 332 return self._callback("params_values_from_category_get_async", category, security_limit, app, extra, profile_key)
327 333
328 def dbus_messageEncryptionStop(self, to_jid, profile_key): 334 def dbus_presence_set(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@"):
329 return self._callback("messageEncryptionStop", to_jid, profile_key) 335 return self._callback("presence_set", to_jid, show, statuses, profile_key)
330 336
331 def dbus_messageSend(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@"): 337 def dbus_presence_statuses_get(self, profile_key="@DEFAULT@"):
332 return self._callback("messageSend", to_jid, message, subject, mess_type, extra, profile_key) 338 return self._callback("presence_statuses_get", profile_key)
333 339
334 def dbus_namespacesGet(self, ): 340 def dbus_private_data_delete(self, namespace, key, arg_2):
335 return self._callback("namespacesGet", ) 341 return self._callback("private_data_delete", namespace, key, arg_2)
336 342
337 def dbus_paramsRegisterApp(self, xml, security_limit=-1, app=''): 343 def dbus_private_data_get(self, namespace, key, profile_key):
338 return self._callback("paramsRegisterApp", xml, security_limit, app) 344 return self._callback("private_data_get", namespace, key, profile_key)
339 345
340 def dbus_privateDataDelete(self, namespace, key, arg_2): 346 def dbus_private_data_set(self, namespace, key, data, profile_key):
341 return self._callback("privateDataDelete", namespace, key, arg_2) 347 return self._callback("private_data_set", namespace, key, data, profile_key)
342 348
343 def dbus_privateDataGet(self, namespace, key, profile_key): 349 def dbus_profile_create(self, profile, password='', component=''):
344 return self._callback("privateDataGet", namespace, key, profile_key) 350 return self._callback("profile_create", profile, password, component)
345 351
346 def dbus_privateDataSet(self, namespace, key, data, profile_key): 352 def dbus_profile_delete_async(self, profile):
347 return self._callback("privateDataSet", namespace, key, data, profile_key) 353 return self._callback("profile_delete_async", profile)
348 354
349 def dbus_profileCreate(self, profile, password='', component=''): 355 def dbus_profile_is_session_started(self, profile_key="@DEFAULT@"):
350 return self._callback("profileCreate", profile, password, component) 356 return self._callback("profile_is_session_started", profile_key)
351 357
352 def dbus_profileIsSessionStarted(self, profile_key="@DEFAULT@"): 358 def dbus_profile_name_get(self, profile_key="@DEFAULT@"):
353 return self._callback("profileIsSessionStarted", profile_key) 359 return self._callback("profile_name_get", profile_key)
354 360
355 def dbus_profileNameGet(self, profile_key="@DEFAULT@"): 361 def dbus_profile_set_default(self, profile):
356 return self._callback("profileNameGet", profile_key) 362 return self._callback("profile_set_default", profile)
357 363
358 def dbus_profileSetDefault(self, profile): 364 def dbus_profile_start_session(self, password='', profile_key="@DEFAULT@"):
359 return self._callback("profileSetDefault", profile) 365 return self._callback("profile_start_session", password, profile_key)
360 366
361 def dbus_profileStartSession(self, password='', profile_key="@DEFAULT@"): 367 def dbus_profiles_list_get(self, clients=True, components=False):
362 return self._callback("profileStartSession", password, profile_key) 368 return self._callback("profiles_list_get", clients, components)
363 369
364 def dbus_profilesListGet(self, clients=True, components=False): 370 def dbus_progress_get(self, id, profile):
365 return self._callback("profilesListGet", clients, components) 371 return self._callback("progress_get", id, profile)
366 372
367 def dbus_progressGet(self, id, profile): 373 def dbus_progress_get_all(self, profile):
368 return self._callback("progressGet", id, profile) 374 return self._callback("progress_get_all", profile)
369 375
370 def dbus_progressGetAll(self, profile): 376 def dbus_progress_get_all_metadata(self, profile):
371 return self._callback("progressGetAll", profile) 377 return self._callback("progress_get_all_metadata", profile)
372 378
373 def dbus_progressGetAllMetadata(self, profile): 379 def dbus_ready_get(self, ):
374 return self._callback("progressGetAllMetadata", profile) 380 return self._callback("ready_get", )
375 381
376 def dbus_rosterResync(self, profile_key="@DEFAULT@"): 382 def dbus_roster_resync(self, profile_key="@DEFAULT@"):
377 return self._callback("rosterResync", profile_key) 383 return self._callback("roster_resync", profile_key)
378 384
379 def dbus_saveParamsTemplate(self, filename): 385 def dbus_session_infos_get(self, profile_key):
380 return self._callback("saveParamsTemplate", filename) 386 return self._callback("session_infos_get", profile_key)
381 387
382 def dbus_sessionInfosGet(self, profile_key): 388 def dbus_sub_waiting_get(self, profile_key="@DEFAULT@"):
383 return self._callback("sessionInfosGet", profile_key) 389 return self._callback("sub_waiting_get", profile_key)
384
385 def dbus_setParam(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"):
386 return self._callback("setParam", name, value, category, security_limit, profile_key)
387
388 def dbus_setPresence(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@"):
389 return self._callback("setPresence", to_jid, show, statuses, profile_key)
390 390
391 def dbus_subscription(self, sub_type, entity, profile_key="@DEFAULT@"): 391 def dbus_subscription(self, sub_type, entity, profile_key="@DEFAULT@"):
392 return self._callback("subscription", sub_type, entity, profile_key) 392 return self._callback("subscription", sub_type, entity, profile_key)
393 393
394 def dbus_updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@"): 394 def dbus_version_get(self, ):
395 return self._callback("updateContact", entity_jid, name, groups, profile_key) 395 return self._callback("version_get", )
396 396
397 397
398 class Bridge: 398 class bridge:
399 399
400 def __init__(self): 400 def __init__(self):
401 log.info("Init DBus...") 401 log.info("Init DBus...")
402 self._obj = DBusObject(const_OBJ_PATH) 402 self._obj = DBusObject(const_OBJ_PATH)
403 403
404 async def postInit(self): 404 async def post_init(self):
405 try: 405 try:
406 conn = await client.connect(reactor) 406 conn = await client.connect(reactor)
407 except error.DBusException as e: 407 except error.DBusException as e:
408 if e.errName == "org.freedesktop.DBus.Error.NotSupported": 408 if e.errName == "org.freedesktop.DBus.Error.NotSupported":
409 log.error( 409 log.error(
418 await conn.requestBusName(const_INT_PREFIX) 418 await conn.requestBusName(const_INT_PREFIX)
419 419
420 def _debug(self, action, params, profile): 420 def _debug(self, action, params, profile):
421 self._obj.emitSignal("_debug", action, params, profile) 421 self._obj.emitSignal("_debug", action, params, profile)
422 422
423 def actionNew(self, action_data, id, security_limit, profile): 423 def action_new(self, action_data, id, security_limit, profile):
424 self._obj.emitSignal("actionNew", action_data, id, security_limit, profile) 424 self._obj.emitSignal("action_new", action_data, id, security_limit, profile)
425 425
426 def connected(self, jid_s, profile): 426 def connected(self, jid_s, profile):
427 self._obj.emitSignal("connected", jid_s, profile) 427 self._obj.emitSignal("connected", jid_s, profile)
428 428
429 def contactDeleted(self, entity_jid, profile): 429 def contact_deleted(self, entity_jid, profile):
430 self._obj.emitSignal("contactDeleted", entity_jid, profile) 430 self._obj.emitSignal("contact_deleted", entity_jid, profile)
431
432 def contact_new(self, contact_jid, attributes, groups, profile):
433 self._obj.emitSignal("contact_new", contact_jid, attributes, groups, profile)
431 434
432 def disconnected(self, profile): 435 def disconnected(self, profile):
433 self._obj.emitSignal("disconnected", profile) 436 self._obj.emitSignal("disconnected", profile)
434 437
435 def entityDataUpdated(self, jid, name, value, profile): 438 def entity_data_updated(self, jid, name, value, profile):
436 self._obj.emitSignal("entityDataUpdated", jid, name, value, profile) 439 self._obj.emitSignal("entity_data_updated", jid, name, value, profile)
437 440
438 def messageEncryptionStarted(self, to_jid, encryption_data, profile_key): 441 def message_encryption_started(self, to_jid, encryption_data, profile_key):
439 self._obj.emitSignal("messageEncryptionStarted", to_jid, encryption_data, profile_key) 442 self._obj.emitSignal("message_encryption_started", to_jid, encryption_data, profile_key)
440 443
441 def messageEncryptionStopped(self, to_jid, encryption_data, profile_key): 444 def message_encryption_stopped(self, to_jid, encryption_data, profile_key):
442 self._obj.emitSignal("messageEncryptionStopped", to_jid, encryption_data, profile_key) 445 self._obj.emitSignal("message_encryption_stopped", to_jid, encryption_data, profile_key)
443 446
444 def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile): 447 def message_new(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile):
445 self._obj.emitSignal("messageNew", uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile) 448 self._obj.emitSignal("message_new", uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile)
446 449
447 def newContact(self, contact_jid, attributes, groups, profile): 450 def param_update(self, name, value, category, profile):
448 self._obj.emitSignal("newContact", contact_jid, attributes, groups, profile) 451 self._obj.emitSignal("param_update", name, value, category, profile)
449 452
450 def paramUpdate(self, name, value, category, profile): 453 def presence_update(self, entity_jid, show, priority, statuses, profile):
451 self._obj.emitSignal("paramUpdate", name, value, category, profile) 454 self._obj.emitSignal("presence_update", entity_jid, show, priority, statuses, profile)
452 455
453 def presenceUpdate(self, entity_jid, show, priority, statuses, profile): 456 def progress_error(self, id, error, profile):
454 self._obj.emitSignal("presenceUpdate", entity_jid, show, priority, statuses, profile) 457 self._obj.emitSignal("progress_error", id, error, profile)
455 458
456 def progressError(self, id, error, profile): 459 def progress_finished(self, id, metadata, profile):
457 self._obj.emitSignal("progressError", id, error, profile) 460 self._obj.emitSignal("progress_finished", id, metadata, profile)
458 461
459 def progressFinished(self, id, metadata, profile): 462 def progress_started(self, id, metadata, profile):
460 self._obj.emitSignal("progressFinished", id, metadata, profile) 463 self._obj.emitSignal("progress_started", id, metadata, profile)
461
462 def progressStarted(self, id, metadata, profile):
463 self._obj.emitSignal("progressStarted", id, metadata, profile)
464 464
465 def subscribe(self, sub_type, entity_jid, profile): 465 def subscribe(self, sub_type, entity_jid, profile):
466 self._obj.emitSignal("subscribe", sub_type, entity_jid, profile) 466 self._obj.emitSignal("subscribe", sub_type, entity_jid, profile)
467 467
468 def register_method(self, name, callback): 468 def register_method(self, name, callback):
469 log.debug(f"registering DBus bridge method [{name}]") 469 log.debug(f"registering DBus bridge method [{name}]")
470 self._obj.register_method(name, callback) 470 self._obj.register_method(name, callback)
471 471
472 def emitSignal(self, name, *args): 472 def emit_signal(self, name, *args):
473 self._obj.emitSignal(name, *args) 473 self._obj.emitSignal(name, *args)
474 474
475 def addMethod( 475 def add_method(
476 self, name, int_suffix, in_sign, out_sign, method, async_=False, doc={} 476 self, name, int_suffix, in_sign, out_sign, method, async_=False, doc={}
477 ): 477 ):
478 """Dynamically add a method to D-Bus Bridge""" 478 """Dynamically add a method to D-Bus bridge"""
479 # FIXME: doc parameter is kept only temporary, the time to remove it from calls 479 # FIXME: doc parameter is kept only temporary, the time to remove it from calls
480 log.debug(f"Adding method {name!r} to D-Bus bridge") 480 log.debug(f"Adding method {name!r} to D-Bus bridge")
481 self._obj.plugin_iface.addMethod( 481 self._obj.plugin_iface.addMethod(
482 Method(name, arguments=in_sign, returns=out_sign) 482 Method(name, arguments=in_sign, returns=out_sign)
483 ) 483 )
486 def caller(self_, *args, **kwargs): 486 def caller(self_, *args, **kwargs):
487 return self_._callback(name, *args, **kwargs) 487 return self_._callback(name, *args, **kwargs)
488 setattr(self._obj, f"dbus_{name}", MethodType(caller, self._obj)) 488 setattr(self._obj, f"dbus_{name}", MethodType(caller, self._obj))
489 self.register_method(name, method) 489 self.register_method(name, method)
490 490
491 def addSignal(self, name, int_suffix, signature, doc={}): 491 def add_signal(self, name, int_suffix, signature, doc={}):
492 """Dynamically add a signal to D-Bus Bridge""" 492 """Dynamically add a signal to D-Bus bridge"""
493 log.debug(f"Adding signal {name!r} to D-Bus bridge") 493 log.debug(f"Adding signal {name!r} to D-Bus bridge")
494 self._obj.plugin_iface.addSignal(Signal(name, signature)) 494 self._obj.plugin_iface.addSignal(Signal(name, signature))
495 setattr(Bridge, name, partialmethod(Bridge.emitSignal, name)) 495 setattr(bridge, name, partialmethod(bridge.emit_signal, name))