From 185a765e01ca5b7de02e69295cf98501b4da5331 Mon Sep 17 00:00:00 2001 From: Goffi Date: Mon, 19 Oct 2026 11:40:53 +0200 Subject: [PATCH] bridge: fix signature for `disco_infos` and `disco_find_by_features` --- .../backend/bridge/bridge_constructor/bridge_template.ini | 6 +++--- libervia/backend/bridge/dbus_bridge.py | 4 ++-- libervia/backend/core/main.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libervia/backend/bridge/bridge_constructor/bridge_template.ini b/libervia/backend/bridge/bridge_constructor/bridge_template.ini index 922f6302..0f5abeb5 100644 --- a/libervia/backend/bridge/bridge_constructor/bridge_template.ini +++ b/libervia/backend/bridge/bridge_constructor/bridge_template.ini @@ -970,7 +970,7 @@ async= type=method category=core sig_in=ssbs -sig_out=(asa(sss)a{sa(a{ss}as)}) +sig_out=(asa(ssss)a{sa(a{ss}as)}) param_1_default=u'' param_2_default=True param_3_default="@DEFAULT@" @@ -981,7 +981,7 @@ doc_param_2=use_cache: use cached data if available doc_param_3=%(doc_profile_key)s doc_return=discovery data: - list of features - - list of identities (category, type, name) + - list of identities (category, type, lang, name) - dictionary of extensions (FORM_TYPE as key), with value of: - list of field which are: - dictionary key/value where key can be: @@ -1012,7 +1012,7 @@ async= type=method category=core sig_in=asa(ss)bbbbbs -sig_out=(a{sa(sss)}a{sa(sss)}a{sa(sss)}) +sig_out=(a{sa(ssss)}a{sa(ssss)}a{sa(ssss)}) param_2_default=False param_3_default=True param_4_default=True diff --git a/libervia/backend/bridge/dbus_bridge.py b/libervia/backend/bridge/dbus_bridge.py index 09ed5a0a..e4cd534f 100644 --- a/libervia/backend/bridge/dbus_bridge.py +++ b/libervia/backend/bridge/dbus_bridge.py @@ -99,9 +99,9 @@ class DBusObject(objects.DBusObject): Method( "disco_find_by_features", arguments="asa(ss)bbbbbs", - returns="(a{sa(sss)}a{sa(sss)}a{sa(sss)})", + returns="(a{sa(ssss)}a{sa(ssss)}a{sa(ssss)})", ), - Method("disco_infos", arguments="ssbs", returns="(asa(sss)a{sa(a{ss}as)})"), + Method("disco_infos", arguments="ssbs", returns="(asa(ssss)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"), diff --git a/libervia/backend/core/main.py b/libervia/backend/core/main.py index b7dd09f0..b271dc5a 100644 --- a/libervia/backend/core/main.py +++ b/libervia/backend/core/main.py @@ -1473,7 +1473,7 @@ class LiberviaBackend(service.Service): ): continue found_identities = [ - (cat, type_, lang, identity.name or "") + (cat, type_, lang or "", identity.name or "") for (cat, type_), lang_identities in infos.identities.items() for lang, identity in lang_identities.items() ]