Added an extra input to gamescope for extra flags

.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/cabextract.py

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

bottles/backend/downloader.py

@@ -18,7 +18,6 @@
 import shutil
 import sys
 import time
-from typing import Optional
 
 import requests
 
@@ -38,7 +37,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
 
 
@@ -82,12 +81,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/managers/component.py

@@ -20,7 +20,6 @@
 import shutil
 import tarfile
 from functools import lru_cache
-from typing import Optional
 
 import pycurl
 
@@ -131,7 +130,7 @@ def download(
         file: str,
         rename: str = "",
         checksum: str = "",
-        func: Optional[TaskStreamUpdateHandler] = None,
+        func: TaskStreamUpdateHandler | None = None,
     ) -> bool:
         """Download a component from the Bottles repository."""
 
@@ -274,7 +273,7 @@ def extract(name: str, component: str, archive: str) -> bool:
             root_dir = tar.getnames()[0]
             tar.extractall(path)
             tar.close()
-        except (tarfile.TarError, IOError, EOFError):
+        except (tarfile.TarError, OSError, EOFError):
             with contextlib.suppress(FileNotFoundError):
                 os.remove(os.path.join(Paths.temp, archive))
             with contextlib.suppress(FileNotFoundError):
@@ -301,7 +300,7 @@ def install(
         self,
         component_type: str,
         component_name: str,
-        func: Optional[TaskStreamUpdateHandler] = None,
+        func: TaskStreamUpdateHandler | None = None,
     ):
         """
         This function is used to install a component. It automatically

bottles/backend/managers/conf.py

@@ -1,16 +1,15 @@
 import os
 from configparser import ConfigParser
-from typing import Optional
 
 from bottles.backend.utils import yaml, json
 
 
-class ConfigManager(object):
+class ConfigManager:
     def __init__(
         self,
-        config_file: Optional[str] = None,
+        config_file: str | None = None,
         config_type: str = "ini",
-        config_string: Optional[str] = None,
+        config_string: str | None = None,
     ):
         self.config_file = config_file
         self.config_string = config_string
@@ -44,10 +43,10 @@ def read(self):
                 # noinspection PyProtectedMember
                 res = config._sections
             elif self.config_type == "json":
-                with open(self.config_file, "r") as f:
+                with open(self.config_file) as f:
                     res = json.load(f)
             elif self.config_type == "yaml" or self.config_type == "yml":
-                with open(self.config_file, "r") as f:
+                with open(self.config_file) as f:
                     res = yaml.load(f)
             else:
                 raise ValueError("Invalid configuration type")
@@ -94,7 +93,7 @@ def write_ini(self):
         with open(self.config_file, "w") as f:
             config.write(f)
 
-    def write_dict(self, config_file: Optional[str] = None):
+    def write_dict(self, config_file: str | None = None):
         if self.config_file is None and config_file is None:
             raise ValueError("No config path specified")
         elif self.config_file is None and config_file is not None:

bottles/backend/managers/data.py

@@ -45,7 +45,7 @@ def __init__(self):
 
     def __get_data(self):
         try:
-            with open(self.__p_data, "r") as s:
+            with open(self.__p_data) as s:
                 self.__data = yaml.load(s)
                 if self.__data is None:
                     raise AttributeError

bottles/backend/managers/dependency.py

@@ -91,7 +91,9 @@ def install(self, config: BottleConfig, dependency: list) -> Result:
         task_id = TaskManager.add(Task(title=dependency[0]))
 
         logging.info(
-            "Installing dependency [%s] in bottle [%s]." % (dependency[0], config.Name),
+            "Installing dependency [{}] in bottle [{}].".format(
+                dependency[0], config.Name
+            ),
         )
         manifest = self.get_dependency(dependency[0])
         if not manifest:

bottles/backend/managers/epicgamesstore.py

@@ -59,7 +59,7 @@ def get_installed_games(config: BottleConfig) -> list:
         if dat_path is None:
             return []
 
-        with open(dat_path, "r") as dat:
+        with open(dat_path) as dat:
             data = json.load(dat)
 
             for game in data["InstallationList"]:

bottles/backend/managers/installer.py

@@ -18,7 +18,6 @@
 import subprocess
 import uuid
 from functools import lru_cache
-from typing import Optional
 
 import markdown
 import pycurl
@@ -358,7 +357,7 @@ def install(
         installer: dict,
         step_fn: callable,
         is_final: bool = True,
-        local_resources: Optional[dict] = None,
+        local_resources: dict | None = None,
     ):
         manifest = self.get_installer(installer[0])
         _config = config

bottles/backend/managers/journal.py

@@ -20,7 +20,6 @@
 import shutil
 import uuid
 from datetime import datetime, timedelta
-from typing import Optional
 
 from bottles.backend.globals import Paths
 from bottles.backend.utils import yaml
@@ -52,7 +51,7 @@ def __get_journal() -> dict:
             with open(JournalManager.path, "w") as f:
                 yaml.dump({}, f)
 
-        with open(JournalManager.path, "r") as f:
+        with open(JournalManager.path) as f:
             try:
                 journal = yaml.load(f)
             except yaml.YAMLError:
@@ -100,7 +99,7 @@ def __clean_old():
         JournalManager.__save_journal(journal)
 
     @staticmethod
-    def __save_journal(journal: Optional[dict] = None):
+    def __save_journal(journal: dict | None = None):
         """Save the journal to the journal file."""
         if journal is None:
             journal = JournalManager.__get_journal()

bottles/backend/managers/library.py

@@ -49,7 +49,7 @@ def load_library(self, silent=False):
             self.__library = {}
             self.save_library()
         else:
-            with open(self.library_path, "r") as library_file:
+            with open(self.library_path) as library_file:
                 self.__library = yaml.load(library_file)
 
         if self.__library is None:

bottles/backend/managers/manager.py

@@ -26,7 +26,7 @@
 from datetime import datetime
 from gettext import gettext as _
 from glob import glob
-from typing import Any, Dict, List, Optional
+from typing import Any
 
 import pathvalidate
 
@@ -91,7 +91,7 @@ class Manager(metaclass=Singleton):
     vkd3d_available = []
     nvapi_available = []
     latencyflex_available = []
-    local_bottles: Dict[str, BottleConfig] = {}
+    local_bottles: dict[str, BottleConfig] = {}
     supported_runtimes = {}
     supported_winebridge = {}
     supported_wine_runners = {}
@@ -413,7 +413,7 @@ def check_runners(self, install_latest: bool = True) -> bool:
 
         if len(self.runners_available) > 0:
             logging.info(
-                "Runners found:\n - {0}".format("\n - ".join(self.runners_available))
+                "Runners found:\n - {}".format("\n - ".join(self.runners_available))
             )
 
         tmp_runners = [x for x in self.runners_available if not x.startswith("sys-")]
@@ -464,7 +464,7 @@ def check_runtimes(self, install_latest: bool = True) -> bool:
         manifest = os.path.join(Paths.runtimes, runtime, "manifest.yml")
 
         if os.path.exists(manifest):
-            with open(manifest, "r") as f:
+            with open(manifest) as f:
                 data = yaml.load(f)
                 version = data.get("version")
                 if version:
@@ -493,7 +493,7 @@ def check_winebridge(
 
         version_file = os.path.join(Paths.winebridge, "VERSION")
         if os.path.exists(version_file):
-            with open(version_file, "r") as f:
+            with open(version_file) as f:
                 version = f.read().strip()
                 if version:
                     self.winebridge_available = [f"winebridge-{version}"]
@@ -630,7 +630,7 @@ def __check_component(
 
         if len(component["available"]) > 0:
             logging.info(
-                "{0}s found:\n - {1}".format(
+                "{}s found:\n - {}".format(
                     component_type.capitalize(), "\n - ".join(component["available"])
                 )
             )
@@ -663,7 +663,7 @@ def __check_component(
         except ValueError:
             return sorted(component["available"], reverse=True)
 
-    def get_programs(self, config: BottleConfig) -> List[dict]:
+    def get_programs(self, config: BottleConfig) -> list[dict]:
         """
         Get the list of programs (both from the drive and the user defined
         in the bottle configuration file).
