diff --git a/src/bridge/DBus.py b/src/bridge/DBus.py index a8527056..ae24f1e4 100755 --- a/src/bridge/DBus.py +++ b/src/bridge/DBus.py @@ -125,6 +125,11 @@ class DbusObject(dbus.service.Object): # further investigations pass + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='a{ss}ss') + def actionNew(self, action_data, id, profile): + pass + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, signature='ssa{ss}s') def actionResult(self, answer_type, id, data, profile): @@ -546,6 +551,9 @@ class DBusBridge(Bridge): self.dbus_name = dbus.service.BusName(const_INT_PREFIX, self.session_bus) self.dbus_bridge = DbusObject(self.session_bus, const_OBJ_PATH) + def actionNew(self, action_data, id, profile): + self.dbus_bridge.actionNew(action_data, id, profile) + def actionResult(self, answer_type, id, data, profile): self.dbus_bridge.actionResult(answer_type, id, data, profile) diff --git a/src/bridge/bridge_constructor/bridge_template.ini b/src/bridge/bridge_constructor/bridge_template.ini index 4b40b3ce..c540ba8f 100644 --- a/src/bridge/bridge_constructor/bridge_template.ini +++ b/src/bridge/bridge_constructor/bridge_template.ini @@ -109,6 +109,18 @@ doc_param_1=conf_type: Type of the confirmation, can be: doc_param_2=data: conf_type dependent data doc_param_3=%(doc_profile)s +[actionNew] +type=signal +category=core +sig_in=a{ss}ss +doc=A frontend action is requested +doc_param_0=action_data: a dict where key can be: + - xmlui: a XMLUI need to be displayed +doc_param_1=id: action id + This id can be used later by frontends to announce to other ones + That the action is managed and can now be ignored. +doc_param_2=%(doc_profile)s + [actionResult] deprecated= type=signal diff --git a/src/core/sat_main.py b/src/core/sat_main.py index f1f3d565..4f516680 100644 --- a/src/core/sat_main.py +++ b/src/core/sat_main.py @@ -40,6 +40,7 @@ from glob import glob from uuid import uuid4 import sys import os.path +import uuid try: from collections import OrderedDict # only available from python 2.7 @@ -728,6 +729,15 @@ class SAT(service.Service): del client._waiting_conf[conf_id] cb(conf_id, accepted, data, profile) + def actionNew(self, action_data, profile): + """Shortcut to bridge.actionNew which generate and id + + @param action_data(dict): action data (see bridge documentation) + @param profile: %(doc_profile)s + """ + id_ = unicode(uuid.uuid4()) + self.bridge.actionNew(action_data, id_, profile) + def registerProgressCB(self, progress_id, CB, profile): """Register a callback called when progress is requested for id""" client = self.getClient(profile)