bridge (dbus): use Tx DBus for backend part of D-Bus bridge:

Due to recent SQLAlchemy integration, Libervia is now using AsyncIO loop exclusively as
main loop, thus GLib's one can't be used anymore (event if it could be in a separate
thread).
Furthermore Python-DBus is known to have design flaws mentioned even in the official
documentation.

Tx DBus is now used to replace Python-DBus, but only for the backend for now, as it will
need some work on the frontend before we can get completely rid of it.
This commit is contained in:
Goffi 2021-06-03 15:21:43 +02:00
commit 6c853262e1

View file

@ -81,7 +81,7 @@ class SAT(service.Service):
self.memory = memory.Memory(self)
# trigger are used to change SàT behaviour
# trigger are used to change Libervia behaviour
self.trigger = (
trigger.TriggerManager()
)
@ -90,14 +90,53 @@ class SAT(service.Service):
bridge_module = dynamic_import.bridge(bridge_name)
if bridge_module is None:
log.error("Can't find bridge module of name {}".format(bridge_name))
log.error(f"Can't find bridge module of name {bridge_name}")
sys.exit(1)
log.info("using {} bridge".format(bridge_name))
log.info(f"using {bridge_name} bridge")
try:
self.bridge = bridge_module.Bridge()
except exceptions.BridgeInitError:
log.error("Bridge can't be initialised, can't start SàT core")
log.error("Bridge can't be initialised, can't start Libervia Backend")
sys.exit(1)
defer.ensureDeferred(self._postInit())
@property
def version(self):
"""Return the short version of Libervia"""
return C.APP_VERSION
@property
def full_version(self):
"""Return the full version of Libervia
In developement mode, release name and extra data are returned too
"""
version = self.version
if version[-1] == "D":
# we are in debug version, we add extra data
try:
return self._version_cache
except AttributeError:
self._version_cache = "{} « {} » ({})".format(
version, C.APP_RELEASE_NAME, utils.getRepositoryData(sat)
)
return self._version_cache
else:
return version
@property
def bridge_name(self):
return os.path.splitext(os.path.basename(self.bridge.__file__))[0]
async def _postInit(self):
try:
bridge_pi = self.bridge.postInit
except AttributeError:
pass
else:
await bridge_pi()
self.bridge.register_method("getReady", lambda: self.initialised)
self.bridge.register_method("getVersion", lambda: self.full_version)
self.bridge.register_method("getFeatures", self.getFeatures)
@ -176,37 +215,8 @@ class SAT(service.Service):
self.bridge.register_method("imageResize", self._imageResize)
self.bridge.register_method("imageGeneratePreview", self._imageGeneratePreview)
self.bridge.register_method("imageConvert", self._imageConvert)
defer.ensureDeferred(self._postInit())
@property
def version(self):
"""Return the short version of SàT"""
return C.APP_VERSION
@property
def full_version(self):
"""Return the full version of SàT
In developement mode, release name and extra data are returned too
"""
version = self.version
if version[-1] == "D":
# we are in debug version, we add extra data
try:
return self._version_cache
except AttributeError:
self._version_cache = "{} « {} » ({})".format(
version, C.APP_RELEASE_NAME, utils.getRepositoryData(sat)
)
return self._version_cache
else:
return version
@property
def bridge_name(self):
return os.path.splitext(os.path.basename(self.bridge.__file__))[0]
async def _postInit(self):
await self.memory.initialise()
self.common_cache = cache.Cache(self, None)
log.info(_("Memory initialised"))