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

bridge (dbus): new bridge_dbus_int_prefix option (in [DEFAULT] settings) to change interface prefix

Browse source
This commit is contained in:
Goffi 2020-01-29 18:54:40 +01:00
commit 4cb56362ec
4 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
#!/usr/bin/env python3
# SAT: a jabber client
# SàT communication bridge
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
# This program is free software: you can redistribute it and/or modify
@ -23,12 +22,19 @@ import dbus.service
import dbus.mainloop.glib
import inspect
from sat.core.log import getLogger
log = getLogger(__name__)
from sat.tools import config
from twisted.internet.defer import Deferred
from sat.core.exceptions import BridgeInitError
const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix
log = getLogger(__name__)
# Interface prefix
const_INT_PREFIX = config.getConfig(
config.parseMainConf(),
"",
"bridge_dbus_int_prefix",
"org.salutatoi.SAT")
const_ERROR_PREFIX = const_INT_PREFIX + ".error"
const_OBJ_PATH = "/org/salutatoi/SAT/bridge"
const_CORE_SUFFIX = ".core"

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

@ -1,7 +1,6 @@
#!/usr/bin/env python3
#-*- coding: utf-8 -*-
# SAT communication bridge
# SàT communication bridge
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
# This program is free software: you can redistribute it and/or modify
@ -21,16 +20,23 @@ import asyncio
import dbus
import ast
from sat.core.i18n import _
from .bridge_frontend import BridgeException
from sat.tools import config
from sat.core.log import getLogger
from sat.core.exceptions import BridgeExceptionNoService, BridgeInitError
from dbus.mainloop.glib import DBusGMainLoop
from .bridge_frontend import BridgeException
DBusGMainLoop(set_as_default=True)
log = getLogger(__name__)
const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix
# Interface prefix
const_INT_PREFIX = config.getConfig(
config.parseMainConf(),
"",
"bridge_dbus_int_prefix",
"org.salutatoi.SAT")
const_ERROR_PREFIX = const_INT_PREFIX + ".error"
const_OBJ_PATH = '/org/salutatoi/SAT/bridge'
const_CORE_SUFFIX = ".core"

16
sat/bridge/dbus_bridge.py
View file

@ -1,7 +1,6 @@
#!/usr/bin/env python3
# SAT: a jabber client
# SàT communication bridge
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
# This program is free software: you can redistribute it and/or modify
@ -23,12 +22,19 @@ import dbus.service
import dbus.mainloop.glib
import inspect
from sat.core.log import getLogger
log = getLogger(__name__)
from sat.tools import config
from twisted.internet.defer import Deferred
from sat.core.exceptions import BridgeInitError
const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix
log = getLogger(__name__)
# Interface prefix
const_INT_PREFIX = config.getConfig(
config.parseMainConf(),
"",
"bridge_dbus_int_prefix",
"org.salutatoi.SAT")
const_ERROR_PREFIX = const_INT_PREFIX + ".error"
const_OBJ_PATH = "/org/salutatoi/SAT/bridge"
const_CORE_SUFFIX = ".core"

14
sat_frontends/bridge/dbus_bridge.py
View file

@ -1,7 +1,6 @@
#!/usr/bin/env python3
#-*- coding: utf-8 -*-
# SAT communication bridge
# SàT communication bridge
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
# This program is free software: you can redistribute it and/or modify
@ -21,16 +20,23 @@ import asyncio
import dbus
import ast
from sat.core.i18n import _
from .bridge_frontend import BridgeException
from sat.tools import config
from sat.core.log import getLogger
from sat.core.exceptions import BridgeExceptionNoService, BridgeInitError
from dbus.mainloop.glib import DBusGMainLoop
from .bridge_frontend import BridgeException
DBusGMainLoop(set_as_default=True)
log = getLogger(__name__)
const_INT_PREFIX = "org.salutatoi.SAT" # Interface prefix
# Interface prefix
const_INT_PREFIX = config.getConfig(
config.parseMainConf(),
"",
"bridge_dbus_int_prefix",
"org.salutatoi.SAT")
const_ERROR_PREFIX = const_INT_PREFIX + ".error"
const_OBJ_PATH = '/org/salutatoi/SAT/bridge'
const_CORE_SUFFIX = ".core"