erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation:

Browse source 
generation of D-Bus bridge has been broken by black formatting tool, this patch fixes this.
This commit is contained in:
Goffi 2018-07-01 20:37:58 +02:00
commit f2b1398a9f
12 changed files with 303 additions and 918 deletions
Download patch file Download diff file Expand all files Collapse all files

2
misc/README
View file

@ -11,5 +11,5 @@ compinit
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)

2
misc/org.goffi.SAT.service → misc/org.salutatoi.SAT.service
View file

@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.goffi.SAT
Name=org.salutatoi.SAT
Exec=sat

15
sat/bridge/bridge_constructor/base_constructor.py
View file

@ -145,19 +145,8 @@ class Constructor(object):
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":

2
sat/bridge/bridge_constructor/constructors/dbus-xml/constructor.py
View file

@ -29,7 +29,7 @@ class DbusXmlConstructor(base_constructor.Constructor):
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>",

2
sat/bridge/bridge_constructor/constructors/dbus-xml/dbus_xml_template.xml
View file

@ -1,4 +1,4 @@
<node>
<interface name="org.goffi.SAT.core">
<interface name="org.salutatoi.SAT.core">
</interface>
</node>

10
sat/bridge/bridge_constructor/constructors/dbus/dbus_core_template.py
View file

@ -28,9 +28,9 @@ log = getLogger(__name__)
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 @@ class DbusObject(dbus.service.Object):
# 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 @@ class Bridge(object):
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)

4
sat/bridge/bridge_constructor/constructors/dbus/dbus_frontend_template.py
View file

@ -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

884
sat/bridge/dbus_bridge.py
View file

File diff suppressed because it is too large Load diff

27
sat/bridge/pb.py
View file

@ -103,6 +103,7 @@ class Bridge(object):
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 @@ class Bridge(object):
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)

8
sat/core/constants.py
View file

@ -172,7 +172,7 @@ class Const(object):
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 @@ class Const(object):
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 @@ class Const(object):
"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"
]

4
sat_frontends/bridge/dbus_bridge.py
View file

@ -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

229
sat_frontends/bridge/pb.py
View file

@ -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())