@@ -725,6 +725,7 @@ def get_programs(self, config: BottleConfig) -> List[dict]:
                     "pre_script": _program.get("pre_script"),
                     "post_script": _program.get("post_script"),
                     "folder": _program.get("folder", program_folder),
+                    "midi_soundfont": _program.get("midi_soundfont"),
                     "dxvk": _program.get("dxvk"),
                     "vkd3d": _program.get("vkd3d"),
                     "dxvk_nvapi": _program.get("dxvk_nvapi"),
@@ -825,7 +826,7 @@ def process_bottle(bottle):
             _config = os.path.join(_bottle, "bottle.yml")
 
             if os.path.exists(_placeholder):
-                with open(_placeholder, "r") as f:
+                with open(_placeholder) as f:
                     try:
                         placeholder_yaml = yaml.load(f)
                         if placeholder_yaml.get("Path"):
@@ -951,7 +952,7 @@ def process_bottle(bottle):
 
         if len(self.local_bottles) > 0 and not silent:
             logging.info(
-                "Bottles found:\n - {0}".format("\n - ".join(self.local_bottles))
+                "Bottles found:\n - {}".format("\n - ".join(self.local_bottles))
             )
 
         if (
@@ -1138,7 +1139,7 @@ def create_bottle(
         sandbox: bool = False,
         fn_logger: callable = None,
         arch: str = "win64",
-        custom_environment: Optional[str] = None,
+        custom_environment: str | None = None,
     ) -> Result[dict]:
         """
         Create a new bottle from the given arguments.
@@ -1392,7 +1393,7 @@ def components_check():
             env = Samples.environments[environment.lower()]
         elif custom_environment:
             try:
-                with open(custom_environment, "r") as f:
+                with open(custom_environment) as f:
                     env = yaml.load(f.read())
                     logging.warning("Using a custom environment recipe…")
                     log_update(_("(!) Using a custom environment recipe…"))