[Fix] Flatpak ConfigLock detection

openfreebuds_qt/config/config_lock.py

@@ -6,6 +6,7 @@
 
 from openfreebuds.constants import STORAGE_PATH
 from openfreebuds.utils.logger import create_logger
+from openfreebuds_qt.config.dbus_config_lock import DBusConfigLock
 
 log = create_logger("ConfigLock")
 
@@ -15,7 +16,12 @@ class ConfigLock:
     owned: bool = False
 
     @staticmethod
-    def acquire():
+    async def acquire():
+        if sys.platform == "linux" and os.path.isfile("/app/is_container"):
+            ConfigLock.owned = await DBusConfigLock.acquire()
+            log.info(f"DBus ConfigLock result {ConfigLock.owned}")
+            return
+
         if ConfigLock._path.is_file():
             try:
                 with open(ConfigLock._path, "r") as f:

openfreebuds_qt/config/dbus_config_lock.py

@@ -0,0 +1,32 @@
+import asyncio
+
+from dbus_next.aio import MessageBus
+from dbus_next.service import ServiceInterface
+
+
+class DBusConfigLock:
+    task: asyncio.Task
+    bus: MessageBus
+
+    @staticmethod
+    async def acquire():
+        bus = await MessageBus().connect()
+        DBusConfigLock.bus = bus
+
+        dbus_introspect = await bus.introspect("org.freedesktop.DBus", "/org/freedesktop/DBus")
+        dbus_obj = bus.get_proxy_object("org.freedesktop.DBus", "/org/freedesktop/DBus",
+                                        dbus_introspect)
+        dbus = dbus_obj.get_interface("org.freedesktop.DBus")
+
+        # noinspection PyUnresolvedReferences
+        for name in await dbus.call_list_names():
+            if name == "pw.mmk.OpenFreebuds":
+                bus.disconnect()
+                return False
+
+        # Provide void DBus service
+        interface = ServiceInterface('pw.mmk.OpenFreebuds')
+        bus.export('/com/example/sample0', interface)
+        await bus.request_name('pw.mmk.OpenFreebuds')
+
+        return True

openfreebuds_qt/main.py

@@ -55,7 +55,6 @@ def __init__(self, args):
                 logging.getLogger(tag).disabled = True
 
         # App configuration
-        ConfigLock.acquire()
         self.config.update_fallback_values(self)
 
         # Qt base configs
@@ -86,6 +85,7 @@ def start(args):
 
     async def boot(self):
         try:
+            await ConfigLock.acquire()
             await self._stage_setup_ofb()
 
             if self.args.shortcut != "":

scripts/build_flatpak/pw.mmk.OpenFreebuds.yml

@@ -20,7 +20,7 @@ finish-args:
   - --system-talk-name=org.bluez
   # Display tray icon
   - --talk-name=org.kde.StatusNotifierWatcher
-  # Check running state, enable/disable autostart
+  # Enable/disable autostart from in-app settings
   - --talk-name=org.freedesktop.impl.portal.desktop.gnome
 
 cleanup-commands: