Rewrite entire backend

.github/workflows/build_flatpak.yml

@@ -8,11 +8,11 @@ jobs:
     name: "build-packages"
     runs-on: ubuntu-latest
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-47
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
       options: --privileged
     steps:
     - uses: actions/checkout@v4
-    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
+    - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
       with:
         bundle: bottles.flatpak
         manifest-path: build-aux/com.usebottles.bottles.Devel.json

.github/workflows/update-manifest.yml

@@ -37,11 +37,11 @@ jobs:
           git config user.name "github-actions[bot]"
           pur -r requirements.txt
           pur -r requirements.dev.txt
-          req2flatpak --requirements-file requirements.txt --yaml --target-platforms 312-x86_64 -o com.usebottles.bottles.pypi-deps.yaml
-          git diff ${{ github.ref_name }} --exit-code requirements.txt requirements.dev.txt com.usebottles.bottles.pypi-deps.yaml
+          req2flatpak --requirements-file requirements.txt --yaml --target-platforms 312-x86_64 -o build-aux/pypi-deps.yaml
+          git diff ${{ github.ref_name }} --exit-code requirements.txt requirements.dev.txt build-aux/pypi-deps.yaml
           updated=$?
           if [ $updated -ne 0 ]; then
-              git add requirements.txt requirements.dev.txt com.usebottles.bottles.pypi-deps.yaml
+              git add requirements.txt requirements.dev.txt pypi-deps
               git commit -m "Update PyPI dependencies"
           fi
 

.pre-commit-config.yaml

@@ -13,21 +13,27 @@ repos:
         args: ["--autofix", "--no-sort-keys", "--indent", "4"]
     -   id: check-added-large-files
 
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v3.19.1
+    hooks:
+    -   id: pyupgrade
+        args: ["--py312-plus"]
+
 -   repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.8.2
     hooks:
     -   id: ruff
         args: [ "--fix" ]
     -   id: ruff-format
 
+-   repo: https://github.com/PyCQA/autoflake
+    rev: v2.3.1
+    hooks:
+    -   id: autoflake
+
 -   repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.13.0
     hooks:
     -   id: mypy
         args: ["--pretty"]
-        additional_dependencies: ["pygobject-stubs", "types-PyYAML", "types-Markdown", "types-requests", "types-pycurl", "types-chardet", "pytest-stub", "types-orjson", "pathvalidate", "requirements-parser", "icoextract", "fvs", "patool", "git+https://gitlab.com/TheEvilSkeleton/vkbasalt-cli.git@main"]
-
--   repo: https://github.com/PyCQA/autoflake
-    rev: v2.3.1
-    hooks:
-    -   id: autoflake
+        additional_dependencies: ["pygobject-stubs", "types-PyYAML", "types-Markdown", "types-requests", "types-pycurl", "types-chardet", "pytest-stub", "types-orjson", "pathvalidate", "requirements-parser", "icoextract", "fvs", "patool", "pyfluidsynth", "git+https://gitlab.com/TheEvilSkeleton/vkbasalt-cli.git@main"]

CODING_GUIDE.md

@@ -33,7 +33,7 @@ pytest .
 Regenerate PYPI dependency manifest when requirements.txt changed
 
 ```bash
-python ./build-aux/flatpak-pip-generator.py --runtime org.gnome.Sdk -r requirements.txt -o com.usebottles.bottles.pypi-deps --yaml
+python ./build-aux/req2flatpak/req2flatpak.py --requirements-file requirements.txt --yaml --target-platforms 312-x86_64 -o build-aux/pypi-deps.yaml
 ```
 
 ## I18n files

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

@@ -19,11 +19,8 @@
 import shlex
 import shutil
 import subprocess
-from typing import Optional
 
-from bottles.backend.logger import Logger
-
-logging = Logger()
+import logging
 
 
 class CabExtract:
@@ -47,7 +44,7 @@ def run(
         self,
         path: str,
         name: str = "",
-        files: Optional[list] = None,
+        files: list | None = None,
         destination: str = "",
     ):
         if files is None:

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

@@ -18,17 +18,14 @@
 import shutil
 import sys
 import time
-from typing import Optional
 
 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:
     """
@@ -38,7 +35,7 @@ class Downloader:
     """
 
     def __init__(
-        self, url: str, file: str, update_func: Optional[TaskStreamUpdateHandler] = None
+        self, url: str, file: str, update_func: TaskStreamUpdateHandler | None = None
     ):
         self.start_time = None
         self.url = url

bottles/backend/globals.py

@@ -18,7 +18,6 @@
 import os
 import shutil
 from pathlib import Path
-from typing import Dict
 from bottles.backend.utils import yaml, json
 
 
@@ -61,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
@@ -82,12 +99,12 @@ class TrdyPaths:
 vmtouch_available = shutil.which("vmtouch") or False
 base_version = ""
 if os.path.isfile("/app/manifest.json"):
-    with open("/app/manifest.json", mode="r", encoding="utf-8") as file:
+    with open("/app/manifest.json", encoding="utf-8") as file:
         base_version = (
             json.load(file)  # type: ignore
             .get("base-version", "")
             .removeprefix("stable-")
         )
 
 # encoding detection correction, following windows defaults
-locale_encodings: Dict[str, str] = {"ja_JP": "cp932", "zh_CN": "gbk"}
+locale_encodings: dict[str, str] = {"ja_JP": "cp932", "zh_CN": "gbk"}

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