Mercurial > libervia-backend
changeset 2628:779351da2c13
core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation:
generation of D-Bus bridge has been broken by black formatting tool, this patch fixes this.
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Sun, 01 Jul 2018 20:37:58 +0200 |
| parents | 163aab916bcf |
| children | 346887f256f0 |
| files | misc/README misc/org.goffi.SAT.service misc/org.salutatoi.SAT.service sat/bridge/bridge_constructor/base_constructor.py sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py sat/bridge/dbus_bridge.py sat/bridge/pb.py sat/core/constants.py sat_frontends/bridge/dbus_bridge.py sat_frontends/bridge/pb.py |
| diffstat | 13 files changed, 295 insertions(+), 910 deletions(-) [+] |
line wrap: on
line diff
--- a/misc/README Fri Jun 29 15:54:46 2018 +0200 +++ b/misc/README Sun Jul 01 20:37:58 2018 +0200 @@ -11,5 +11,5 @@ Then, you should be able to complete a jp command line by pressing [TAB]. -* org.goffi.SAT.service: +* org.salutatoi.SAT.service: This file is used by D-Bus to know how to launch the backend, you have to put in in D-Bus services dir (usually /usr/share/dbus-1/services)
--- a/misc/org.goffi.SAT.service Fri Jun 29 15:54:46 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.goffi.SAT -Exec=sat
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/misc/org.salutatoi.SAT.service Sun Jul 01 20:37:58 2018 +0200 @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.salutatoi.SAT +Exec=sat
--- a/sat/bridge/bridge_constructor/base_constructor.py Fri Jun 29 15:54:46 2018 +0200 +++ b/sat/bridge/bridge_constructor/base_constructor.py Sun Jul 01 20:37:58 2018 +0200 @@ -145,19 +145,8 @@ i = 0 while i < len(signature): - if signature[i] not in [ - "b", - "y", - "n", - "i", - "x", - "q", - "u", - "t", - "d", - "s", - "a", - ]: + if signature[i] not in ["b", "y", "n", "i", "x", "q", "u", "t", "d", "s", + "a"]: raise ParseError("Unmanaged attribute type [%c]" % signature[i]) if signature[i] == "a":
--- a/sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py Fri Jun 29 15:54:46 2018 +0200 +++ b/sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py Sun Jul 01 20:37:58 2018 +0200 @@ -29,7 +29,7 @@ base_constructor.Constructor.__init__(self, bridge_template, options) self.template = "dbus_xml_template.xml" - self.core_dest = "org.goffi.sat.xml" + self.core_dest = "org.salutatoi.sat.xml" self.default_annotation = { "a{ss}": "StringDict", "a(sa{ss}as)": "QList<Contact>",
--- a/sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml Fri Jun 29 15:54:46 2018 +0200 +++ b/sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml Sun Jul 01 20:37:58 2018 +0200 @@ -1,4 +1,4 @@ <node> - <interface name="org.goffi.SAT.core"> + <interface name="org.salutatoi.SAT.core"> </interface> </node>
--- a/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py Fri Jun 29 15:54:46 2018 +0200 +++ b/sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py Sun Jul 01 20:37:58 2018 +0200 @@ -28,9 +28,9 @@ from twisted.internet.defer import Deferred from sat.core.exceptions import BridgeInitError -const_INT_PREFIX = "org.goffi.SAT" # Interface prefix +const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix const_ERROR_PREFIX = const_INT_PREFIX + ".error" -const_OBJ_PATH = "/org/goffi/SAT/bridge" +const_OBJ_PATH = "/org/salutatoi/SAT/bridge" const_CORE_SUFFIX = ".core" const_PLUGIN_SUFFIX = ".plugin" @@ -128,10 +128,10 @@ # further investigations pass - ##SIGNALS_PART## +##SIGNALS_PART## ### methods ### - ##METHODS_PART## +##METHODS_PART## def __attributes(self, in_sign): """Return arguments to user given a in_sign @param in_sign: in_sign in the short form (using s,a,i,b etc) @@ -272,7 +272,7 @@ self.dbus_name = dbus.service.BusName(const_INT_PREFIX, self.session_bus) self.dbus_bridge = DbusObject(self.session_bus, const_OBJ_PATH) - ##SIGNAL_DIRECT_CALLS_PART## +##SIGNAL_DIRECT_CALLS_PART## def register_method(self, name, callback): log.debug("registering DBus bridge method [%s]" % name) self.dbus_bridge.register_method(name, callback)
--- a/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py Fri Jun 29 15:54:46 2018 +0200 +++ b/sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py Sun Jul 01 20:37:58 2018 +0200 @@ -29,9 +29,9 @@ import ast -const_INT_PREFIX = "org.goffi.SAT" # Interface prefix +const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix const_ERROR_PREFIX = const_INT_PREFIX + ".error" -const_OBJ_PATH = '/org/goffi/SAT/bridge' +const_OBJ_PATH = '/org/salutatoi/SAT/bridge' const_CORE_SUFFIX = ".core" const_PLUGIN_SUFFIX = ".plugin" const_TIMEOUT = 120
--- a/sat/bridge/dbus_bridge.py Fri Jun 29 15:54:46 2018 +0200 +++ b/sat/bridge/dbus_bridge.py Sun Jul 01 20:37:58 2018 +0200 @@ -28,9 +28,9 @@ from twisted.internet.defer import Deferred from sat.core.exceptions import BridgeInitError -const_INT_PREFIX = "org.goffi.SAT" # Interface prefix +const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix const_ERROR_PREFIX = const_INT_PREFIX + ".error" -const_OBJ_PATH = "/org/goffi/SAT/bridge" +const_OBJ_PATH = "/org/salutatoi/SAT/bridge" const_CORE_SUFFIX = ".core" const_PLUGIN_SUFFIX = ".plugin" @@ -128,779 +128,372 @@ # further investigations pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="a{ss}sis") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='a{ss}sis') def actionNew(self, action_data, id, security_limit, profile): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="ss") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='ss') def connected(self, profile, jid_s): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="ss") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='ss') def contactDeleted(self, entity_jid, profile): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="s") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='s') def disconnected(self, profile): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="ssss") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='ssss') def entityDataUpdated(self, jid, name, value, profile): pass - @dbus.service.signal( - const_INT_PREFIX + const_CORE_SUFFIX, signature="sdssa{ss}a{ss}sa{ss}s" - ) - def messageNew( - self, - uid, - timestamp, - from_jid, - to_jid, - message, - subject, - mess_type, - extra, - profile, - ): + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='sdssa{ss}a{ss}sa{ss}s') + def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="sa{ss}ass") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='sa{ss}ass') def newContact(self, contact_jid, attributes, groups, profile): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="ssss") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='ssss') def paramUpdate(self, name, value, category, profile): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="ssia{ss}s") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='ssia{ss}s') def presenceUpdate(self, entity_jid, show, priority, statuses, profile): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="sss") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='sss') def progressError(self, id, error, profile): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="sa{ss}s") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='sa{ss}s') def progressFinished(self, id, metadata, profile): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="sa{ss}s") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='sa{ss}s') def progressStarted(self, id, metadata, profile): pass - @dbus.service.signal(const_INT_PREFIX + const_CORE_SUFFIX, signature="sss") + @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX, + signature='sss') def subscribe(self, sub_type, entity_jid, profile): pass ### methods ### - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="a(a{ss}si)", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='a(a{ss}si)', + async_callbacks=None) def actionsGet(self, profile_key="@DEFAULT@"): return self._callback("actionsGet", unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ss", - out_signature="", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ss', out_signature='', + async_callbacks=None) def addContact(self, entity_jid, profile_key="@DEFAULT@"): return self._callback("addContact", unicode(entity_jid), unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="", - async_callbacks=("callback", "errback"), - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='', + async_callbacks=('callback', 'errback')) def asyncDeleteProfile(self, profile, callback=None, errback=None): - return self._callback( - "asyncDeleteProfile", unicode(profile), callback=callback, errback=errback - ) + return self._callback("asyncDeleteProfile", unicode(profile), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="sssis", - out_signature="s", - async_callbacks=("callback", "errback"), - ) - def asyncGetParamA( - self, - name, - category, - attribute="value", - security_limit=-1, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): - return self._callback( - "asyncGetParamA", - unicode(name), - unicode(category), - unicode(attribute), - security_limit, - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='sssis', out_signature='s', + async_callbacks=('callback', 'errback')) + def asyncGetParamA(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): + return self._callback("asyncGetParamA", unicode(name), unicode(category), unicode(attribute), security_limit, unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="sis", - out_signature="a{ss}", - async_callbacks=("callback", "errback"), - ) - def asyncGetParamsValuesFromCategory( - self, - category, - security_limit=-1, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): - return self._callback( - "asyncGetParamsValuesFromCategory", - unicode(category), - security_limit, - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='sis', out_signature='a{ss}', + async_callbacks=('callback', 'errback')) + def asyncGetParamsValuesFromCategory(self, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): + return self._callback("asyncGetParamsValuesFromCategory", unicode(category), security_limit, unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ssa{ss}", - out_signature="b", - async_callbacks=("callback", "errback"), - ) - def connect( - self, - profile_key="@DEFAULT@", - password="", - options={}, - callback=None, - errback=None, - ): - return self._callback( - "connect", - unicode(profile_key), - unicode(password), - options, - callback=callback, - errback=errback, - ) - - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ss", - out_signature="", - async_callbacks=("callback", "errback"), - ) - def delContact( - self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None - ): - return self._callback( - "delContact", - unicode(entity_jid), - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ssa{ss}', out_signature='b', + async_callbacks=('callback', 'errback')) + def connect(self, profile_key="@DEFAULT@", password='', options={}, callback=None, errback=None): + return self._callback("connect", unicode(profile_key), unicode(password), options, callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="asa(ss)bbbbbs", - out_signature="(a{sa(sss)}a{sa(sss)}a{sa(sss)})", - async_callbacks=("callback", "errback"), - ) - def discoFindByFeatures( - self, - namespaces, - identities, - bare_jid=False, - service=True, - roster=True, - own_jid=True, - local_device=False, - profile_key=u"@DEFAULT@", - callback=None, - errback=None, - ): - return self._callback( - "discoFindByFeatures", - namespaces, - identities, - bare_jid, - service, - roster, - own_jid, - local_device, - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ss', out_signature='', + async_callbacks=('callback', 'errback')) + def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): + return self._callback("delContact", unicode(entity_jid), unicode(profile_key), callback=callback, errback=errback) + + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='asa(ss)bbbbbs', out_signature='(a{sa(sss)}a{sa(sss)}a{sa(sss)})', + async_callbacks=('callback', 'errback')) + def discoFindByFeatures(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key=u"@DEFAULT@", callback=None, errback=None): + return self._callback("discoFindByFeatures", namespaces, identities, bare_jid, service, roster, own_jid, local_device, unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ssbs", - out_signature="(asa(sss)a{sa(a{ss}as)})", - async_callbacks=("callback", "errback"), - ) - def discoInfos( - self, - entity_jid, - node=u"", - use_cache=True, - profile_key=u"@DEFAULT@", - callback=None, - errback=None, - ): - return self._callback( - "discoInfos", - unicode(entity_jid), - unicode(node), - use_cache, - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ssbs', out_signature='(asa(sss)a{sa(a{ss}as)})', + async_callbacks=('callback', 'errback')) + def discoInfos(self, entity_jid, node=u'', use_cache=True, profile_key=u"@DEFAULT@", callback=None, errback=None): + return self._callback("discoInfos", unicode(entity_jid), unicode(node), use_cache, unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ssbs", - out_signature="a(sss)", - async_callbacks=("callback", "errback"), - ) - def discoItems( - self, - entity_jid, - node=u"", - use_cache=True, - profile_key=u"@DEFAULT@", - callback=None, - errback=None, - ): - return self._callback( - "discoItems", - unicode(entity_jid), - unicode(node), - use_cache, - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ssbs', out_signature='a(sss)', + async_callbacks=('callback', 'errback')) + def discoItems(self, entity_jid, node=u'', use_cache=True, profile_key=u"@DEFAULT@", callback=None, errback=None): + return self._callback("discoItems", unicode(entity_jid), unicode(node), use_cache, unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="", - async_callbacks=("callback", "errback"), - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='', + async_callbacks=('callback', 'errback')) def disconnect(self, profile_key="@DEFAULT@", callback=None, errback=None): - return self._callback( - "disconnect", unicode(profile_key), callback=callback, errback=errback - ) + return self._callback("disconnect", unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ss", - out_signature="s", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ss', out_signature='s', + async_callbacks=None) def getConfig(self, section, name): return self._callback("getConfig", unicode(section), unicode(name)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="a(sa{ss}as)", - async_callbacks=("callback", "errback"), - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='a(sa{ss}as)', + async_callbacks=('callback', 'errback')) def getContacts(self, profile_key="@DEFAULT@", callback=None, errback=None): - return self._callback( - "getContacts", unicode(profile_key), callback=callback, errback=errback - ) + return self._callback("getContacts", unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ss", - out_signature="as", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ss', out_signature='as', + async_callbacks=None) def getContactsFromGroup(self, group, profile_key="@DEFAULT@"): - return self._callback( - "getContactsFromGroup", unicode(group), unicode(profile_key) - ) + return self._callback("getContactsFromGroup", unicode(group), unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="asass", - out_signature="a{sa{ss}}", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='asass', out_signature='a{sa{ss}}', + async_callbacks=None) def getEntitiesData(self, jids, keys, profile): return self._callback("getEntitiesData", jids, keys, unicode(profile)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="sass", - out_signature="a{ss}", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='sass', out_signature='a{ss}', + async_callbacks=None) def getEntityData(self, jid, keys, profile): return self._callback("getEntityData", unicode(jid), keys, unicode(profile)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="a{sa{ss}}", - async_callbacks=("callback", "errback"), - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='a{sa{ss}}', + async_callbacks=('callback', 'errback')) def getFeatures(self, profile_key, callback=None, errback=None): - return self._callback( - "getFeatures", unicode(profile_key), callback=callback, errback=errback - ) + return self._callback("getFeatures", unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ss", - out_signature="s", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ss', out_signature='s', + async_callbacks=None) def getMainResource(self, contact_jid, profile_key="@DEFAULT@"): - return self._callback( - "getMainResource", unicode(contact_jid), unicode(profile_key) - ) - - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ssss", - out_signature="s", - async_callbacks=None, - ) - def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"): - return self._callback( - "getParamA", - unicode(name), - unicode(category), - unicode(attribute), - unicode(profile_key), - ) + return self._callback("getMainResource", unicode(contact_jid), unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="", - out_signature="as", - async_callbacks=None, - ) - def getParamsCategories(self,): - return self._callback("getParamsCategories") + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ssss', out_signature='s', + async_callbacks=None) + def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"): + return self._callback("getParamA", unicode(name), unicode(category), unicode(attribute), unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="iss", - out_signature="s", - async_callbacks=("callback", "errback"), - ) - def getParamsUI( - self, - security_limit=-1, - app="", - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): - return self._callback( - "getParamsUI", - security_limit, - unicode(app), - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='', out_signature='as', + async_callbacks=None) + def getParamsCategories(self, ): + return self._callback("getParamsCategories", ) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="a{sa{s(sia{ss})}}", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='iss', out_signature='s', + async_callbacks=('callback', 'errback')) + def getParamsUI(self, security_limit=-1, app='', profile_key="@DEFAULT@", callback=None, errback=None): + return self._callback("getParamsUI", security_limit, unicode(app), unicode(profile_key), callback=callback, errback=errback) + + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='a{sa{s(sia{ss})}}', + async_callbacks=None) def getPresenceStatuses(self, profile_key="@DEFAULT@"): return self._callback("getPresenceStatuses", unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="", - out_signature="", - async_callbacks=("callback", "errback"), - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='', out_signature='', + async_callbacks=('callback', 'errback')) def getReady(self, callback=None, errback=None): return self._callback("getReady", callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="", - out_signature="s", - async_callbacks=None, - ) - def getVersion(self,): - return self._callback("getVersion") + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='', out_signature='s', + async_callbacks=None) + def getVersion(self, ): + return self._callback("getVersion", ) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="a{ss}", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='a{ss}', + async_callbacks=None) def getWaitingSub(self, profile_key="@DEFAULT@"): return self._callback("getWaitingSub", unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ssiba{ss}s", - out_signature="a(sdssa{ss}a{ss}sa{ss})", - async_callbacks=("callback", "errback"), - ) - def historyGet( - self, - from_jid, - to_jid, - limit, - between=True, - filters="", - profile="@NONE@", - callback=None, - errback=None, - ): - return self._callback( - "historyGet", - unicode(from_jid), - unicode(to_jid), - limit, - between, - filters, - unicode(profile), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ssiba{ss}s', out_signature='a(sdssa{ss}a{ss}sa{ss})', + async_callbacks=('callback', 'errback')) + def historyGet(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@", callback=None, errback=None): + return self._callback("historyGet", unicode(from_jid), unicode(to_jid), limit, between, filters, unicode(profile), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="b", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='b', + async_callbacks=None) def isConnected(self, profile_key="@DEFAULT@"): return self._callback("isConnected", unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="sa{ss}s", - out_signature="a{ss}", - async_callbacks=("callback", "errback"), - ) - def launchAction( - self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None - ): - return self._callback( - "launchAction", - unicode(callback_id), - data, - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='sa{ss}s', out_signature='a{ss}', + async_callbacks=('callback', 'errback')) + def launchAction(self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None): + return self._callback("launchAction", unicode(callback_id), data, unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="b", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='b', + async_callbacks=None) def loadParamsTemplate(self, filename): return self._callback("loadParamsTemplate", unicode(filename)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ss", - out_signature="s", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ss', out_signature='s', + async_callbacks=None) def menuHelpGet(self, menu_id, language): return self._callback("menuHelpGet", unicode(menu_id), unicode(language)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="sasa{ss}is", - out_signature="a{ss}", - async_callbacks=("callback", "errback"), - ) - def menuLaunch( - self, - menu_type, - path, - data, - security_limit, - profile_key, - callback=None, - errback=None, - ): - return self._callback( - "menuLaunch", - unicode(menu_type), - path, - data, - security_limit, - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='sasa{ss}is', out_signature='a{ss}', + async_callbacks=('callback', 'errback')) + def menuLaunch(self, menu_type, path, data, security_limit, profile_key, callback=None, errback=None): + return self._callback("menuLaunch", unicode(menu_type), path, data, security_limit, unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="si", - out_signature="a(ssasasa{ss})", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='si', out_signature='a(ssasasa{ss})', + async_callbacks=None) def menusGet(self, language, security_limit): return self._callback("menusGet", unicode(language), security_limit) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="sa{ss}a{ss}sa{ss}s", - out_signature="", - async_callbacks=("callback", "errback"), - ) - def messageSend( - self, - to_jid, - message, - subject={}, - mess_type="auto", - extra={}, - profile_key="@NONE@", - callback=None, - errback=None, - ): - return self._callback( - "messageSend", - unicode(to_jid), - message, - subject, - unicode(mess_type), - extra, - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='sa{ss}a{ss}sa{ss}s', out_signature='', + async_callbacks=('callback', 'errback')) + def messageSend(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None): + return self._callback("messageSend", unicode(to_jid), message, subject, unicode(mess_type), extra, unicode(profile_key), callback=callback, errback=errback) + + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='', out_signature='a{ss}', + async_callbacks=None) + def namespacesGet(self, ): + return self._callback("namespacesGet", ) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="", - out_signature="a{ss}", - async_callbacks=None, - ) - def namespacesGet(self,): - return self._callback("namespacesGet") - - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="sis", - out_signature="", - async_callbacks=None, - ) - def paramsRegisterApp(self, xml, security_limit=-1, app=""): - return self._callback( - "paramsRegisterApp", unicode(xml), security_limit, unicode(app) - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='sis', out_signature='', + async_callbacks=None) + def paramsRegisterApp(self, xml, security_limit=-1, app=''): + return self._callback("paramsRegisterApp", unicode(xml), security_limit, unicode(app)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="sss", - out_signature="", - async_callbacks=("callback", "errback"), - ) - def profileCreate( - self, profile, password="", component="", callback=None, errback=None - ): - return self._callback( - "profileCreate", - unicode(profile), - unicode(password), - unicode(component), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='sss', out_signature='', + async_callbacks=('callback', 'errback')) + def profileCreate(self, profile, password='', component='', callback=None, errback=None): + return self._callback("profileCreate", unicode(profile), unicode(password), unicode(component), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="b", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='b', + async_callbacks=None) def profileIsSessionStarted(self, profile_key="@DEFAULT@"): return self._callback("profileIsSessionStarted", unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="s", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='s', + async_callbacks=None) def profileNameGet(self, profile_key="@DEFAULT@"): return self._callback("profileNameGet", unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='', + async_callbacks=None) def profileSetDefault(self, profile): return self._callback("profileSetDefault", unicode(profile)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ss", - out_signature="b", - async_callbacks=("callback", "errback"), - ) - def profileStartSession( - self, password="", profile_key="@DEFAULT@", callback=None, errback=None - ): - return self._callback( - "profileStartSession", - unicode(password), - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ss', out_signature='b', + async_callbacks=('callback', 'errback')) + def profileStartSession(self, password='', profile_key="@DEFAULT@", callback=None, errback=None): + return self._callback("profileStartSession", unicode(password), unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="bb", - out_signature="as", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='bb', out_signature='as', + async_callbacks=None) def profilesListGet(self, clients=True, components=False): return self._callback("profilesListGet", clients, components) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ss", - out_signature="a{ss}", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ss', out_signature='a{ss}', + async_callbacks=None) def progressGet(self, id, profile): return self._callback("progressGet", unicode(id), unicode(profile)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="a{sa{sa{ss}}}", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='a{sa{sa{ss}}}', + async_callbacks=None) def progressGetAll(self, profile): return self._callback("progressGetAll", unicode(profile)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="a{sa{sa{ss}}}", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='a{sa{sa{ss}}}', + async_callbacks=None) def progressGetAllMetadata(self, profile): return self._callback("progressGetAllMetadata", unicode(profile)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="b", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='b', + async_callbacks=None) def saveParamsTemplate(self, filename): return self._callback("saveParamsTemplate", unicode(filename)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="s", - out_signature="a{ss}", - async_callbacks=("callback", "errback"), - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='s', out_signature='a{ss}', + async_callbacks=('callback', 'errback')) def sessionInfosGet(self, profile_key, callback=None, errback=None): - return self._callback( - "sessionInfosGet", unicode(profile_key), callback=callback, errback=errback - ) + return self._callback("sessionInfosGet", unicode(profile_key), callback=callback, errback=errback) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="sssis", - out_signature="", - async_callbacks=None, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='sssis', out_signature='', + async_callbacks=None) def setParam(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"): - return self._callback( - "setParam", - unicode(name), - unicode(value), - unicode(category), - security_limit, - unicode(profile_key), - ) + return self._callback("setParam", unicode(name), unicode(value), unicode(category), security_limit, unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ssa{ss}s", - out_signature="", - async_callbacks=None, - ) - def setPresence(self, to_jid="", show="", statuses={}, profile_key="@DEFAULT@"): - return self._callback( - "setPresence", unicode(to_jid), unicode(show), statuses, unicode(profile_key) - ) - - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="sss", - out_signature="", - async_callbacks=None, - ) - def subscription(self, sub_type, entity, profile_key="@DEFAULT@"): - return self._callback( - "subscription", unicode(sub_type), unicode(entity), unicode(profile_key) - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ssa{ss}s', out_signature='', + async_callbacks=None) + def setPresence(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@"): + return self._callback("setPresence", unicode(to_jid), unicode(show), statuses, unicode(profile_key)) - @dbus.service.method( - const_INT_PREFIX + const_CORE_SUFFIX, - in_signature="ssass", - out_signature="", - async_callbacks=("callback", "errback"), - ) - def updateContact( - self, - entity_jid, - name, - groups, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): - return self._callback( - "updateContact", - unicode(entity_jid), - unicode(name), - groups, - unicode(profile_key), - callback=callback, - errback=errback, - ) + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='sss', out_signature='', + async_callbacks=None) + def subscription(self, sub_type, entity, profile_key="@DEFAULT@"): + return self._callback("subscription", unicode(sub_type), unicode(entity), unicode(profile_key)) + + @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX, + in_signature='ssass', out_signature='', + async_callbacks=('callback', 'errback')) + def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@", callback=None, errback=None): + return self._callback("updateContact", unicode(entity_jid), unicode(name), groups, unicode(profile_key), callback=callback, errback=errback) def __attributes(self, in_sign): """Return arguments to user given a in_sign @@ -1057,21 +650,8 @@ def entityDataUpdated(self, jid, name, value, profile): self.dbus_bridge.entityDataUpdated(jid, name, value, profile) - def messageNew( - self, - uid, - timestamp, - from_jid, - to_jid, - message, - subject, - mess_type, - extra, - profile, - ): - self.dbus_bridge.messageNew( - uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile - ) + def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile): + self.dbus_bridge.messageNew(uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile) def newContact(self, contact_jid, attributes, groups, profile): self.dbus_bridge.newContact(contact_jid, attributes, groups, profile) @@ -1107,4 +687,4 @@ def addSignal(self, name, int_suffix, signature, doc={}): self.dbus_bridge.addSignal(name, int_suffix, signature, doc) - setattr(Bridge, name, getattr(self.dbus_bridge, name)) + setattr(Bridge, name, getattr(self.dbus_bridge, name)) \ No newline at end of file
--- a/sat/bridge/pb.py Fri Jun 29 15:54:46 2018 +0200 +++ b/sat/bridge/pb.py Sun Jul 01 20:37:58 2018 +0200 @@ -103,6 +103,7 @@ self, name, lambda *args, **kwargs: self.sendSignal(name, *args, **kwargs) ) + def actionNew(self, action_data, id, security_limit, profile): self.sendSignal("actionNew", action_data, id, security_limit, profile) @@ -118,30 +119,8 @@ def entityDataUpdated(self, jid, name, value, profile): self.sendSignal("entityDataUpdated", jid, name, value, profile) - def messageNew( - self, - uid, - timestamp, - from_jid, - to_jid, - message, - subject, - mess_type, - extra, - profile, - ): - self.sendSignal( - "messageNew", - uid, - timestamp, - from_jid, - to_jid, - message, - subject, - mess_type, - extra, - profile, - ) + def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile): + self.sendSignal("messageNew", uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile) def newContact(self, contact_jid, attributes, groups, profile): self.sendSignal("newContact", contact_jid, attributes, groups, profile)
--- a/sat/core/constants.py Fri Jun 29 15:54:46 2018 +0200 +++ b/sat/core/constants.py Sun Jul 01 20:37:58 2018 +0200 @@ -172,7 +172,7 @@ if ( BaseDirectory ): # skipped when xdg module is not available (should not happen in backend) - if "org.goffi.cagou.cagou" in BaseDirectory.__file__: + if "org.salutatoi.cagou.cagou" in BaseDirectory.__file__: # FIXME: hack to make config read from the right location on Android # TODO: fix it in a more proper way @@ -184,8 +184,8 @@ BaseDirectory = None DEFAULT_CONFIG = { - "local_dir": "/data/data/org.goffi.cagou.cagou/app", - "media_dir": "/data/data/org.goffi.cagou.cagou/files/app/media", + "local_dir": "/data/data/org.salutatoi.cagou.cagou/app", + "media_dir": "/data/data/org.salutatoi.cagou.cagou/files/app/media", # FIXME: temporary location for downloads, need to call API properly "downloads_dir": os.path.join( Environment.getExternalStoragePublicDirectory( @@ -197,7 +197,7 @@ "log_dir": "%(local_dir)s", } CONFIG_FILES = [ - "/data/data/org.goffi.cagou.cagou/files/app/android/" + "/data/data/org.salutatoi.cagou.cagou/files/app/android/" + APP_NAME_FILE + ".conf" ]
--- a/sat_frontends/bridge/dbus_bridge.py Fri Jun 29 15:54:46 2018 +0200 +++ b/sat_frontends/bridge/dbus_bridge.py Sun Jul 01 20:37:58 2018 +0200 @@ -29,9 +29,9 @@ import ast -const_INT_PREFIX = "org.goffi.SAT" # Interface prefix +const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix const_ERROR_PREFIX = const_INT_PREFIX + ".error" -const_OBJ_PATH = '/org/goffi/SAT/bridge' +const_OBJ_PATH = '/org/salutatoi/SAT/bridge' const_CORE_SUFFIX = ".core" const_PLUGIN_SUFFIX = ".plugin" const_TIMEOUT = 120
--- a/sat_frontends/bridge/pb.py Fri Jun 29 15:54:46 2018 +0200 +++ b/sat_frontends/bridge/pb.py Sun Jul 01 20:37:58 2018 +0200 @@ -125,6 +125,7 @@ def register_signal(self, functionName, handler, iface="core"): self.signals_handler.register_signal(functionName, handler, iface) + def actionsGet(self, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("actionsGet", profile_key) if callback is not None: @@ -133,9 +134,7 @@ errback = self._generic_errback d.addErrback(errback) - def addContact( - self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None - ): + def addContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("addContact", entity_jid, profile_key) if callback is not None: d.addCallback(lambda dummy: callback()) @@ -151,50 +150,23 @@ errback = self._generic_errback d.addErrback(errback) - def asyncGetParamA( - self, - name, - category, - attribute="value", - security_limit=-1, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): - d = self.root.callRemote( - "asyncGetParamA", name, category, attribute, security_limit, profile_key - ) + def asyncGetParamA(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("asyncGetParamA", name, category, attribute, security_limit, profile_key) if callback is not None: d.addCallback(callback) if errback is None: errback = self._generic_errback d.addErrback(errback) - def asyncGetParamsValuesFromCategory( - self, - category, - security_limit=-1, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): - d = self.root.callRemote( - "asyncGetParamsValuesFromCategory", category, security_limit, profile_key - ) + def asyncGetParamsValuesFromCategory(self, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("asyncGetParamsValuesFromCategory", category, security_limit, profile_key) if callback is not None: d.addCallback(callback) if errback is None: errback = self._generic_errback d.addErrback(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) @@ -202,9 +174,7 @@ errback = self._generic_errback d.addErrback(errback) - def delContact( - self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None - ): + def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("delContact", entity_jid, profile_key) if callback is not None: d.addCallback(lambda dummy: callback()) @@ -212,45 +182,15 @@ errback = self._generic_errback d.addErrback(errback) - def discoFindByFeatures( - self, - namespaces, - identities, - bare_jid=False, - service=True, - roster=True, - own_jid=True, - local_device=False, - profile_key=u"@DEFAULT@", - callback=None, - errback=None, - ): - d = self.root.callRemote( - "discoFindByFeatures", - namespaces, - identities, - bare_jid, - service, - roster, - own_jid, - local_device, - profile_key, - ) + def discoFindByFeatures(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key=u"@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("discoFindByFeatures", namespaces, identities, bare_jid, service, roster, own_jid, local_device, profile_key) if callback is not None: d.addCallback(callback) if errback is None: errback = self._generic_errback d.addErrback(errback) - def discoInfos( - self, - entity_jid, - node=u"", - use_cache=True, - profile_key=u"@DEFAULT@", - callback=None, - errback=None, - ): + def discoInfos(self, entity_jid, node=u'', use_cache=True, profile_key=u"@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("discoInfos", entity_jid, node, use_cache, profile_key) if callback is not None: d.addCallback(callback) @@ -258,15 +198,7 @@ errback = self._generic_errback d.addErrback(errback) - def discoItems( - self, - entity_jid, - node=u"", - use_cache=True, - profile_key=u"@DEFAULT@", - callback=None, - errback=None, - ): + def discoItems(self, entity_jid, node=u'', use_cache=True, profile_key=u"@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("discoItems", entity_jid, node, use_cache, profile_key) if callback is not None: d.addCallback(callback) @@ -298,9 +230,7 @@ errback = self._generic_errback d.addErrback(errback) - def getContactsFromGroup( - self, group, profile_key="@DEFAULT@", callback=None, errback=None - ): + def getContactsFromGroup(self, group, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("getContactsFromGroup", group, profile_key) if callback is not None: d.addCallback(callback) @@ -332,9 +262,7 @@ errback = self._generic_errback d.addErrback(errback) - def getMainResource( - self, contact_jid, profile_key="@DEFAULT@", callback=None, errback=None - ): + def getMainResource(self, contact_jid, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("getMainResource", contact_jid, profile_key) if callback is not None: d.addCallback(callback) @@ -342,15 +270,7 @@ errback = self._generic_errback d.addErrback(errback) - def getParamA( - self, - name, - category, - attribute="value", - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("getParamA", name, category, attribute, profile_key) if callback is not None: d.addCallback(callback) @@ -366,14 +286,7 @@ errback = self._generic_errback d.addErrback(errback) - def getParamsUI( - self, - security_limit=-1, - app="", - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def getParamsUI(self, security_limit=-1, app='', profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("getParamsUI", security_limit, app, profile_key) if callback is not None: d.addCallback(callback) @@ -413,20 +326,8 @@ errback = self._generic_errback d.addErrback(errback) - def historyGet( - self, - from_jid, - to_jid, - limit, - between=True, - filters="", - profile="@NONE@", - callback=None, - errback=None, - ): - d = self.root.callRemote( - "historyGet", from_jid, to_jid, limit, between, filters, profile - ) + def historyGet(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@", callback=None, errback=None): + d = self.root.callRemote("historyGet", from_jid, to_jid, limit, between, filters, profile) if callback is not None: d.addCallback(callback) if errback is None: @@ -441,9 +342,7 @@ errback = self._generic_errback d.addErrback(errback) - def launchAction( - self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None - ): + def launchAction(self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("launchAction", callback_id, data, profile_key) if callback is not None: d.addCallback(callback) @@ -467,19 +366,8 @@ errback = self._generic_errback d.addErrback(errback) - def menuLaunch( - self, - menu_type, - path, - data, - security_limit, - profile_key, - callback=None, - errback=None, - ): - d = self.root.callRemote( - "menuLaunch", menu_type, path, data, security_limit, profile_key - ) + def menuLaunch(self, menu_type, path, data, security_limit, profile_key, callback=None, errback=None): + d = self.root.callRemote("menuLaunch", menu_type, path, data, security_limit, profile_key) if callback is not None: d.addCallback(callback) if errback is None: @@ -494,20 +382,8 @@ errback = self._generic_errback d.addErrback(errback) - def messageSend( - self, - to_jid, - message, - subject={}, - mess_type="auto", - extra={}, - profile_key="@NONE@", - callback=None, - errback=None, - ): - d = self.root.callRemote( - "messageSend", to_jid, message, subject, mess_type, extra, profile_key - ) + def messageSend(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None): + d = self.root.callRemote("messageSend", to_jid, message, subject, mess_type, extra, profile_key) if callback is not None: d.addCallback(lambda dummy: callback()) if errback is None: @@ -522,9 +398,7 @@ errback = self._generic_errback d.addErrback(errback) - def paramsRegisterApp( - self, xml, security_limit=-1, app="", callback=None, errback=None - ): + def paramsRegisterApp(self, xml, security_limit=-1, app='', callback=None, errback=None): d = self.root.callRemote("paramsRegisterApp", xml, security_limit, app) if callback is not None: d.addCallback(lambda dummy: callback()) @@ -532,9 +406,7 @@ errback = self._generic_errback d.addErrback(errback) - def profileCreate( - self, profile, password="", component="", callback=None, errback=None - ): + def profileCreate(self, profile, password='', component='', callback=None, errback=None): d = self.root.callRemote("profileCreate", profile, password, component) if callback is not None: d.addCallback(lambda dummy: callback()) @@ -542,9 +414,7 @@ errback = self._generic_errback d.addErrback(errback) - def profileIsSessionStarted( - self, profile_key="@DEFAULT@", callback=None, errback=None - ): + def profileIsSessionStarted(self, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("profileIsSessionStarted", profile_key) if callback is not None: d.addCallback(callback) @@ -568,9 +438,7 @@ errback = self._generic_errback d.addErrback(errback) - def profileStartSession( - self, password="", profile_key="@DEFAULT@", callback=None, errback=None - ): + def profileStartSession(self, password='', profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("profileStartSession", password, profile_key) if callback is not None: d.addCallback(callback) @@ -578,9 +446,7 @@ errback = self._generic_errback d.addErrback(errback) - def profilesListGet( - self, clients=True, components=False, callback=None, errback=None - ): + def profilesListGet(self, clients=True, components=False, callback=None, errback=None): d = self.root.callRemote("profilesListGet", clients, components) if callback is not None: d.addCallback(callback) @@ -628,34 +494,15 @@ errback = self._generic_errback d.addErrback(errback) - def setParam( - self, - name, - value, - category, - security_limit=-1, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): - d = self.root.callRemote( - "setParam", name, value, category, security_limit, profile_key - ) + def setParam(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None): + d = self.root.callRemote("setParam", name, value, category, security_limit, profile_key) if callback is not None: d.addCallback(lambda dummy: callback()) if errback is None: errback = self._generic_errback d.addErrback(errback) - def setPresence( - self, - to_jid="", - show="", - statuses={}, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def setPresence(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("setPresence", to_jid, show, statuses, profile_key) if callback is not None: d.addCallback(lambda dummy: callback()) @@ -663,9 +510,7 @@ errback = self._generic_errback d.addErrback(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 dummy: callback()) @@ -673,15 +518,7 @@ errback = self._generic_errback d.addErrback(errback) - def updateContact( - self, - entity_jid, - name, - groups, - profile_key="@DEFAULT@", - callback=None, - errback=None, - ): + def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@", callback=None, errback=None): d = self.root.callRemote("updateContact", entity_jid, name, groups, profile_key) if callback is not None: d.addCallback(lambda dummy: callback())