Fix flatpak devel build bottles-cli functionality

bottles/backend/managers/eagle.py

@@ -32,6 +32,7 @@
 from bottles.backend.models.result import Result
 from bottles.backend.state import SignalManager, Signals
 from bottles.backend.logger import Logger
+from bottles.backend.params import APP_ID
 
 from gi.repository import Gio, GLib
 
@@ -403,7 +404,7 @@ def analyze(self, executable_path: str) -> None:
 
                 extracted_files, extract_dir = self._extract_installer(executable_path, "MSI")
                 if extracted_files:
-                    settings = Gio.Settings.new("com.usebottles.bottles")
+                    settings = Gio.Settings.new(APP_ID)
                     scan_limit = settings.get_int("eagle-scan-limit")
                     files_to_scan = extracted_files[:scan_limit]
                     for i, ef in enumerate(files_to_scan):
@@ -658,7 +659,7 @@ def analyze(self, executable_path: str) -> None:
                 self._send_step("Analysing Electron archive...")
                 extracted_asar_files, asar_extract_dir = self._extract_asar(asar_path)
                 if extracted_asar_files:
-                    settings = Gio.Settings.new("com.usebottles.bottles")
+                    settings = Gio.Settings.new(APP_ID)
                     scan_limit = settings.get_int("eagle-scan-limit")
                     for i, ef in enumerate(extracted_asar_files[:scan_limit]):
                         fname = os.path.basename(ef)
@@ -729,7 +730,7 @@ def analyze(self, executable_path: str) -> None:
                             main_exe = max(exe_files, key=os.path.getsize)
                             self._send_step(f"Scanning main binary: {os.path.basename(main_exe)}")
 
-                            settings = Gio.Settings.new("com.usebottles.bottles")
+                            settings = Gio.Settings.new(APP_ID)
                             scan_limit = settings.get_int("eagle-scan-limit")
                             files_to_scan = extracted_files[:scan_limit]
 

bottles/frontend/windows/bottlepicker.py

@@ -21,7 +21,7 @@
 
 from bottles.backend.managers.manager import Manager
 from bottles.backend.models.config import BottleConfig
-from bottles.frontend.params import BASE_ID
+from bottles.frontend.params import APP_ID
 
 
 class BottleEntry(Adw.ActionRow):
@@ -36,7 +36,7 @@ class BottlePickerDialog(Adw.ApplicationWindow):
     """This class should not be called from the application GUI, only from CLI."""
 
     __gtype_name__ = "BottlePickerDialog"
-    settings = Gio.Settings.new(BASE_ID)
+    settings = Gio.Settings.new(APP_ID)
     Adw.init()
 
     # region Widgets

bottles/frontend/windows/window.py

@@ -36,7 +36,7 @@
 from bottles.backend.utils.connection import ConnectionUtils
 from bottles.backend.utils.threading import RunAsync
 from bottles.frontend.operation import TaskSyncer
-from bottles.frontend.params import APP_ID, BASE_ID, PROFILE
+from bottles.frontend.params import APP_ID, PROFILE
 from bottles.frontend.utils.gtk import GtkUtils
 from bottles.frontend.views.details import DetailsView
 from bottles.frontend.views.importer import ImporterView
@@ -74,7 +74,7 @@ class BottlesWindow(Adw.ApplicationWindow):
 
     # Common variables
     previous_page = ""
-    settings = Gio.Settings.new(BASE_ID)
+    settings = Gio.Settings.new(APP_ID)
     argument_executed = False
     _winebridge_dialog_shown = False
 

data/com.usebottles.bottles.gschema.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist gettext-domain="bottles">
-	<schema id="com.usebottles.bottles" path="/com/usebottles/bottles/">
+	<schema id="@APP_ID@" path="/com/usebottles/bottles/">
     <key type="b" name="flatpak-migration">
       <default>true</default>
       <summary>Flatpak migration</summary>

data/meson.build

@@ -55,7 +55,11 @@ if appstream_util.found()
   )
 endif
 
-install_data('com.usebottles.bottles.gschema.xml',
+configure_file(
+  input: 'com.usebottles.bottles.gschema.xml',
+  output: '@0@.gschema.xml'.format(APP_ID),
+  configuration: conf,
+  install: true,
   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
 )