bridge (dbus): new bridge_dbus_int_prefix option (in [DEFAULT] settings) to change interface prefix
This commit is contained in:
parent
c00fe7f1e6
commit
4cb56362ec
4 changed files with 42 additions and 18 deletions
|
|
@ -1,7 +1,6 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
# SàT communication bridge
|
||||||
# SAT: a jabber client
|
|
||||||
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
|
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
|
||||||
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
|
@ -23,12 +22,19 @@ import dbus.service
|
||||||
import dbus.mainloop.glib
|
import dbus.mainloop.glib
|
||||||
import inspect
|
import inspect
|
||||||
from sat.core.log import getLogger
|
from sat.core.log import getLogger
|
||||||
|
from sat.tools import config
|
||||||
log = getLogger(__name__)
|
|
||||||
from twisted.internet.defer import Deferred
|
from twisted.internet.defer import Deferred
|
||||||
from sat.core.exceptions import BridgeInitError
|
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_ERROR_PREFIX = const_INT_PREFIX + ".error"
|
||||||
const_OBJ_PATH = "/org/salutatoi/SAT/bridge"
|
const_OBJ_PATH = "/org/salutatoi/SAT/bridge"
|
||||||
const_CORE_SUFFIX = ".core"
|
const_CORE_SUFFIX = ".core"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
#!/usr/bin/env python3
|
#!/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)
|
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
|
||||||
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
|
@ -21,16 +20,23 @@ import asyncio
|
||||||
import dbus
|
import dbus
|
||||||
import ast
|
import ast
|
||||||
from sat.core.i18n import _
|
from sat.core.i18n import _
|
||||||
from .bridge_frontend import BridgeException
|
from sat.tools import config
|
||||||
from sat.core.log import getLogger
|
from sat.core.log import getLogger
|
||||||
from sat.core.exceptions import BridgeExceptionNoService, BridgeInitError
|
from sat.core.exceptions import BridgeExceptionNoService, BridgeInitError
|
||||||
from dbus.mainloop.glib import DBusGMainLoop
|
from dbus.mainloop.glib import DBusGMainLoop
|
||||||
|
from .bridge_frontend import BridgeException
|
||||||
|
|
||||||
|
|
||||||
DBusGMainLoop(set_as_default=True)
|
DBusGMainLoop(set_as_default=True)
|
||||||
log = getLogger(__name__)
|
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_ERROR_PREFIX = const_INT_PREFIX + ".error"
|
||||||
const_OBJ_PATH = '/org/salutatoi/SAT/bridge'
|
const_OBJ_PATH = '/org/salutatoi/SAT/bridge'
|
||||||
const_CORE_SUFFIX = ".core"
|
const_CORE_SUFFIX = ".core"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
# SàT communication bridge
|
||||||
# SAT: a jabber client
|
|
||||||
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
|
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
|
||||||
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
|
@ -23,12 +22,19 @@ import dbus.service
|
||||||
import dbus.mainloop.glib
|
import dbus.mainloop.glib
|
||||||
import inspect
|
import inspect
|
||||||
from sat.core.log import getLogger
|
from sat.core.log import getLogger
|
||||||
|
from sat.tools import config
|
||||||
log = getLogger(__name__)
|
|
||||||
from twisted.internet.defer import Deferred
|
from twisted.internet.defer import Deferred
|
||||||
from sat.core.exceptions import BridgeInitError
|
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_ERROR_PREFIX = const_INT_PREFIX + ".error"
|
||||||
const_OBJ_PATH = "/org/salutatoi/SAT/bridge"
|
const_OBJ_PATH = "/org/salutatoi/SAT/bridge"
|
||||||
const_CORE_SUFFIX = ".core"
|
const_CORE_SUFFIX = ".core"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
#!/usr/bin/env python3
|
#!/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)
|
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
|
||||||
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
|
@ -21,16 +20,23 @@ import asyncio
|
||||||
import dbus
|
import dbus
|
||||||
import ast
|
import ast
|
||||||
from sat.core.i18n import _
|
from sat.core.i18n import _
|
||||||
from .bridge_frontend import BridgeException
|
from sat.tools import config
|
||||||
from sat.core.log import getLogger
|
from sat.core.log import getLogger
|
||||||
from sat.core.exceptions import BridgeExceptionNoService, BridgeInitError
|
from sat.core.exceptions import BridgeExceptionNoService, BridgeInitError
|
||||||
from dbus.mainloop.glib import DBusGMainLoop
|
from dbus.mainloop.glib import DBusGMainLoop
|
||||||
|
from .bridge_frontend import BridgeException
|
||||||
|
|
||||||
|
|
||||||
DBusGMainLoop(set_as_default=True)
|
DBusGMainLoop(set_as_default=True)
|
||||||
log = getLogger(__name__)
|
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_ERROR_PREFIX = const_INT_PREFIX + ".error"
|
||||||
const_OBJ_PATH = '/org/salutatoi/SAT/bridge'
|
const_OBJ_PATH = '/org/salutatoi/SAT/bridge'
|
||||||
const_CORE_SUFFIX = ".core"
|
const_CORE_SUFFIX = ".core"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue