Rewrite entire backend

bottles/backend/bottle.py

@@ -0,0 +1,75 @@
+# bottle.py
+#
+# Copyright 2025 The Bottles Contributors
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, in version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import yaml
+from dataclasses import dataclass
+
+from bottles.backend.typing import WindowsAPI, VersionedComponent, Environment
+from bottles.backend.models.config import BottleConfig
+
+
+# BottleConfig(Name='d', Arch='win64', Windows='win10', Runner='sys-wine-10.0', WorkingDir='', DXVK='', NVAPI='', VKD3D='', LatencyFleX='', Path='d', Custom_Path=False, Environment='Application', Creation_Date='', Update_Date='', Versioning=False, Versioning_Exclusion_Patterns=[], State=0, Parameters=BottleParams(dxvk=False, dxvk_nvapi=False, vkd3d=False, latencyflex=False, mangohud=False, mangohud_display_on_game_start=True, obsvkc=False, vkbasalt=False, gamemode=False, gamescope=False, gamescope_game_width=0, gamescope_game_height=0, gamescope_window_width=0, gamescope_window_height=0, gamescope_fps=0, gamescope_fps_no_focus=0, gamescope_scaling=False, gamescope_borderless=False, gamescope_fullscreen=True, sync='wine', fsr=False, fsr_sharpening_strength=2, fsr_quality_mode='none', custom_dpi=96, renderer='gl', discrete_gpu=False, virtual_desktop=False, virtual_desktop_res='1280x720', pulseaudio_latency=False, fullscreen_capture=False, take_focus=False, mouse_warp=True, decorated=True, fixme_logs=False, use_runtime=False, use_eac_runtime=True, use_be_runtime=True, use_steam_runtime=False, sandbox=False, versioning_compression=False, versioning_automatic=False, versioning_exclusion_patterns=False, vmtouch=False, vmtouch_cache_cwd=False), Sandbox=BottleSandboxParams(share_net=False, share_sound=False), Environment_Variables={}, Installed_Dependencies=[], DLL_Overrides={}, External_Programs={}, Uninstallers={}, session_arguments='', run_in_terminal=False, Language='sys', CompatData='', data={}, RunnerPath='')
+@dataclass
+class BottleClass:
+    name: str
+    runner: str
+    environment: Environment
+    mangohud: bool = False
+    vkbasalt: bool = False
+    gamemode: bool = False
+    gamescope: bool = False
+    fidelityfx_super_resolution: bool = False
+    dxvk: VersionedComponent = False
+    nvapi: VersionedComponent = False
+    vkd3d: VersionedComponent = False
+    latencyflex: VersionedComponent = False
+    architecture: WindowsAPI = WindowsAPI.WIN64
+
+
+class Bottle:
+    """Class representing a bottle."""
+
+    @staticmethod
+    def generate_local_bottles_list(bottles_dir: str) -> dict[str, BottleConfig]:
+        """Generate a list of local bottles."""
+
+        local_bottles = {}
+        local_bottles_list = os.listdir(bottles_dir)
+
+        for local_bottle in local_bottles_list:
+            local_bottle_dir = os.path.join(bottles_dir, local_bottle)
+            bottle_config_file_path = os.path.join(local_bottle_dir, "bottle.yml")
+            placeholder_file_path = os.path.join(local_bottle_dir, "placeholder.yml")
+
+            try:
+                with open(placeholder_file_path) as file:
+                    configuration = yaml.safe_load(file)
+                    bottle_config_file_path = configuration["Path"]
+            except FileNotFoundError:
+                pass
+
+            if not os.path.isfile(bottle_config_file_path):
+                continue
+
+            config_load = BottleConfig.load(bottle_config_file_path)
+
+            if not config_load.status:
+                raise TypeError(f"Unable to load {bottle_config_file_path}")
+
+            local_bottles[local_bottle] = config_load.data
+
+        return local_bottles

bottles/backend/cabextract.py

@@ -20,9 +20,7 @@
 import shutil
 import subprocess
 
-from bottles.backend.logger import Logger
-
-logging = Logger()
+import logging
 
 
 class CabExtract:

bottles/backend/dlls/dll.py

@@ -20,14 +20,12 @@
 from abc import abstractmethod
 from copy import deepcopy
 
-from bottles.backend.logger import Logger
+import logging
 from bottles.backend.models.config import BottleConfig
 from bottles.backend.models.enum import Arch
 from bottles.backend.utils.manager import ManagerUtils
 from bottles.backend.wine.reg import Reg
 
-logging = Logger()
-
 
 class DLLComponent:
     base_path: str

bottles/backend/dlls/nvapi.py

@@ -21,12 +21,10 @@
 from bottles.backend.dlls.dll import DLLComponent
 from bottles.backend.models.config import BottleConfig
 from bottles.backend.utils.manager import ManagerUtils
-from bottles.backend.logger import Logger
+import logging
 
 from bottles.backend.utils.nvidia import get_nvidia_dll_path
 
-logging = Logger()
-
 
 class NVAPIComponent(DLLComponent):
     dlls = {

bottles/backend/downloader.py

@@ -21,13 +21,11 @@
 
 import requests
 
-from bottles.backend.logger import Logger
+import logging
 from bottles.backend.models.result import Result
 from bottles.backend.state import TaskStreamUpdateHandler
 from bottles.backend.utils.file import FileUtils
 
-logging = Logger()
-
 
 class Downloader:
     """

bottles/backend/globals.py

@@ -60,6 +60,24 @@ def is_vkbasalt_available():
                 return True
         return False
 
+    @classmethod
+    def get_components_paths(cls) -> list[str]:
+        """Retrieve list of components' paths."""
+
+        return [
+            cls.temp,
+            cls.runtimes,
+            cls.winebridge,
+            cls.runners,
+            cls.bottles,
+            cls.steam,
+            cls.dxvk,
+            cls.vkd3d,
+            cls.nvapi,
+            cls.latencyflex,
+            cls.templates,
+        ]
+
 
 class TrdyPaths:
     # External managers paths

bottles/backend/health.py

@@ -19,15 +19,12 @@
 from bottles.backend.utils import yaml
 import contextlib
 
-from bottles.backend.logger import Logger
 from bottles.backend.utils.display import DisplayUtils
 from bottles.backend.utils.gpu import GPUUtils
 from bottles.backend.utils.generic import is_glibc_min_available
 from bottles.backend.utils.file import FileUtils
 from bottles.backend.params import APP_VERSION
 
-logging = Logger()
-
 
 class HealthChecker:
     x11: bool = False