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.
This commit is contained in:
parent
b9a6cdd785
commit
f2b1398a9f
2 changed files with 303 additions and 918 deletions
|
|
@ -29,9 +29,9 @@ DBusGMainLoop(set_as_default=True)
|
|||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -125,6 +125,7 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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 @@ class Bridge(object):
|
|||
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())
|
||||
|
|
|
|||
Loading…
Reference in a new issue