- 
-
diff --git a/VERSION b/VERSION
index c7b934fb6e3..1c4fafa0cf3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-51.9
+51.11
diff --git a/bottles/backend/cabextract.py b/bottles/backend/cabextract.py
index 313b8fdbaef..4fcf3702361 100644
--- a/bottles/backend/cabextract.py
+++ b/bottles/backend/cabextract.py
@@ -33,6 +33,7 @@ class CabExtract:
extracts the file in a new directory with the input name under the Bottles'
temp directory.
"""
+
requirements: bool = False
path: str
name: str
@@ -42,7 +43,13 @@ class CabExtract:
def __init__(self):
self.cabextract_bin = shutil.which("cabextract")
- def run(self, path: str, name: str = "", files: Optional[list] = None, destination: str = ""):
+ def run(
+ self,
+ path: str,
+ name: str = "",
+ files: Optional[list] = None,
+ destination: str = "",
+ ):
if files is None:
files = []
@@ -70,10 +77,10 @@ def __extract(self) -> bool:
try:
if len(self.files) > 0:
for file in self.files:
- '''
+ """
if file already exists as a symlink, remove it
preventing broken symlinks
- '''
+ """
if os.path.exists(os.path.join(self.destination, file)):
if os.path.islink(os.path.join(self.destination, file)):
os.unlink(os.path.join(self.destination, file))
@@ -82,27 +89,27 @@ def __extract(self) -> bool:
self.cabextract_bin,
f"-F '*{file}*'",
f"-d {self.destination}",
- f"-q {self.path}"
+ f"-q {self.path}",
]
command = " ".join(command)
- subprocess.Popen(
- command,
- shell=True
- ).communicate()
+ subprocess.Popen(command, shell=True).communicate()
if len(file.split("/")) > 1:
_file = file.split("/")[-1]
_dir = file.replace(_file, "")
if not os.path.exists(f"{self.destination}/{_file}"):
- shutil.move(f"{self.destination}/{_dir}/{_file}", f"{self.destination}/{_file}")
+ shutil.move(
+ f"{self.destination}/{_dir}/{_file}",
+ f"{self.destination}/{_file}",
+ )
else:
command_list = [
self.cabextract_bin,
f"-d {self.destination}",
- f"-q {self.path}"
+ f"-q {self.path}",
]
command = " ".join(command_list)
- subprocess.Popen(command, shell=True).communicate()
+ subprocess.Popen(command, shell=True).communicate()
logging.info(f"Cabinet {self.name} extracted successfully")
return True
diff --git a/bottles/backend/diff.py b/bottles/backend/diff.py
index ef977717fd0..1952c31771c 100644
--- a/bottles/backend/diff.py
+++ b/bottles/backend/diff.py
@@ -7,12 +7,8 @@ class Diff:
This class is no more used by the application, it's just a
reference for future implementations.
"""
- __ignored = [
- "dosdevices",
- "users",
- "bottle.yml",
- "storage"
- ]
+
+ __ignored = ["dosdevices", "users", "bottle.yml", "storage"]
@staticmethod
def hashify(path: str) -> dict:
@@ -26,10 +22,10 @@ def hashify(path: str) -> dict:
_files = {}
if path[-1] != os.sep:
- '''
+ """
Be sure to add a trailing slash at the end of the path to
prevent the correct path name in the result.
- '''
+ """
path += os.sep
for root, dirs, files in os.walk(path):
@@ -71,8 +67,4 @@ def compare(parent: dict, child: dict) -> dict:
elif parent[f] != child[f]:
changed.append(f)
- return {
- "added": added,
- "removed": removed,
- "changed": changed
- }
+ return {"added": added, "removed": removed, "changed": changed}
diff --git a/bottles/backend/dlls/dll.py b/bottles/backend/dlls/dll.py
index ab7563f2eab..c88f478def5 100644
--- a/bottles/backend/dlls/dll.py
+++ b/bottles/backend/dlls/dll.py
@@ -45,11 +45,18 @@ def __init__(self, version: str):
def get_base_path(version: str) -> str:
pass
+ @staticmethod
+ @abstractmethod
+ def get_override_keys() -> str:
+ pass
+
def check(self) -> bool:
found = deepcopy(self.dlls)
if None in self.dlls:
- logging.error(f"DLL(s) \"{self.dlls[None]}\" path haven't been found, ignoring...")
+ logging.error(
+ f'DLL(s) "{self.dlls[None]}" path haven\'t been found, ignoring...'
+ )
return
for path in self.dlls:
@@ -77,13 +84,15 @@ def install(self, config: BottleConfig, overrides_only: bool = False, exclude=No
exclude = []
if None in self.checked_dlls:
- logging.error(f"DLL(s) \"{self.checked_dlls[None]}\" path haven't been found, ignoring...")
+ logging.error(
+ f'DLL(s) "{self.checked_dlls[None]}" path haven\'t been found, ignoring...'
+ )
return
for path in self.checked_dlls:
for dll in self.checked_dlls[path]:
if dll not in exclude:
- dll_name = dll.split('/')[-1].split('.')[0]
+ dll_name = dll.split("/")[-1].split(".")[0]
if overrides_only:
dll_in.append(dll_name)
else:
@@ -91,10 +100,9 @@ def install(self, config: BottleConfig, overrides_only: bool = False, exclude=No
dll_in.append(dll_name)
for dll in dll_in:
- bundle["HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides"].append({
- "value": dll,
- "data": "native,builtin"
- })
+ bundle["HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides"].append(
+ {"value": dll, "data": "native,builtin"}
+ )
reg.import_bundle(bundle)
@@ -107,21 +115,22 @@ def uninstall(self, config: BottleConfig, exclude=None):
exclude = []
if None in self.dlls:
- logging.error(f"DLL(s) \"{self.dlls[None]}\" path haven't been found, ignoring...")
+ logging.error(
+ f'DLL(s) "{self.dlls[None]}" path haven\'t been found, ignoring...'
+ )
return
for path in self.dlls:
for dll in self.dlls[path]:
if dll not in exclude:
- dll_name = dll.split('/')[-1].split('.')[0]
+ dll_name = dll.split("/")[-1].split(".")[0]
if self.__uninstall_dll(config, path, dll):
dll_in.append(dll_name)
for dll in dll_in:
- bundle["HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides"].append({
- "value": dll,
- "data": "-"
- })
+ bundle["HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides"].append(
+ {"value": dll, "data": "-"}
+ )
reg.import_bundle(bundle)
@@ -131,14 +140,18 @@ def __get_sys_path(config: BottleConfig, path: str):
if path in ["x32", "x86"]:
return "system32"
if config.Arch == Arch.WIN64:
- if path in ["x64"] or any(arch in path for arch in ("x86_64", "lib64", "lib/")):
+ if path in ["x64"] or any(
+ arch in path for arch in ("x86_64", "lib64", "lib/")
+ ):
return "system32"
if path in ["x32", "x86"]:
return "syswow64"
return None
- def __install_dll(self, config: BottleConfig, path: str, dll: str, remove: bool = False):
- dll_name = dll.split('/')[-1]
+ def __install_dll(
+ self, config: BottleConfig, path: str, dll: str, remove: bool = False
+ ):
+ dll_name = dll.split("/")[-1]
bottle = ManagerUtils.get_bottle_path(config)
bottle = os.path.join(bottle, "drive_c", "windows")
source = os.path.join(self.base_path, path, dll)
@@ -158,27 +171,29 @@ def __install_dll(self, config: BottleConfig, path: str, dll: str, remove: bool
try:
shutil.copyfile(source, target)
except FileNotFoundError:
- logging.warning(f"{source} not found") # TODO: should not be ok but just ignore it for now
+ logging.warning(
+ f"{source} not found"
+ ) # TODO: should not be ok but just ignore it for now
return False
- '''
+ """
reg.add(
key="HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides",
value=dll_name.split('.')[0],
data="native,builtin"
)
- '''
+ """
return True
if os.path.exists(f"{target}.bck"):
shutil.move(f"{target}.bck", target)
elif os.path.exists(target):
os.remove(target)
- '''
+ """
reg.remove(
key="HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides",
value=dll_name.split('.')[0]
)
- '''
+ """
return True
def __uninstall_dll(self, config, path: str, dll: str):
diff --git a/bottles/backend/dlls/dxvk.py b/bottles/backend/dlls/dxvk.py
index b4beb54b23c..53077d75f9c 100644
--- a/bottles/backend/dlls/dxvk.py
+++ b/bottles/backend/dlls/dxvk.py
@@ -21,20 +21,14 @@
class DXVKComponent(DLLComponent):
dlls = {
- "x32": [
- "d3d9.dll",
- "d3d10core.dll",
- "d3d11.dll",
- "dxgi.dll"
- ],
- "x64": [
- "d3d9.dll",
- "d3d10core.dll",
- "d3d11.dll",
- "dxgi.dll"
- ]
+ "x32": ["d3d9.dll", "d3d10core.dll", "d3d11.dll", "dxgi.dll"],
+ "x64": ["d3d9.dll", "d3d10core.dll", "d3d11.dll", "dxgi.dll"],
}
+ @staticmethod
+ def get_override_keys() -> str:
+ return "d3d9,d3d10core,d3d11,dxgi"
+
@staticmethod
def get_base_path(version: str) -> str:
return ManagerUtils.get_dxvk_path(version)
diff --git a/bottles/backend/dlls/latencyflex.py b/bottles/backend/dlls/latencyflex.py
index 87c5fb0f938..447b2da6f6c 100644
--- a/bottles/backend/dlls/latencyflex.py
+++ b/bottles/backend/dlls/latencyflex.py
@@ -27,6 +27,10 @@ class LatencyFleXComponent(DLLComponent):
]
}
+ @staticmethod
+ def get_override_keys() -> str:
+ return "latencyflex_layer,latencyflex_wine"
+
@staticmethod
def get_base_path(version: str) -> str:
return ManagerUtils.get_latencyflex_path(version)
diff --git a/bottles/backend/dlls/nvapi.py b/bottles/backend/dlls/nvapi.py
index af630f001e4..fffca0ba42f 100644
--- a/bottles/backend/dlls/nvapi.py
+++ b/bottles/backend/dlls/nvapi.py
@@ -30,18 +30,16 @@
class NVAPIComponent(DLLComponent):
dlls = {
- "x32": [
- "nvapi.dll"
- ],
- "x64": [
- "nvapi64.dll"
- ],
- get_nvidia_dll_path(): [
- "nvngx.dll",
- "_nvngx.dll"
- ]
+ "x32": ["nvapi.dll"],
+ "x64": ["nvapi64.dll"],
+ get_nvidia_dll_path(): ["nvngx.dll", "_nvngx.dll"],
}
+ @staticmethod
+ def get_override_keys() -> str:
+ # Bottles does not override (_)nvngx
+ return "nvapi,nvapi64"
+
@staticmethod
def get_base_path(version: str) -> str:
return ManagerUtils.get_nvapi_path(version)
@@ -49,6 +47,7 @@ def get_base_path(version: str) -> str:
@staticmethod
def check_bottle_nvngx(bottle_path: str, bottle_config: BottleConfig):
"""Checks for the presence of the DLLs provided by the Nvidia driver, and if they're up to date."""
+
def md5sum(file):
hash_md5 = hashlib.md5()
with open(file, "rb") as f:
@@ -60,7 +59,9 @@ def md5sum(file):
nvngx_path_system = get_nvidia_dll_path()
if nvngx_path_system is None:
- logging.error("Nvidia driver libraries haven't been found. DLSS might not work!")
+ logging.error(
+ "Nvidia driver libraries haven't been found. DLSS might not work!"
+ )
return
# Reinstall nvngx if not present (acts as migration for this new patch)
@@ -74,10 +75,14 @@ def md5sum(file):
# If the system dll is different than the one in the bottle, reinstall them
# Nvidia driver updates can change this DLL, so this should be checked at each startup
- if md5sum(os.path.join(nvngx_path_bottle, "nvngx.dll")) != md5sum(os.path.join(get_nvidia_dll_path(), "nvngx.dll")):
+ if md5sum(os.path.join(nvngx_path_bottle, "nvngx.dll")) != md5sum(
+ os.path.join(get_nvidia_dll_path(), "nvngx.dll")
+ ):
NVAPIComponent(bottle_config.NVAPI).install(bottle_config)
return
-
- if md5sum(os.path.join(nvngx_path_bottle, "_nvngx.dll")) != md5sum(os.path.join(get_nvidia_dll_path(), "_nvngx.dll")):
+
+ if md5sum(os.path.join(nvngx_path_bottle, "_nvngx.dll")) != md5sum(
+ os.path.join(get_nvidia_dll_path(), "_nvngx.dll")
+ ):
NVAPIComponent(bottle_config.NVAPI).install(bottle_config)
return
diff --git a/bottles/backend/dlls/vkd3d.py b/bottles/backend/dlls/vkd3d.py
index 4f545b1160c..7c0729be2ac 100644
--- a/bottles/backend/dlls/vkd3d.py
+++ b/bottles/backend/dlls/vkd3d.py
@@ -21,16 +21,14 @@
class VKD3DComponent(DLLComponent):
dlls = {
- "x86": [
- "d3d12.dll",
- "d3d12core.dll"
- ],
- "x64": [
- "d3d12.dll",
- "d3d12core.dll"
- ]
+ "x86": ["d3d12.dll", "d3d12core.dll"],
+ "x64": ["d3d12.dll", "d3d12core.dll"],
}
+ @staticmethod
+ def get_override_keys() -> str:
+ return "d3d12,d3d12core"
+
@staticmethod
def get_base_path(version: str) -> str:
return ManagerUtils.get_vkd3d_path(version)
diff --git a/bottles/backend/downloader.py b/bottles/backend/downloader.py
index 83c4e392d44..9772be16389 100644
--- a/bottles/backend/downloader.py
+++ b/bottles/backend/downloader.py
@@ -37,7 +37,9 @@ class Downloader:
bars using the func parameter.
"""
- def __init__(self, url: str, file: str, update_func: Optional[TaskStreamUpdateHandler] = None):
+ def __init__(
+ self, url: str, file: str, update_func: Optional[TaskStreamUpdateHandler] = None
+ ):
self.start_time = None
self.url = url
self.file = file
@@ -48,7 +50,9 @@ def download(self) -> Result:
try:
with open(self.file, "wb") as file:
self.start_time = time.time()
- headers = {"User-Agent": "curl/7.79.1"} # we fake the user-agent to avoid 403 errors on some servers
+ headers = {
+ "User-Agent": "curl/7.79.1"
+ } # we fake the user-agent to avoid 403 errors on some servers
response = requests.get(self.url, stream=True, headers=headers)
total_size = int(response.headers.get("content-length", 0))
received_size = 0
@@ -67,12 +71,16 @@ def download(self) -> Result:
self.update_func(1, 1)
self.__progress(1, 1)
except requests.exceptions.SSLError:
- logging.error("Download failed due to a SSL error. "
- "Your system may have a wrong date/time or wrong certificates.")
+ logging.error(
+ "Download failed due to a SSL error. "
+ "Your system may have a wrong date/time or wrong certificates."
+ )
return Result(False, message="Download failed due to a SSL error.")
except (requests.exceptions.RequestException, OSError):
logging.error("Download failed! Check your internet connection.")
- return Result(False, message="Download failed! Check your internet connection.")
+ return Result(
+ False, message="Download failed! Check your internet connection."
+ )
return Result(True)
@@ -81,24 +89,32 @@ def __progress(self, received_size, total_size):
percent = int(received_size * 100 / total_size)
done_str = FileUtils.get_human_size(received_size)
total_str = FileUtils.get_human_size(total_size)
- speed_str = FileUtils.get_human_size(received_size / (time.time() - self.start_time))
+ speed_str = FileUtils.get_human_size(
+ received_size / (time.time() - self.start_time)
+ )
name = self.file.split("/")[-1]
c_close, c_complete, c_incomplete = "\033[0m", "\033[92m", "\033[90m"
divider = 2
- full_text_size = len(f"\r{c_complete}{name} (100%) "
- f"{'━' * int(100 / divider)} "
- f"({total_str}/{total_str} - 100MB)")
+ full_text_size = len(
+ f"\r{c_complete}{name} (100%) "
+ f"{'━' * int(100 / divider)} "
+ f"({total_str}/{total_str} - 100MB)"
+ )
while shutil.get_terminal_size().columns < full_text_size:
divider = divider + 1
- full_text_size = len(f"\r{c_complete}{name} (100%) "
- f"{'━' * int(100 / divider)} "
- f"({total_str}/{total_str} - 100MB)")
+ full_text_size = len(
+ f"\r{c_complete}{name} (100%) "
+ f"{'━' * int(100 / divider)} "
+ f"({total_str}/{total_str} - 100MB)"
+ )
if divider > 10:
break
- text = f"\r{c_incomplete if percent < 100 else c_complete}{name} ({percent}%) " \
- f"{'━' * int(percent / divider)} " \
- f"({done_str}/{total_str} - {speed_str})"
+ text = (
+ f"\r{c_incomplete if percent < 100 else c_complete}{name} ({percent}%) "
+ f"{'━' * int(percent / divider)} "
+ f"({done_str}/{total_str} - {speed_str})"
+ )
if sys.stdout.encoding == "utf-8":
print(text, end="")
diff --git a/bottles/backend/globals.py b/bottles/backend/globals.py
index 152afd41941..ec315fd5cb1 100644
--- a/bottles/backend/globals.py
+++ b/bottles/backend/globals.py
@@ -20,11 +20,14 @@
from functools import lru_cache
from pathlib import Path
from typing import Dict
+from bottles.backend.utils import yaml, json
@lru_cache
class Paths:
- xdg_data_home = os.environ.get("XDG_DATA_HOME", os.path.join(Path.home(), ".local/share"))
+ xdg_data_home = os.environ.get(
+ "XDG_DATA_HOME", os.path.join(Path.home(), ".local/share")
+ )
# Icon paths
icons_user = f"{xdg_data_home}/icons"
@@ -79,9 +82,13 @@ class TrdyPaths:
mangohud_available = shutil.which("mangohud") or False
obs_vkc_available = shutil.which("obs-vkcapture") or False
vmtouch_available = shutil.which("vmtouch") or False
+base_version = ""
+if os.path.isfile("/app/manifest.json"):
+ base_version = (
+ json.load(open("/app/manifest.json"))
+ .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"}
diff --git a/bottles/backend/health.py b/bottles/backend/health.py
index b24be391bec..ced2604bfc7 100644
--- a/bottles/backend/health.py
+++ b/bottles/backend/health.py
@@ -63,10 +63,7 @@ def __init__(self):
self.bottles_envs = self.get_bottles_envs()
self.check_system_info()
self.disk = self.get_disk_data()
- self.ram = {
- "MemTotal": "n/a",
- "MemAvailable": "n/a"
- }
+ self.ram = {"MemTotal": "n/a", "MemAvailable": "n/a"}
self.get_ram_data()
if "FLATPAK_ID" not in os.environ:
@@ -141,6 +138,7 @@ def check_patool():
def check_icoextract():
try:
import icoextract
+
return True
except ModuleNotFoundError:
return False
@@ -149,6 +147,7 @@ def check_icoextract():
def check_pefile():
try:
import pefile
+
return True
except ModuleNotFoundError:
return False
@@ -157,6 +156,7 @@ def check_pefile():
def check_markdown():
try:
import markdown
+
return True
except ModuleNotFoundError:
return False
@@ -165,6 +165,7 @@ def check_markdown():
def check_orjson():
try:
import orjson
+
return True
except ModuleNotFoundError:
return False
@@ -187,6 +188,7 @@ def check_ImageMagick():
def check_FVS():
try:
from fvs.repo import FVSRepo
+
return True
except ModuleNotFoundError:
return False
@@ -197,14 +199,12 @@ def get_bottles_envs():
"TESTING_REPOS",
"LOCAL_INSTALLERS",
"LOCAL_COMPONENTS",
- "LOCAL_DEPENDENCIES"
+ "LOCAL_DEPENDENCIES",
]
for _look in look:
if _look in os.environ:
- return {
- _look: os.environ[_look]
- }
+ return {_look: os.environ[_look]}
def check_system_info(self):
self.kernel = os.uname().sysname
@@ -212,19 +212,22 @@ def check_system_info(self):
def get_disk_data(self):
disk_data = self.file_utils.get_disk_size(False)
- return {
- "Total": disk_data["total"],
- "Free": disk_data["free"]
- }
+ return {"Total": disk_data["total"], "Free": disk_data["free"]}
def get_ram_data(self):
with contextlib.suppress(FileNotFoundError, PermissionError):
- with open('/proc/meminfo') as file:
+ with open("/proc/meminfo") as file:
for line in file:
- if 'MemTotal' in line:
- self.ram["MemTotal"] = self.file_utils.get_human_size_legacy(float(line.split()[1])*1024.0)
- if 'MemAvailable' in line:
- self.ram["MemAvailable"] = self.file_utils.get_human_size_legacy(float(line.split()[1])*1024.0)
+ if "MemTotal" in line:
+ self.ram["MemTotal"] = self.file_utils.get_human_size_legacy(
+ float(line.split()[1]) * 1024.0
+ )
+ if "MemAvailable" in line:
+ self.ram["MemAvailable"] = (
+ self.file_utils.get_human_size_legacy(
+ float(line.split()[1]) * 1024.0
+ )
+ )
def get_results(self, plain: bool = False):
results = {
@@ -237,13 +240,10 @@ def get_results(self, plain: bool = False):
"Wayland": self.wayland,
},
"Graphics": self.gpus,
- "Kernel": {
- "Type": self.kernel,
- "Version": self.kernel_version
- },
+ "Kernel": {"Type": self.kernel, "Version": self.kernel_version},
"Disk": self.disk,
"RAM": self.ram,
- "Bottles_envs": self.bottles_envs
+ "Bottles_envs": self.bottles_envs,
}
if "FLATPAK_ID" not in os.environ:
@@ -258,7 +258,7 @@ def get_results(self, plain: bool = False):
"markdown": self.markdown,
"ImageMagick": self.ImageMagick,
"FVS": self.FVS,
- "xdpyinfo": self.xdpyinfo
+ "xdpyinfo": self.xdpyinfo,
}
if plain:
@@ -273,7 +273,9 @@ def has_core_deps(self):
for k, v in self.get_results()["Tools and Libraries"].items():
if v is False:
- logging.error(f"Core dependency {k} not found, Bottles can't be started.")
+ logging.error(
+ f"Core dependency {k} not found, Bottles can't be started."
+ )
result = False
return result
diff --git a/bottles/backend/logger.py b/bottles/backend/logger.py
index 15258a7613b..05bba87f5c0 100644
--- a/bottles/backend/logger.py
+++ b/bottles/backend/logger.py
@@ -30,16 +30,11 @@ class Logger(logging.getLoggerClass()):
This class is a wrapper for the logging module. It provides
custom formats for the log messages.
"""
- __color_map = {
- "debug": 37,
- "info": 36,
- "warning": 33,
- "error": 31,
- "critical": 41
- }
+
+ __color_map = {"debug": 37, "info": 36, "warning": 33, "error": 31, "critical": 41}
__format_log = {
- 'fmt': '\033[80m%(asctime)s \033[1m(%(levelname)s)\033[0m %(message)s \033[0m',
- 'datefmt': '%H:%M:%S',
+ "fmt": "\033[80m%(asctime)s \033[1m(%(levelname)s)\033[0m %(message)s \033[0m",
+ "datefmt": "%H:%M:%S",
}
def __color(self, level, message: str):
@@ -61,25 +56,35 @@ def __init__(self, formatter=None):
self.root.addHandler(handler)
def debug(self, message, **kwargs):
- self.root.debug(self.__color("debug", message), )
+ self.root.debug(
+ self.__color("debug", message),
+ )
def info(self, message, jn=False, **kwargs):
- self.root.info(self.__color("info", message), )
+ self.root.info(
+ self.__color("info", message),
+ )
if jn:
JournalManager.write(JournalSeverity.INFO, message)
def warning(self, message, jn=True, **kwargs):
- self.root.warning(self.__color("warning", message), )
+ self.root.warning(
+ self.__color("warning", message),
+ )
if jn:
JournalManager.write(JournalSeverity.WARNING, message)
def error(self, message, jn=True, **kwargs):
- self.root.error(self.__color("error", message), )
+ self.root.error(
+ self.__color("error", message),
+ )
if jn:
JournalManager.write(JournalSeverity.ERROR, message)
def critical(self, message, jn=True, **kwargs):
- self.root.critical(self.__color("critical", message), )
+ self.root.critical(
+ self.__color("critical", message),
+ )
if jn:
JournalManager.write(JournalSeverity.CRITICAL, message)
@@ -101,8 +106,7 @@ def write_log(data: list):
# we write the same to the journal for convenience
JournalManager.write(
- severity=JournalSeverity.CRASH,
- message="A crash has been detected."
+ severity=JournalSeverity.CRASH, message="A crash has been detected."
)
def set_silent(self):
diff --git a/bottles/backend/managers/backup.py b/bottles/backend/managers/backup.py
index 428a4916583..63c5c121364 100644
--- a/bottles/backend/managers/backup.py
+++ b/bottles/backend/managers/backup.py
@@ -18,9 +18,8 @@
import os
import shutil
import tarfile
-from gettext import gettext as _
-
import pathvalidate
+from gettext import gettext as _
from bottles.backend.globals import Paths
from bottles.backend.logger import Logger
@@ -35,6 +34,48 @@
class BackupManager:
+ @staticmethod
+ def _validate_path(path: str) -> bool:
+ """Validate if the path is not None or empty."""
+ if not path:
+ logging.error(_("No path specified"))
+ return False
+ return True
+
+ @staticmethod
+ def _create_tarfile(
+ source_path: str, destination_path: str, exclude_filter=None
+ ) -> bool:
+ """Helper function to create a tar.gz file from a source path."""
+ try:
+ with tarfile.open(destination_path, "w:gz") as tar:
+ os.chdir(os.path.dirname(source_path))
+ tar.add(os.path.basename(source_path), filter=exclude_filter)
+ return True
+ except (FileNotFoundError, PermissionError, tarfile.TarError, ValueError) as e:
+ logging.error(f"Error creating backup: {e}")
+ return False
+
+ @staticmethod
+ def _safe_extract_tarfile(tar_path: str, extract_path: str) -> bool:
+ """
+ Safely extract a tar.gz file to avoid directory traversal
+ vulnerabilities.
+ """
+ try:
+ with tarfile.open(tar_path, "r:gz") as tar:
+ # Validate each member
+ for member in tar.getmembers():
+ member_path = os.path.abspath(
+ os.path.join(extract_path, member.name)
+ )
+ if not member_path.startswith(os.path.abspath(extract_path)):
+ raise Exception("Detected path traversal attempt in tar file")
+ tar.extractall(path=extract_path)
+ return True
+ except (tarfile.TarError, Exception) as e:
+ logging.error(f"Error extracting backup: {e}")
+ return False
@staticmethod
def export_backup(config: BottleConfig, scope: str, path: str) -> Result:
@@ -44,43 +85,35 @@ def export_backup(config: BottleConfig, scope: str, path: str) -> Result:
Config will only export the bottle configuration, full will export
the full bottle in tar.gz format.
"""
- if path in [None, ""]:
- logging.error(_("No path specified"))
+ if not BackupManager._validate_path(path):
return Result(status=False)
- logging.info(f"New {scope} backup for [{config.Name}] in [{path}]")
+ logging.info(f"Exporting {scope} backup for [{config.Name}] to [{path}]")
if scope == "config":
backup_created = config.dump(path).status
else:
task_id = TaskManager.add(Task(title=_("Backup {0}").format(config.Name)))
bottle_path = ManagerUtils.get_bottle_path(config)
- try:
- with tarfile.open(path, "w:gz") as tar:
- parent = os.path.dirname(bottle_path)
- folder = os.path.basename(bottle_path)
- os.chdir(parent)
- tar.add(folder, filter=BackupManager.exclude_filter)
- backup_created = True
- except (FileNotFoundError, PermissionError, tarfile.TarError, ValueError):
- logging.error(f"Error creating backup for [{config.Name}]")
- backup_created = False
- finally:
- TaskManager.remove(task_id)
+ backup_created = BackupManager._create_tarfile(
+ bottle_path, path, exclude_filter=BackupManager.exclude_filter
+ )
+ TaskManager.remove(task_id)
if backup_created:
- logging.info(f"New backup saved in path: {path}.", jn=True)
+ logging.info(f"Backup successfully saved to: {path}.")
return Result(status=True)
-
- logging.error(f"Failed to save backup in path: {path}.")
- return Result(status=False)
+ else:
+ logging.error("Failed to save backup.")
+ return Result(status=False)
@staticmethod
- def exclude_filter(tarinfo):
- """Filter which excludes some unwanted files from the backup."""
+ def exclude_filter(tarinfo: tarfile.TarInfo) -> tarfile.TarInfo:
+ """
+ Filter which excludes some unwanted files from the backup.
+ """
if "dosdevices" in tarinfo.name:
return None
-
return tarinfo
@staticmethod
@@ -91,126 +124,95 @@ def import_backup(scope: str, path: str) -> Result:
Config will make a new bottle reproducing the configuration, full will
import the full bottle from a tar.gz file.
"""
- if not path:
- logging.error(_("No path specified"))
+ if not BackupManager._validate_path(path):
return Result(status=False)
- manager = Manager()
-
- backup_name = os.path.basename(path)
- import_status = False
-
- task_id = TaskManager.add(Task(title=_("Importing backup: {0}").format(backup_name)))
- logging.info(f"Importing backup: {backup_name}")
+ logging.info(f"Importing backup from: {path}")
if scope == "config":
- '''
- If the backup type is "config", the backup will be used
- to replicate the bottle configuration, else the backup
- will be used to extract the bottle's directory.
- '''
- if backup_name.endswith(".yml"):
- backup_name = backup_name[:-4]
-
- config_load = BottleConfig.load(path)
- if config_load.status and manager.create_bottle_from_config(config_load.data):
- import_status = True
- else:
- import_status = False
+ return BackupManager._import_config_backup(path)
else:
- if backup_name.endswith(".tar.gz"):
- backup_name = backup_name[:-7]
+ return BackupManager._import_full_backup(path)
- if backup_name.lower().startswith("backup_"):
- # remove the "backup_" prefix if it exists
- backup_name = backup_name[7:]
-
- try:
- with tarfile.open(path, "r:gz") as tar:
- def is_within_directory(directory, target):
-
- abs_directory = os.path.abspath(directory)
- abs_target = os.path.abspath(target)
-
- prefix = os.path.commonprefix([abs_directory, abs_target])
-
- return prefix == abs_directory
-
- def safe_extract(_tar, _path=".", members=None, *, numeric_owner=False):
-
- for member in _tar.getmembers():
- member_path = os.path.join(_path, member.name)
- if not is_within_directory(_path, member_path):
- raise Exception("Attempted Path Traversal in Tar File")
-
- _tar.extractall(_path, members, numeric_owner=numeric_owner)
-
- safe_extract(tar, Paths.bottles)
- import_status = True
- except (FileNotFoundError, PermissionError, tarfile.TarError):
- import_status = False
-
- TaskManager.remove(task_id)
-
- if import_status:
- manager.update_bottles()
- logging.info(f"Backup imported: {path}", jn=True)
+ @staticmethod
+ def _import_config_backup(path: str) -> Result:
+ task_id = TaskManager.add(Task(title=_("Importing config backup")))
+ config_load = BottleConfig.load(path)
+ manager = Manager()
+ if config_load.status and manager.create_bottle_from_config(config_load.data):
+ TaskManager.remove(task_id)
+ logging.info("Config backup imported successfully.")
return Result(status=True)
-
- logging.error(f"Failed importing backup: {backup_name}")
- return Result(status=False)
+ else:
+ TaskManager.remove(task_id)
+ logging.error("Failed to import config backup.")
+ return Result(status=False)
@staticmethod
- def duplicate_bottle(config, name) -> Result:
- """Duplicates the bottle with the specified new name."""
- logging.info(f"Duplicating bottle: {config.Name} to {name}")
-
- path = pathvalidate.sanitize_filename(name, platform="universal")
- source = ManagerUtils.get_bottle_path(config)
- dest = os.path.join(Paths.bottles, path)
-
- source_drive = os.path.join(source, "drive_c")
- dest_drive = os.path.join(dest, "drive_c")
+ def _import_full_backup(path: str) -> Result:
+ task_id = TaskManager.add(Task(title=_("Importing full backup")))
+ if BackupManager._safe_extract_tarfile(path, Paths.bottles):
+ Manager().update_bottles()
+ TaskManager.remove(task_id)
+ logging.info("Full backup imported successfully.")
+ return Result(status=True)
+ else:
+ TaskManager.remove(task_id)
+ logging.error("Failed to import full backup.")
+ return Result(status=False)
- source_config = os.path.join(source, "bottle.yml")
- dest_config = os.path.join(dest, "bottle.yml")
+ @staticmethod
+ def duplicate_bottle(config: BottleConfig, name: str) -> Result:
+ """
+ Duplicates the bottle with the specified new name.
+ """
+ logging.info(f"Duplicating bottle: {config.Name} as {name}")
- if not os.path.exists(dest):
- os.makedirs(dest)
+ sanitized_name = pathvalidate.sanitize_filename(name, platform="universal")
+ source_path = ManagerUtils.get_bottle_path(config)
+ destination_path = os.path.join(Paths.bottles, sanitized_name)
- regs = [
- "system.reg",
- "user.reg",
- "userdef.reg"
- ]
+ return BackupManager._duplicate_bottle_directory(
+ config, source_path, destination_path, name
+ )
+ @staticmethod
+ def _duplicate_bottle_directory(
+ config: BottleConfig, source_path: str, destination_path: str, new_name: str
+ ) -> Result:
try:
- for reg in regs:
- source_reg = os.path.join(source, reg)
- dest_reg = os.path.join(dest, reg)
- if os.path.exists(source_reg):
- shutil.copyfile(source_reg, dest_reg)
-
- shutil.copyfile(source_config, dest_config)
-
- with open(dest_config, "r") as config_file:
- config = yaml.load(config_file)
- config["Name"] = name
- config["Path"] = path
-
- with open(dest_config, "w") as config_file:
- yaml.dump(config, config_file, indent=4)
-
- shutil.copytree(
- src=source_drive,
- dst=dest_drive,
- ignore=shutil.ignore_patterns(".*"),
- symlinks=True,
- ignore_dangling_symlinks=True
- )
- except (FileNotFoundError, PermissionError, OSError):
- logging.error(f"Failed duplicate bottle: {name}")
+ if not os.path.exists(destination_path):
+ os.makedirs(destination_path)
+ for item in [
+ "drive_c",
+ "system.reg",
+ "user.reg",
+ "userdef.reg",
+ "bottle.yml",
+ ]:
+ source_item = os.path.join(source_path, item)
+ destination_item = os.path.join(destination_path, item)
+ if os.path.isdir(source_item):
+ shutil.copytree(
+ source_item,
+ destination_item,
+ ignore=shutil.ignore_patterns(".*"),
+ symlinks=True,
+ )
+ elif os.path.isfile(source_item):
+ shutil.copy(source_item, destination_item)
+
+ # Update the bottle configuration
+ config_path = os.path.join(destination_path, "bottle.yml")
+ with open(config_path) as config_file:
+ config_data = yaml.load(config_file)
+ config_data["Name"] = new_name
+ config_data["Path"] = destination_path
+ with open(config_path, "w") as config_file:
+ yaml.dump(config_data, config_file, indent=4)
+
+ logging.info(f"Bottle duplicated successfully as {new_name}.")
+ return Result(status=True)
+ except (FileNotFoundError, PermissionError, OSError) as e:
+ logging.error(f"Error duplicating bottle: {e}")
return Result(status=False)
-
- logging.info(f"Bottle {name} duplicated.", jn=True)
- return Result(status=True)
diff --git a/bottles/backend/managers/component.py b/bottles/backend/managers/component.py
index 9100cfcab60..0ea911c71de 100644
--- a/bottles/backend/managers/component.py
+++ b/bottles/backend/managers/component.py
@@ -28,7 +28,14 @@
from bottles.backend.globals import Paths
from bottles.backend.logger import Logger
from bottles.backend.models.result import Result
-from bottles.backend.state import Locks, Task, TaskStreamUpdateHandler, Status, TaskManager, LockManager
+from bottles.backend.state import (
+ Locks,
+ Task,
+ TaskStreamUpdateHandler,
+ Status,
+ TaskManager,
+ LockManager,
+)
from bottles.backend.utils.file import FileUtils
from bottles.backend.utils.generic import is_glibc_min_available
from bottles.backend.utils.manager import ManagerUtils
@@ -64,7 +71,7 @@ def fetch_catalog(self) -> dict:
"vkd3d": {},
"nvapi": {},
"latencyflex": {},
- "winebridge": {}
+ "winebridge": {},
}
components_available = {
"runtimes": self.__manager.runtimes_available,
@@ -74,26 +81,28 @@ def fetch_catalog(self) -> dict:
"vkd3d": self.__manager.vkd3d_available,
"nvapi": self.__manager.nvapi_available,
"latencyflex": self.__manager.latencyflex_available,
- "winebridge": self.__manager.winebridge_available
+ "winebridge": self.__manager.winebridge_available,
}
index = self.__repo.catalog
for component in index.items():
- '''
+ """
For each component, append it to the corresponding
catalog and mark it as installed if it is.
- '''
+ """
if component[1]["Category"] == "runners":
if "soda" in component[0].lower() or "caffe" in component[0].lower():
if not is_glibc_min_available():
- logging.warning(f"{component[0]} was found but it requires "
- "glibc >= 2.32 and your system is running an older "
- "version. Use the Flatpak instead if you can't "
- "upgrade your system. This runner will be ignored, "
- "please keep in mind that Bottles and all our "
- "installers are only tested with Soda and Caffe runners.")
+ logging.warning(
+ f"{component[0]} was found but it requires "
+ "glibc >= 2.32 and your system is running an older "
+ "version. Use the Flatpak instead if you can't "
+ "upgrade your system. This runner will be ignored, "
+ "please keep in mind that Bottles and all our "
+ "installers are only tested with Soda and Caffe runners."
+ )
continue
sub_category = component[1]["Sub-category"]
@@ -118,12 +127,12 @@ def fetch_catalog(self) -> dict:
return catalog
def download(
- self,
- download_url: str,
- file: str,
- rename: str = "",
- checksum: str = "",
- func: Optional[TaskStreamUpdateHandler] = None
+ self,
+ download_url: str,
+ file: str,
+ rename: str = "",
+ checksum: str = "",
+ func: Optional[TaskStreamUpdateHandler] = None,
) -> bool:
"""Download a component from the Bottles repository."""
@@ -136,10 +145,10 @@ def download(
update_func = task.stream_update if not func else func
if download_url.startswith("temp/"):
- '''
+ """
The caller is explicitly requesting a component from
the /temp directory. Nothing should be downloaded.
- '''
+ """
return True
existing_file = rename if rename else file
@@ -147,18 +156,18 @@ def download(
just_downloaded = False
if os.path.isfile(os.path.join(Paths.temp, existing_file)):
- '''
+ """
Check if the file already exists in the /temp directory.
If so, then skip the download process and set the update_func
to completed.
- '''
+ """
logging.warning(f"File [{existing_file}] already exists in temp, skipping.")
else:
- '''
+ """
As some urls can be redirect, we need to take care of this
and make sure to use the final url. This check should be
skipped for large files (e.g. runners).
- '''
+ """
c = pycurl.Curl()
try:
c.setopt(c.URL, download_url)
@@ -183,9 +192,7 @@ def download(
False and the download is removed from the download manager.
"""
res = Downloader(
- url=download_url,
- file=temp_dest,
- update_func=update_func
+ url=download_url, file=temp_dest, update_func=update_func
).download()
if not res.ok:
@@ -199,7 +206,9 @@ def download(
just_downloaded = True
else:
- logging.warning(f"Failed to download [{download_url}] with code: {req_code} != 200")
+ logging.warning(
+ f"Failed to download [{download_url}] with code: {req_code} != 200"
+ )
TaskManager.remove(task_id)
return False
@@ -210,7 +219,7 @@ def download(
file_path = os.path.join(Paths.temp, rename)
os.rename(temp_dest, file_path)
- if checksum:
+ if checksum and not os.environ.get("BOTTLES_SKIP_CHECKSUM"):
"""
Compare the checksum of the downloaded file with the one
provided by the caller. If they don't match, remove the
@@ -222,7 +231,9 @@ def download(
if local_checksum and local_checksum != checksum:
logging.error(f"Downloaded file [{file}] looks corrupted.")
- logging.error(f"Source cksum: [{checksum}] downloaded: [{local_checksum}]")
+ logging.error(
+ f"Source cksum: [{checksum}] downloaded: [{local_checksum}]"
+ )
logging.error(f"Removing corrupted file [{file}].")
os.remove(file_path)
TaskManager.remove(task_id)
@@ -254,12 +265,12 @@ def extract(name: str, component: str, archive: str) -> True:
return False
try:
- '''
+ """
Try to extract the archive in the /temp directory.
If the extraction fails, remove the archive from the /temp
- directory and return False. The common cause of a failed
+ directory and return False. The common cause of a failed
extraction is that the archive is corrupted.
- '''
+ """
tar = tarfile.open(f"{Paths.temp}/{archive}")
root_dir = tar.getnames()[0]
tar.extractall(path)
@@ -275,15 +286,12 @@ def extract(name: str, component: str, archive: str) -> True:
if root_dir.endswith("x86_64"):
try:
- '''
+ """
If the folder ends with x86_64, remove this from its name.
Return False if an folder with the same name already exists.
- '''
+ """
root_dir = os.path.join(path, root_dir)
- shutil.move(
- src=root_dir,
- dst=root_dir[:-7]
- )
+ shutil.move(src=root_dir, dst=root_dir[:-7])
except (FileExistsError, shutil.Error):
logging.error("Extraction failed! Component already exists.")
return False
@@ -291,10 +299,10 @@ def extract(name: str, component: str, archive: str) -> True:
@LockManager.lock(Locks.ComponentsInstall) # avoid high resource usage
def install(
- self,
- component_type: str,
- component_name: str,
- func: Optional[TaskStreamUpdateHandler] = None,
+ self,
+ component_type: str,
+ component_name: str,
+ func: Optional[TaskStreamUpdateHandler] = None,
):
"""
This function is used to install a component. It automatically
@@ -314,14 +322,14 @@ def install(
file=file["file_name"],
rename=file["rename"],
checksum=file["file_checksum"],
- func=func
+ func=func,
)
if not res:
- '''
+ """
If the download fails, execute the given func passing
failed=True as a parameter.
- '''
+ """
if func:
func(status=Status.FAILED)
return Result(False)
@@ -329,18 +337,18 @@ def install(
archive = manifest["File"][0]["file_name"]
if manifest["File"][0]["rename"]:
- '''
+ """
If the component has a rename, rename the downloaded file
to the required name.
- '''
+ """
archive = manifest["File"][0]["rename"]
self.extract(component_name, component_type, archive)
- '''
+ """
Execute Post Install if the component has it defined
in the manifest.
- '''
+ """
if "Post" in manifest:
print(f"Executing post install for [{component_name}].")
@@ -348,11 +356,11 @@ def install(
if post["action"] == "rename":
self.__post_rename(component_type, post)
- '''
+ """
Ask the manager to re-organize its components.
Note: I know that this is not the most efficient way to do this,
please give feedback if you know a better way to avoid this.
- '''
+ """
if component_type in ["runtime", "winebridge"]:
with contextlib.suppress(FileNotFoundError):
os.remove(os.path.join(Paths.temp, archive))
@@ -398,10 +406,7 @@ def __post_rename(component_type: str, post: dict):
return
if not os.path.isdir(os.path.join(path, dest)):
- shutil.move(
- src=os.path.join(path, source),
- dst=os.path.join(path, dest)
- )
+ shutil.move(src=os.path.join(path, source), dst=os.path.join(path, dest))
def is_in_use(self, component_type: str, component_name: str):
bottles = self.__manager.local_bottles
@@ -422,7 +427,12 @@ def is_in_use(self, component_type: str, component_name: str):
def uninstall(self, component_type: str, component_name: str):
if self.is_in_use(component_type, component_name):
- return Result(False, data={"message": f"Component in use and cannot be removed: {component_name}"})
+ return Result(
+ False,
+ data={
+ "message": f"Component in use and cannot be removed: {component_name}"
+ },
+ )
if component_type in ["runner", "runner:proton"]:
path = ManagerUtils.get_runner_path(component_name)
@@ -452,11 +462,11 @@ def uninstall(self, component_type: str, component_name: str):
logging.error(f"Failed to uninstall component: {component_name}, {e}")
return Result(False, data={"message": "Failed to uninstall component."})
- '''
+ """
Ask the manager to re-organize its components.
Note: I know that this is not the most efficient way to do this,
please give feedback if you know a better way to avoid this.
- '''
+ """
if component_type in ["runner", "runner:proton"]:
self.__manager.check_runners()
diff --git a/bottles/backend/managers/conf.py b/bottles/backend/managers/conf.py
index fbb87752330..bb0fc471cea 100644
--- a/bottles/backend/managers/conf.py
+++ b/bottles/backend/managers/conf.py
@@ -7,7 +7,12 @@
class ConfigManager(object):
- def __init__(self, config_file: Optional[str] = None, config_type: str = 'ini', config_string: Optional[str] = None):
+ def __init__(
+ self,
+ config_file: Optional[str] = None,
+ config_type: str = "ini",
+ config_string: Optional[str] = None,
+ ):
self.config_file = config_file
self.config_string = config_string
self.config_type = config_type
@@ -18,7 +23,9 @@ def __init__(self, config_file: Optional[str] = None, config_type: str = 'ini',
self.config_dict = self.read()
if self.config_file is not None and self.config_string is not None:
- raise ValueError('Passing both config_file and config_string is not allowed')
+ raise ValueError(
+ "Passing both config_file and config_string is not allowed"
+ )
def checks(self):
"""Checks if the configuration file exists, if not, create it."""
@@ -26,36 +33,36 @@ def checks(self):
base_path = os.path.dirname(self.config_file)
os.makedirs(base_path, exist_ok=True)
- with open(self.config_file, 'w') as f:
- f.write('')
+ with open(self.config_file, "w") as f:
+ f.write("")
def read(self):
if self.config_file is not None:
"""Reads the configuration file and returns it as a dictionary"""
- if self.config_type == 'ini':
+ if self.config_type == "ini":
config = ConfigParser()
config.read(self.config_file)
# noinspection PyProtectedMember
res = config._sections
- elif self.config_type == 'json':
- with open(self.config_file, 'r') as f:
+ elif self.config_type == "json":
+ with open(self.config_file, "r") as f:
res = json.load(f)
- elif self.config_type == 'yaml' or self.config_type == 'yml':
- with open(self.config_file, 'r') as f:
+ elif self.config_type == "yaml" or self.config_type == "yml":
+ with open(self.config_file, "r") as f:
res = yaml.load(f)
else:
- raise ValueError('Invalid configuration type')
+ raise ValueError("Invalid configuration type")
elif self.config_string is not None:
- if self.config_type == 'ini':
+ if self.config_type == "ini":
config = ConfigParser()
config.read_string(self.config_string)
res = config._sections
- elif self.config_type == 'json':
+ elif self.config_type == "json":
res = json.loads(self.config_string)
- elif self.config_type == 'yaml' or self.config_type == 'yml':
+ elif self.config_type == "yaml" or self.config_type == "yml":
res = yaml.load(self.config_string)
else:
- raise ValueError('Invalid configuration type')
+ raise ValueError("Invalid configuration type")
else:
res = None
@@ -67,12 +74,12 @@ def get_dict(self):
def write_json(self):
"""Writes the configuration to a JSON file"""
- with open(self.config_file, 'w') as f:
+ with open(self.config_file, "w") as f:
json.dump(self.config_dict, f, indent=4)
def write_yaml(self):
"""Writes the configuration to a YAML file"""
- with open(self.config_file, 'w') as f:
+ with open(self.config_file, "w") as f:
yaml.dump(self.config_dict, f)
def write_ini(self):
@@ -85,24 +92,24 @@ def write_ini(self):
for key, value in self.config_dict[section].items():
config.set(section, key, value)
- with open(self.config_file, 'w') as f:
+ with open(self.config_file, "w") as f:
config.write(f)
def write_dict(self, config_file: Optional[str] = None):
if self.config_file is None and config_file is None:
- raise ValueError('No config path specified')
+ raise ValueError("No config path specified")
elif self.config_file is None and config_file is not None:
self.config_file = config_file
"""Writes the configuration to the file"""
- if self.config_type == 'ini':
+ if self.config_type == "ini":
self.write_ini()
- elif self.config_type == 'json':
+ elif self.config_type == "json":
self.write_json()
- elif self.config_type == 'yaml':
+ elif self.config_type == "yaml":
self.write_yaml()
else:
- raise ValueError('Invalid configuration type')
+ raise ValueError("Invalid configuration type")
def merge_dict(self, changes: dict):
"""Merges a dictionary into the configuration"""
diff --git a/bottles/backend/managers/data.py b/bottles/backend/managers/data.py
index 6cd8fed650e..1c769d185ac 100644
--- a/bottles/backend/managers/data.py
+++ b/bottles/backend/managers/data.py
@@ -45,21 +45,25 @@ def __init__(self):
def __get_data(self):
try:
- with open(self.__p_data, 'r') as s:
+ with open(self.__p_data, "r") as s:
self.__data = yaml.load(s)
if self.__data is None:
raise AttributeError
except FileNotFoundError:
- logging.error('Data file not found. Creating new one.', )
+ logging.error(
+ "Data file not found. Creating new one.",
+ )
self.__create_data_file()
except AttributeError:
- logging.error('Data file is empty. Creating new one.', )
+ logging.error(
+ "Data file is empty. Creating new one.",
+ )
self.__create_data_file()
def __create_data_file(self):
if not os.path.exists(Paths.base):
os.makedirs(Paths.base)
- with open(self.__p_data, 'w') as s:
+ with open(self.__p_data, "w") as s:
yaml.dump(Samples.data, s)
self.__get_data()
@@ -81,7 +85,7 @@ def set(self, key, value, of_type=None):
self.__data[key] = value
with contextlib.suppress(FileNotFoundError):
- with open(self.__p_data, 'w') as s:
+ with open(self.__p_data, "w") as s:
yaml.dump(self.__data, s)
def remove(self, key):
@@ -89,7 +93,7 @@ def remove(self, key):
if self.__data.get(key):
del self.__data[key]
with contextlib.suppress(FileNotFoundError):
- with open(self.__p_data, 'w') as s:
+ with open(self.__p_data, "w") as s:
yaml.dump(self.__data, s)
def get(self, key):
diff --git a/bottles/backend/managers/dependency.py b/bottles/backend/managers/dependency.py
index fb1f0981f37..7ae28f34315 100644
--- a/bottles/backend/managers/dependency.py
+++ b/bottles/backend/managers/dependency.py
@@ -87,16 +87,14 @@ def install(self, config: BottleConfig, dependency: list) -> Result:
the dependency.
"""
self.__manager.versioning_manager.create_state(
- config=config,
- message=f"Before installing {dependency[0]}"
+ config=config, message=f"Before installing {dependency[0]}"
)
task_id = TaskManager.add(Task(title=dependency[0]))
- logging.info("Installing dependency [%s] in bottle [%s]." % (
- dependency[0],
- config.Name
- ), )
+ logging.info(
+ "Installing dependency [%s] in bottle [%s]." % (dependency[0], config.Name),
+ )
manifest = self.get_dependency(dependency[0])
if not manifest:
"""
@@ -105,8 +103,7 @@ def install(self, config: BottleConfig, dependency: list) -> Result:
"""
TaskManager.remove(task_id)
return Result(
- status=False,
- message=f"Cannot find manifest for {dependency[0]}."
+ status=False, message=f"Cannot find manifest for {dependency[0]}."
)
if manifest.get("Dependencies"):
@@ -128,12 +125,16 @@ def install(self, config: BottleConfig, dependency: list) -> Result:
Here we execute all steps in the manifest.
Steps are the actions performed to install the dependency.
"""
+ arch = step.get("for", "win64_win32")
+ if config.Arch not in arch:
+ continue
+
res = self.__perform_steps(config, step)
if not res.ok:
TaskManager.remove(task_id)
return Result(
status=False,
- message=f"One or more steps failed for {dependency[0]}."
+ message=f"One or more steps failed for {dependency[0]}.",
)
if not res.data.get("uninstaller"):
uninstaller = False
@@ -146,13 +147,10 @@ def install(self, config: BottleConfig, dependency: list) -> Result:
dependencies = [dependency[0]]
if config.Installed_Dependencies:
- dependencies = config.Installed_Dependencies + \
- [dependency[0]]
+ dependencies = config.Installed_Dependencies + [dependency[0]]
self.__manager.update_config(
- config=config,
- key="Installed_Dependencies",
- value=dependencies
+ config=config, key="Installed_Dependencies", value=dependencies
)
if manifest.get("Uninstaller"):
@@ -165,10 +163,7 @@ def install(self, config: BottleConfig, dependency: list) -> Result:
if dependency[0] not in config.Installed_Dependencies:
self.__manager.update_config(
- config,
- dependency[0],
- uninstaller,
- "Uninstallers"
+ config, dependency[0], uninstaller, "Uninstallers"
)
# Remove entry from task manager
@@ -177,20 +172,10 @@ def install(self, config: BottleConfig, dependency: list) -> Result:
# Hide installation button and show remove button
logging.info(f"Dependency installed: {dependency[0]} in {config.Name}", jn=True)
if not uninstaller:
- return Result(
- status=True,
- data={"uninstaller": False}
- )
- return Result(
- status=True,
- data={"uninstaller": True}
- )
+ return Result(status=True, data={"uninstaller": False})
+ return Result(status=True, data={"uninstaller": True})
- def __perform_steps(
- self,
- config: BottleConfig,
- step: dict
- ) -> Result:
+ def __perform_steps(self, config: BottleConfig, step: dict) -> Result:
"""
This method execute a step in the bottle (e.g. changing the Windows
version, installing fonts, etc.)
@@ -239,51 +224,27 @@ def __perform_steps(
return Result(status=False)
if step["action"] == "register_dll":
- self.__step_register_dll(
- config=config,
- step=step
- )
+ self.__step_register_dll(config=config, step=step)
if step["action"] == "override_dll":
- self.__step_override_dll(
- config=config,
- step=step
- )
+ self.__step_override_dll(config=config, step=step)
if step["action"] == "set_register_key":
- self.__step_set_register_key(
- config=config,
- step=step
- )
+ self.__step_set_register_key(config=config, step=step)
if step["action"] == "register_font":
- self.__step_register_font(
- config=config,
- step=step
- )
+ self.__step_register_font(config=config, step=step)
if step["action"] == "replace_font":
- self.__step_replace_font(
- config=config,
- step=step
- )
+ self.__step_replace_font(config=config, step=step)
if step["action"] == "set_windows":
- self.__step_set_windows(
- config=config,
- step=step
- )
+ self.__step_set_windows(config=config, step=step)
if step["action"] == "use_windows":
- self.__step_use_windows(
- config=config,
- step=step
- )
+ self.__step_use_windows(config=config, step=step)
- return Result(
- status=True,
- data={"uninstaller": uninstaller}
- )
+ return Result(status=True, data={"uninstaller": uninstaller})
@staticmethod
def __get_real_dest(config: BottleConfig, dest: str) -> Union[str, bool]:
@@ -323,7 +284,7 @@ def __step_download_archive(self, step: dict):
download_url=step.get("url"),
file=step.get("file_name"),
rename=step.get("rename"),
- checksum=step.get("file_checksum")
+ checksum=step.get("file_checksum"),
)
return download
@@ -338,7 +299,7 @@ def __step_install_exe_msi(self, config: BottleConfig, step: dict) -> bool:
download_url=step.get("url"),
file=step.get("file_name"),
rename=step.get("rename"),
- checksum=step.get("file_checksum")
+ checksum=step.get("file_checksum"),
)
file = step.get("file_name")
if step.get("rename"):
@@ -354,7 +315,7 @@ def __step_install_exe_msi(self, config: BottleConfig, step: dict) -> bool:
config,
exec_path=file,
args=step.get("arguments"),
- environment=step.get("environment")
+ environment=step.get("environment"),
)
executor.run()
winedbg.wait_for_process(file)
@@ -388,7 +349,7 @@ def __step_cab_extract(self, step: dict):
download_url=step.get("url"),
file=step.get("file_name"),
rename=step.get("rename"),
- checksum=step.get("file_checksum")
+ checksum=step.get("file_checksum"),
)
if download:
@@ -398,9 +359,7 @@ def __step_cab_extract(self, step: dict):
file = step.get("file_name")
if not CabExtract().run(
- path=os.path.join(Paths.temp, file),
- name=file,
- destination=dest
+ path=os.path.join(Paths.temp, file), name=file, destination=dest
):
return False
else:
@@ -411,16 +370,12 @@ def __step_cab_extract(self, step: dict):
path = path.replace("temp/", f"{Paths.temp}/")
if step.get("rename"):
- file_path = os.path.splitext(
- f"{step.get('rename')}")[0]
+ file_path = os.path.splitext(f"{step.get('rename')}")[0]
else:
- file_path = os.path.splitext(
- f"{step.get('file_name')}")[0]
+ file_path = os.path.splitext(f"{step.get('file_name')}")[0]
if not CabExtract().run(
- f"{path}/{step.get('file_name')}",
- file_path,
- destination=dest
+ f"{path}/{step.get('file_name')}", file_path, destination=dest
):
return False
@@ -448,9 +403,7 @@ def __step_get_from_cab(self, config: BottleConfig, step: dict):
return dest
res = CabExtract().run(
- path=os.path.join(Paths.temp, source),
- files=[file_name],
- destination=dest
+ path=os.path.join(Paths.temp, source), files=[file_name], destination=dest
)
if rename:
@@ -459,10 +412,7 @@ def __step_get_from_cab(self, config: BottleConfig, step: dict):
if os.path.exists(os.path.join(dest, rename)):
os.remove(os.path.join(dest, rename))
- shutil.move(
- os.path.join(dest, _file_name),
- os.path.join(dest, rename)
- )
+ shutil.move(os.path.join(dest, _file_name), os.path.join(dest, rename))
if not res:
return False
@@ -474,7 +424,7 @@ def __step_archive_extract(self, step: dict):
download_url=step.get("url"),
file=step.get("file_name"),
rename=step.get("rename"),
- checksum=step.get("file_checksum")
+ checksum=step.get("file_checksum"),
)
if not download:
@@ -492,8 +442,12 @@ def __step_archive_extract(self, step: dict):
os.makedirs(archive_path)
try:
- patoolib.extract_archive(os.path.join(Paths.temp, file), outdir=archive_path)
- if archive_path.endswith(".tar") and os.path.isfile(os.path.join(archive_path, os.path.basename(archive_path))):
+ patoolib.extract_archive(
+ os.path.join(Paths.temp, file), outdir=archive_path
+ )
+ if archive_path.endswith(".tar") and os.path.isfile(
+ os.path.join(archive_path, os.path.basename(archive_path))
+ ):
tar_path = os.path.join(archive_path, os.path.basename(archive_path))
patoolib.extract_archive(tar_path, outdir=archive_path)
except Exception as e:
@@ -559,7 +513,9 @@ def __step_copy_dll(self, config: BottleConfig, step: dict):
try:
shutil.copyfile(_path, _dest)
except shutil.SameFileError:
- logging.info(f"{_name} already exists at the same version, skipping.")
+ logging.info(
+ f"{_name} already exists at the same version, skipping."
+ )
else:
_name = step.get("file_name")
_dest = os.path.join(dest, _name)
@@ -571,7 +527,9 @@ def __step_copy_dll(self, config: BottleConfig, step: dict):
try:
shutil.copyfile(os.path.join(path, _name), _dest)
except shutil.SameFileError:
- logging.info(f"{_name} already exists at the same version, skipping.")
+ logging.info(
+ f"{_name} already exists at the same version, skipping."
+ )
except Exception as e:
print(e)
@@ -603,23 +561,24 @@ def __step_override_dll(config: BottleConfig, step: dict):
for dll in dlls:
dll_name = os.path.splitext(os.path.basename(dll))[0]
- bundle["HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides"].append({
- "value": dll_name,
- "data": step.get("type")
- })
+ bundle["HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides"].append(
+ {"value": dll_name, "data": step.get("type")}
+ )
reg.import_bundle(bundle)
return True
if step.get("bundle"):
- _bundle = {"HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides": step.get("bundle")}
+ _bundle = {
+ "HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides": step.get("bundle")
+ }
reg.import_bundle(_bundle)
return True
reg.add(
key="HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides",
value=step.get("dll"),
- data=step.get("type")
+ data=step.get("type"),
)
return True
@@ -631,7 +590,7 @@ def __step_set_register_key(config: BottleConfig, step: dict):
key=step.get("key"),
value=step.get("value"),
data=step.get("data"),
- value_type=step.get("type")
+ value_type=step.get("type"),
)
return True
@@ -642,7 +601,7 @@ def __step_register_font(config: BottleConfig, step: dict):
reg.add(
key="HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
value=step.get("name"),
- data=step.get("file")
+ data=step.get("file"),
)
return True
@@ -662,7 +621,7 @@ def __step_replace_font(config: BottleConfig, step: dict):
key="HKEY_CURRENT_USER\\Software\\Wine\\Fonts\\Replacements",
value=r,
value_type="",
- data=target_font
+ data=target_font,
)
for r in replaces
]
diff --git a/bottles/backend/managers/epicgamesstore.py b/bottles/backend/managers/epicgamesstore.py
index 1a4a6a17a6f..8a2989592a0 100644
--- a/bottles/backend/managers/epicgamesstore.py
+++ b/bottles/backend/managers/epicgamesstore.py
@@ -34,7 +34,8 @@ def find_dat_path(config: BottleConfig) -> Union[str, None]:
paths = [
os.path.join(
ManagerUtils.get_bottle_path(config),
- "drive_c/ProgramData/Epic/UnrealEngineLauncher/LauncherInstalled.dat")
+ "drive_c/ProgramData/Epic/UnrealEngineLauncher/LauncherInstalled.dat",
+ )
]
for path in paths:
@@ -67,23 +68,21 @@ def get_installed_games(config: BottleConfig) -> list:
_uri = f"-com.epicgames.launcher://apps/{game['AppName']}?action=launch&silent=true"
_args = f"-opengl -SkipBuildPatchPrereq {_uri}"
_name = game["InstallLocation"].split("\\")[-1]
- _path = "C:\\Program Files (x86)\\Epic Games\\Launcher\\Portal\\Binaries\\Win32\\" \
- "EpicGamesLauncher.exe"
+ _path = (
+ "C:\\Program Files (x86)\\Epic Games\\Launcher\\Portal\\Binaries\\Win32\\"
+ "EpicGamesLauncher.exe"
+ )
_executable = _path.split("\\")[-1]
_folder = ManagerUtils.get_exe_parent_dir(config, _path)
- games.append({
- "executable": _path,
- "arguments": _args,
- "name": _name,
- "path": _path,
- "folder": _folder,
- "icon": "com.usebottles.bottles-program",
- "dxvk": config.Parameters.dxvk,
- "vkd3d": config.Parameters.vkd3d,
- "dxvk_nvapi": config.Parameters.dxvk_nvapi,
- "fsr": config.Parameters.fsr,
- "virtual_desktop": config.Parameters.virtual_desktop,
- "pulseaudio_latency": config.Parameters.pulseaudio_latency,
- "id": str(uuid.uuid4()),
- })
+ games.append(
+ {
+ "executable": _path,
+ "arguments": _args,
+ "name": _name,
+ "path": _path,
+ "folder": _folder,
+ "icon": "com.usebottles.bottles-program",
+ "id": str(uuid.uuid4()),
+ }
+ )
return games
diff --git a/bottles/backend/managers/importer.py b/bottles/backend/managers/importer.py
index 85adbd9a98d..7500f911f2a 100644
--- a/bottles/backend/managers/importer.py
+++ b/bottles/backend/managers/importer.py
@@ -45,7 +45,9 @@ def search_wineprefixes() -> Result:
playonlinux_results = glob(f"{TrdyPaths.playonlinux}/*/")
bottlesv1_results = glob(f"{TrdyPaths.bottlesv1}/*/")
- results = wine_standard + lutris_results + playonlinux_results + bottlesv1_results
+ results = (
+ wine_standard + lutris_results + playonlinux_results + bottlesv1_results
+ )
# count results
is_wine = len(wine_standard)
@@ -68,24 +70,22 @@ def search_wineprefixes() -> Result:
# check the drive_c path exists
if os.path.isdir(os.path.join(wineprefix, "drive_c")):
- wineprefix_lock = os.path.isfile(os.path.join(wineprefix, "bottle.lock"))
+ wineprefix_lock = os.path.isfile(
+ os.path.join(wineprefix, "bottle.lock")
+ )
importer_wineprefixes.append(
{
"Name": wineprefix_name,
"Manager": wineprefix_manager,
"Path": wineprefix,
- "Lock": wineprefix_lock
- })
+ "Lock": wineprefix_lock,
+ }
+ )
i += 1
logging.info(f"Found {len(importer_wineprefixes)} wine prefixes…")
- return Result(
- status=True,
- data={
- "wineprefixes": importer_wineprefixes
- }
- )
+ return Result(status=True, data={"wineprefixes": importer_wineprefixes})
def import_wineprefix(self, wineprefix: dict) -> Result:
"""Import wineprefix from external manager and convert in a bottle"""
@@ -103,7 +103,7 @@ def import_wineprefix(self, wineprefix: dict) -> Result:
# create lockfile in source path
logging.info(f"Creating lock file in {wineprefix['Path']}…")
- open(f'{wineprefix.get("Path")}/bottle.lock', 'a').close()
+ open(f'{wineprefix.get("Path")}/bottle.lock', "a").close()
# copy wineprefix files in the new bottle
command = f"cp -a {wineprefix.get('Path')}/* {bottle_complete_path}/"
diff --git a/bottles/backend/managers/installer.py b/bottles/backend/managers/installer.py
index 2d5cb6c7341..a000f21d2bd 100644
--- a/bottles/backend/managers/installer.py
+++ b/bottles/backend/managers/installer.py
@@ -57,9 +57,7 @@ def get_review(self, installer_name, parse: bool = True) -> str:
@lru_cache
def get_installer(
- self,
- installer_name: str,
- plain: bool = False
+ self, installer_name: str, plain: bool = False
) -> Union[str, dict, bool]:
"""
Return an installer manifest from the repository. Use the plain
@@ -116,11 +114,11 @@ def __process_local_resources(self, exe_msi_steps, installer):
return True
def __install_dependencies(
- self,
- config: BottleConfig,
- dependencies: list,
- step_fn: callable,
- is_final: bool = False
+ self,
+ config: BottleConfig,
+ dependencies: list,
+ step_fn: callable,
+ is_final: bool = False,
):
"""Install a list of dependencies"""
_config = config
@@ -153,7 +151,9 @@ def __perform_checks(config, checks: dict):
_f = os.path.join(bottle_path, "drive_c", f)
if not os.path.exists(_f):
- logging.error(f"During checks, file {_f} was not found, assuming it is not installed. Aborting.")
+ logging.error(
+ f"During checks, file {_f} was not found, assuming it is not installed. Aborting."
+ )
return False
return True
@@ -180,7 +180,7 @@ def __perform_steps(self, config: BottleConfig, steps: list):
st.get("url"),
st.get("file_name"),
st.get("rename"),
- checksum=st.get("file_checksum")
+ checksum=st.get("file_checksum"),
)
else:
download = True
@@ -204,7 +204,9 @@ def __perform_steps(self, config: BottleConfig, steps: list):
)
executor.run()
else:
- logging.error(f"Failed to download {st.get('file_name')}, or checksum failed.")
+ logging.error(
+ f"Failed to download {st.get('file_name')}, or checksum failed."
+ )
return False
return True
@@ -221,7 +223,7 @@ def __step_run_winecommand(config: BottleConfig, step: dict):
config,
command=command.get("command"),
arguments=command.get("arguments"),
- minimal=command.get("minimal")
+ minimal=command.get("minimal"),
)
_winecommand.run()
@@ -231,11 +233,9 @@ def __step_run_script(config: BottleConfig, step: dict):
"!bottle_path": ManagerUtils.get_bottle_path(config),
"!bottle_drive": f"{ManagerUtils.get_bottle_path(config)}/drive_c",
"!bottle_name": config.Name,
- "!bottle_arch": config.Arch
- }
- preventions = {
- "bottle.yml": "Bottle configuration cannot be modified."
+ "!bottle_arch": config.Arch,
}
+ preventions = {"bottle.yml": "Bottle configuration cannot be modified."}
script = step.get("script")
for key, value in placeholders.items():
@@ -243,7 +243,9 @@ def __step_run_script(config: BottleConfig, step: dict):
for key, value in preventions.items():
if script.find(key) != -1:
- logging.error(value, )
+ logging.error(
+ value,
+ )
return False
logging.info(f"Executing installer script…")
@@ -252,7 +254,7 @@ def __step_run_script(config: BottleConfig, step: dict):
shell=True,
cwd=ManagerUtils.get_bottle_path(config),
stdout=subprocess.PIPE,
- stderr=subprocess.PIPE
+ stderr=subprocess.PIPE,
).communicate()
logging.info(f"Finished executing installer script.")
@@ -281,19 +283,27 @@ def __set_parameters(self, config: BottleConfig, new_params: dict):
if "dxvk" in new_params and isinstance(new_params["dxvk"], bool):
if new_params["dxvk"] != config.Parameters.dxvk:
- self.__manager.install_dll_component(_config, "dxvk", remove=not new_params["dxvk"])
+ self.__manager.install_dll_component(
+ _config, "dxvk", remove=not new_params["dxvk"]
+ )
if "vkd3d" in new_params and isinstance(new_params["vkd3d"], bool):
if new_params["vkd3d"] != config.Parameters.vkd3d:
- self.__manager.install_dll_component(_config, "vkd3d", remove=not new_params["vkd3d"])
+ self.__manager.install_dll_component(
+ _config, "vkd3d", remove=not new_params["vkd3d"]
+ )
if "dxvk_nvapi" in new_params and isinstance(new_params["dxvk_nvapi"], bool):
if new_params["dxvk_nvapi"] != config.Parameters.dxvk_nvapi:
- self.__manager.install_dll_component(_config, "nvapi", remove=not new_params["dxvk_nvapi"])
+ self.__manager.install_dll_component(
+ _config, "nvapi", remove=not new_params["dxvk_nvapi"]
+ )
if "latencyflex" in new_params and isinstance(new_params["latencyflex"], bool):
if new_params["latencyflex"] != config.Parameters.latencyflex:
- self.__manager.install_dll_component(_config, "latencyflex", remove=not new_params["latencyflex"])
+ self.__manager.install_dll_component(
+ _config, "latencyflex", remove=not new_params["latencyflex"]
+ )
# avoid sync type change if not set to "wine"
if "sync" in new_params and config.Parameters.sync != "wine":
@@ -301,10 +311,7 @@ def __set_parameters(self, config: BottleConfig, new_params: dict):
for k, v in new_params.items():
self.__manager.update_config(
- config=config,
- key=k,
- value=v,
- scope="Parameters"
+ config=config, key=k, value=v, scope="Parameters"
)
def count_steps(self, installer) -> dict:
@@ -333,9 +340,12 @@ def count_steps(self, installer) -> dict:
def has_local_resources(self, installer):
manifest = self.get_installer(installer[0])
steps = manifest.get("Steps", [])
- exe_msi_steps = [s for s in steps
- if s.get("action", "") in ["install_exe", "install_msi"]
- and s.get("url", "") == "local"]
+ exe_msi_steps = [
+ s
+ for s in steps
+ if s.get("action", "") in ["install_exe", "install_msi"]
+ and s.get("url", "") == "local"
+ ]
if len(exe_msi_steps) == 0:
return []
@@ -343,8 +353,14 @@ def has_local_resources(self, installer):
files = [s.get("file_name", "") for s in exe_msi_steps]
return files
- def install(self, config: BottleConfig, installer: dict, step_fn: callable, is_final: bool = True,
- local_resources: Optional[dict] = None):
+ def install(
+ self,
+ config: BottleConfig,
+ installer: dict,
+ step_fn: callable,
+ is_final: bool = True,
+ local_resources: Optional[dict] = None,
+ ):
manifest = self.get_installer(installer[0])
_config = config
@@ -366,18 +382,27 @@ def install(self, config: BottleConfig, installer: dict, step_fn: callable, is_f
for i in installers:
if not self.install(config, i, step_fn, False):
logging.error("Failed to install dependent installer(s)")
- return Result(False, data={"message": "Failed to install dependent installer(s)"})
+ return Result(
+ False,
+ data={"message": "Failed to install dependent installer(s)"},
+ )
# ask for local resources
if local_resources:
if not self.__process_local_resources(local_resources, installer):
- return Result(False, data={"message": "Local resources not found or invalid"})
+ return Result(
+ False, data={"message": "Local resources not found or invalid"}
+ )
# install dependencies
if dependencies:
logging.info("Installing dependencies")
- if not self.__install_dependencies(_config, dependencies, step_fn, is_final):
- return Result(False, data={"message": "Dependencies installation failed."})
+ if not self.__install_dependencies(
+ _config, dependencies, step_fn, is_final
+ ):
+ return Result(
+ False, data={"message": "Dependencies installation failed."}
+ )
# set parameters
if parameters:
@@ -394,7 +419,9 @@ def install(self, config: BottleConfig, installer: dict, step_fn: callable, is_f
step_fn()
if not self.__perform_steps(_config, steps):
- return Result(False, data={"message": "Installer is not well configured."})
+ return Result(
+ False, data={"message": "Installer is not well configured."}
+ )
# execute checks
if checks:
@@ -402,12 +429,19 @@ def install(self, config: BottleConfig, installer: dict, step_fn: callable, is_f
if is_final:
step_fn()
if not self.__perform_checks(_config, checks):
- return Result(False, data={"message": "Checks failed, the program is not installed."})
+ return Result(
+ False,
+ data={
+ "message": "Checks failed, the program is not installed."
+ },
+ )
# register executable
- if executable['path'].startswith("userdir/"):
+ if executable["path"].startswith("userdir/"):
_userdir = WineUtils.get_user_dir(bottle)
- executable['path'] = executable['path'].replace("userdir/", f"/users/{_userdir}/")
+ executable["path"] = executable["path"].replace(
+ "userdir/", f"/users/{_userdir}/"
+ )
_path = f'C:\\{executable["path"]}'.replace("/", "\\")
_uuid = str(uuid.uuid4())
@@ -416,7 +450,7 @@ def install(self, config: BottleConfig, installer: dict, step_fn: callable, is_f
"arguments": executable.get("arguments", ""),
"name": executable["name"],
"path": _path,
- "id": _uuid
+ "id": _uuid,
}
if "dxvk" in executable:
@@ -426,7 +460,9 @@ def install(self, config: BottleConfig, installer: dict, step_fn: callable, is_f
if "dxvk_nvapi" in executable:
_program["dxvk_nvapi"] = executable["dxvk_nvapi"]
- duplicates = [k for k, v in config.External_Programs.items() if v["path"] == _path]
+ duplicates = [
+ k for k, v in config.External_Programs.items() if v["path"] == _path
+ ]
ext = config.External_Programs
if duplicates:
@@ -434,25 +470,22 @@ def install(self, config: BottleConfig, installer: dict, step_fn: callable, is_f
del ext[d]
ext[_uuid] = _program
self.__manager.update_config(
- config=config,
- key="External_Programs",
- value=ext
+ config=config, key="External_Programs", value=ext
)
else:
self.__manager.update_config(
- config=config,
- key=_uuid,
- value=_program,
- scope="External_Programs"
+ config=config, key=_uuid, value=_program, scope="External_Programs"
)
# create Desktop entry
bottles_icons_path = os.path.join(ManagerUtils.get_bottle_path(config), "icons")
- icon_path = os.path.join(bottles_icons_path, executable.get('icon'))
+ icon_path = os.path.join(bottles_icons_path, executable.get("icon"))
ManagerUtils.create_desktop_entry(_config, _program, False, icon_path)
if is_final:
step_fn()
- logging.info(f"Program installed: {manifest['Name']} in {config.Name}.", jn=True)
+ logging.info(
+ f"Program installed: {manifest['Name']} in {config.Name}.", jn=True
+ )
return Result(True)
diff --git a/bottles/backend/managers/journal.py b/bottles/backend/managers/journal.py
index 3fdcf49298b..d993f763226 100644
--- a/bottles/backend/managers/journal.py
+++ b/bottles/backend/managers/journal.py
@@ -28,6 +28,7 @@
class JournalSeverity:
"""Represents the severity of a journal entry."""
+
DEBUG = "debug"
INFO = "info"
WARNING = "warning"
@@ -63,7 +64,12 @@ def __get_journal() -> dict:
return {}
try:
- journal = {k: v for k, v in sorted(journal.items(), key=lambda item: item[1]["timestamp"], reverse=True)}
+ journal = {
+ k: v
+ for k, v in sorted(
+ journal.items(), key=lambda item: item[1]["timestamp"], reverse=True
+ )
+ }
except (KeyError, TypeError):
journal = {}
@@ -80,7 +86,9 @@ def __clean_old():
if event.get("timestamp", None) is None:
latest_datetime = datetime.strptime(latest, "%Y-%m-%d %H:%M:%S")
else:
- latest_datetime = datetime.strptime(event["timestamp"], "%Y-%m-%d %H:%M:%S")
+ latest_datetime = datetime.strptime(
+ event["timestamp"], "%Y-%m-%d %H:%M:%S"
+ )
latest = event["timestamp"]
if latest_datetime < datetime.now() - timedelta(days=30):
@@ -149,7 +157,9 @@ def __filter_by_date(journal: dict, period: str):
end = start + timedelta(days=1)
for event_id, event in journal.items():
- timestamp = datetime.strptime(event["timestamp"], "%Y-%m-%d %H:%M:%S").date()
+ timestamp = datetime.strptime(
+ event["timestamp"], "%Y-%m-%d %H:%M:%S"
+ ).date()
if start <= timestamp <= end:
_journal[event_id] = event
@@ -175,7 +185,7 @@ def write(severity: JournalSeverity, message: str):
journal[event_id] = {
"severity": severity,
"message": message,
- "timestamp": now.strftime("%Y-%m-%d %H:%M:%S")
+ "timestamp": now.strftime("%Y-%m-%d %H:%M:%S"),
}
JournalManager.__save_journal(journal)
JournalManager.__clean_old()
diff --git a/bottles/backend/managers/library.py b/bottles/backend/managers/library.py
index 90a3f68c23d..95f28fff53e 100644
--- a/bottles/backend/managers/library.py
+++ b/bottles/backend/managers/library.py
@@ -45,11 +45,11 @@ def load_library(self, silent=False):
Loads data from the library.yml file.
"""
if not os.path.exists(self.library_path):
- logging.warning('Library file not found, creating new one')
+ logging.warning("Library file not found, creating new one")
self.__library = {}
self.save_library()
else:
- with open(self.library_path, 'r') as library_file:
+ with open(self.library_path, "r") as library_file:
self.__library = yaml.load(library_file)
if self.__library is None:
@@ -67,30 +67,32 @@ def add_to_library(self, data: dict, config: BottleConfig):
Adds a new entry to the library.yml file.
"""
if self.__already_in_library(data):
- logging.warning(f'Entry already in library, nothing to add: {data}')
+ logging.warning(f"Entry already in library, nothing to add: {data}")
return
_uuid = str(uuid.uuid4())
- logging.info(f'Adding new entry to library: {_uuid}')
+ logging.info(f"Adding new entry to library: {_uuid}")
if not data.get("thumbnail"):
- data['thumbnail'] = SteamGridDBManager.get_game_grid(data['name'], config)
+ data["thumbnail"] = SteamGridDBManager.get_game_grid(data["name"], config)
self.__library[_uuid] = data
self.save_library()
def download_thumbnail(self, _uuid: str, config: BottleConfig):
if not self.__library.get(_uuid):
- logging.warning(f'Entry not found in library, can\'t download thumbnail: {_uuid}')
+ logging.warning(
+ f"Entry not found in library, can't download thumbnail: {_uuid}"
+ )
return False
data = self.__library.get(_uuid)
- value = SteamGridDBManager.get_game_grid(data['name'], config)
+ value = SteamGridDBManager.get_game_grid(data["name"], config)
if not value:
return False
- self.__library[_uuid]['thumbnail'] = value
+ self.__library[_uuid]["thumbnail"] = value
self.save_library()
return True
@@ -99,7 +101,7 @@ def __already_in_library(self, data: dict):
Checks if the entry UUID is already in the library.yml file.
"""
for k, v in self.__library.items():
- if v['id'] == data['id']:
+ if v["id"] == data["id"]:
return True
return False
@@ -109,21 +111,21 @@ def remove_from_library(self, _uuid: str):
Removes an entry from the library.yml file.
"""
if self.__library.get(_uuid):
- logging.info(f'Removing entry from library: {_uuid}')
+ logging.info(f"Removing entry from library: {_uuid}")
del self.__library[_uuid]
self.save_library()
return
- logging.warning(f'Entry not found in library, nothing to remove: {_uuid}')
+ logging.warning(f"Entry not found in library, nothing to remove: {_uuid}")
def save_library(self, silent=False):
"""
Saves the library.yml file.
"""
- with open(self.library_path, 'w') as library_file:
+ with open(self.library_path, "w") as library_file:
yaml.dump(self.__library, library_file)
-
+
if not silent:
- logging.info(f'Library saved')
+ logging.info(f"Library saved")
def get_library(self):
"""
diff --git a/bottles/backend/managers/manager.py b/bottles/backend/managers/manager.py
index 97e0174c501..5f99fb67827 100644
--- a/bottles/backend/managers/manager.py
+++ b/bottles/backend/managers/manager.py
@@ -103,7 +103,13 @@ class Manager(metaclass=Singleton):
supported_dependencies = {}
supported_installers = {}
- def __init__(self, g_settings: Any = None, check_connection: bool = True, is_cli: bool = False, **kwargs):
+ def __init__(
+ self,
+ g_settings: Any = None,
+ check_connection: bool = True,
+ is_cli: bool = False,
+ **kwargs,
+ ):
super().__init__(**kwargs)
times = {"start": time.time()}
@@ -111,13 +117,15 @@ def __init__(self, g_settings: Any = None, check_connection: bool = True, is_cli
# common variables
self.is_cli = is_cli
self.settings = g_settings or GSettingsStub
- self.utils_conn = ConnectionUtils(force_offline=self.is_cli or self.settings.get_boolean("force-offline"))
+ self.utils_conn = ConnectionUtils(
+ force_offline=self.is_cli or self.settings.get_boolean("force-offline")
+ )
self.data_mgr = DataManager()
_offline = True
-
+
if check_connection:
_offline = not self.utils_conn.check_connection()
-
+
# validating user-defined Paths.bottles
if user_bottles_path := self.data_mgr.get(UserDataKeys.CustomBottlesPath):
if os.path.exists(user_bottles_path):
@@ -129,11 +137,11 @@ def __init__(self, g_settings: Any = None, check_connection: bool = True, is_cli
)
# sub-managers
- self.repository_manager = RepositoryManager(get_index= not _offline)
+ self.repository_manager = RepositoryManager(get_index=not _offline)
if self.repository_manager.aborted_connections > 0:
self.utils_conn.status = False
_offline = True
-
+
times["RepositoryManager"] = time.time()
self.versioning_manager = VersioningManager(self)
times["VersioningManager"] = time.time()
@@ -145,7 +153,6 @@ def __init__(self, g_settings: Any = None, check_connection: bool = True, is_cli
self.steam_manager = SteamManager()
times["SteamManager"] = time.time()
-
if not self.is_cli:
times.update(self.checks(install_latest=False, first_run=True).data)
else:
@@ -244,7 +251,10 @@ def check_app_dirs(self):
logging.info("Bottles path doesn't exist, creating now.")
os.makedirs(Paths.bottles, exist_ok=True)
- if self.settings.get_boolean("steam-proton-support") and self.steam_manager.is_steam_supported:
+ if (
+ self.settings.get_boolean("steam-proton-support")
+ and self.steam_manager.is_steam_supported
+ ):
if not os.path.isdir(Paths.steam):
logging.info("Steam path doesn't exist, creating now.")
os.makedirs(Paths.steam, exist_ok=True)
@@ -335,14 +345,9 @@ def remove_dependency(self, config: BottleConfig, dependency: list):
config.Installed_Dependencies.remove(dependency)
self.update_config(
- config,
- key="Installed_Dependencies",
- value=config.Installed_Dependencies
- )
- return Result(
- status=True,
- data={"removed": True}
+ config, key="Installed_Dependencies", value=config.Installed_Dependencies
)
+ return Result(status=True, data={"removed": True})
def check_runners(self, install_latest: bool = True) -> bool:
"""
@@ -368,15 +373,15 @@ def check_runners(self, install_latest: bool = True) -> bool:
# check system wine
if shutil.which("wine") is not None:
- '''
+ """
If the Wine command is available, get the runner version
and add it to the runners_available list.
- '''
- version = subprocess.Popen(
- "wine --version",
- stdout=subprocess.PIPE,
- shell=True
- ).communicate()[0].decode("utf-8")
+ """
+ version = (
+ subprocess.Popen("wine --version", stdout=subprocess.PIPE, shell=True)
+ .communicate()[0]
+ .decode("utf-8")
+ )
version = "sys-" + version.split("\n")[0].split(" ")[0]
runners_available.append(version)
@@ -393,7 +398,7 @@ def check_runners(self, install_latest: bool = True) -> bool:
"vaniglia": [],
"lutris": [],
"others": [],
- "sys-": []
+ "sys-": [],
}
for i in runners_available:
@@ -407,9 +412,11 @@ def check_runners(self, install_latest: bool = True) -> bool:
self.runners_available = [x for l in list(runners_order.values()) for x in l]
if len(self.runners_available) > 0:
- logging.info("Runners found:\n - {0}".format("\n - ".join(self.runners_available)))
+ logging.info(
+ "Runners found:\n - {0}".format("\n - ".join(self.runners_available))
+ )
- tmp_runners = [x for x in self.runners_available if not x.startswith('sys-')]
+ tmp_runners = [x for x in self.runners_available if not x.startswith("sys-")]
if len(tmp_runners) == 0 and install_latest:
logging.warning("No managed runners found.")
@@ -466,7 +473,9 @@ def check_runtimes(self, install_latest: bool = True) -> bool:
return True
return False
- def check_winebridge(self, install_latest: bool = True, update: bool = False) -> bool:
+ def check_winebridge(
+ self, install_latest: bool = True, update: bool = False
+ ) -> bool:
self.winebridge_available = []
winebridge = os.listdir(Paths.winebridge)
@@ -515,7 +524,9 @@ def check_latencyflex(self, install_latest: bool = True) -> bool:
self.latencyflex_available = res
return res is not False
- def get_offline_components(self, component_type: str, extra_name_check: str = "") -> list:
+ def get_offline_components(
+ self, component_type: str, extra_name_check: str = ""
+ ) -> list:
components = {
"dxvk": {
"available": self.dxvk_available,
@@ -540,25 +551,38 @@ def get_offline_components(self, component_type: str, extra_name_check: str = ""
"runner:proton": {
"available": self.runners_available,
"supported": self.supported_proton_runners,
- }
+ },
}
if component_type not in components:
logging.warning(f"Unknown component type found: {component_type}")
raise ValueError("Component type not supported.")
component_list = components[component_type]
- offline_components = list(set(component_list["available"]).difference(component_list["supported"].keys()))
+ offline_components = list(
+ set(component_list["available"]).difference(
+ component_list["supported"].keys()
+ )
+ )
if component_type == "runner":
- offline_components = [ runner for runner in offline_components \
- if not runner.startswith("sys-") and \
- not SteamUtils.is_proton(ManagerUtils.get_runner_path(runner)) ]
+ offline_components = [
+ runner
+ for runner in offline_components
+ if not runner.startswith("sys-")
+ and not SteamUtils.is_proton(ManagerUtils.get_runner_path(runner))
+ ]
elif component_type == "runner:proton":
- offline_components = [ runner for runner in offline_components \
- if SteamUtils.is_proton(ManagerUtils.get_runner_path(runner)) ]
-
- if extra_name_check and extra_name_check not in component_list["available"] \
- and extra_name_check not in component_list["supported"]:
+ offline_components = [
+ runner
+ for runner in offline_components
+ if SteamUtils.is_proton(ManagerUtils.get_runner_path(runner))
+ ]
+
+ if (
+ extra_name_check
+ and extra_name_check not in component_list["available"]
+ and extra_name_check not in component_list["supported"]
+ ):
offline_components.append(extra_name_check)
try:
@@ -566,33 +590,35 @@ def get_offline_components(self, component_type: str, extra_name_check: str = ""
except ValueError:
return sorted(offline_components, reverse=True)
- def __check_component(self, component_type: str, install_latest: bool = True) -> Union[bool, list]:
+ def __check_component(
+ self, component_type: str, install_latest: bool = True
+ ) -> Union[bool, list]:
components = {
"dxvk": {
"available": self.dxvk_available,
"supported": self.supported_dxvk,
- "path": Paths.dxvk
+ "path": Paths.dxvk,
},
"vkd3d": {
"available": self.vkd3d_available,
"supported": self.supported_vkd3d,
- "path": Paths.vkd3d
+ "path": Paths.vkd3d,
},
"nvapi": {
"available": self.nvapi_available,
"supported": self.supported_nvapi,
- "path": Paths.nvapi
+ "path": Paths.nvapi,
},
"latencyflex": {
"available": self.latencyflex_available,
"supported": self.supported_latencyflex,
- "path": Paths.latencyflex
+ "path": Paths.latencyflex,
},
"runtime": {
"available": self.runtimes_available,
"supported": self.supported_runtimes,
- "path": Paths.runtimes
- }
+ "path": Paths.runtimes,
+ },
}
if component_type not in components:
@@ -603,10 +629,11 @@ def __check_component(self, component_type: str, install_latest: bool = True) ->
component["available"] = os.listdir(component["path"])
if len(component["available"]) > 0:
- logging.info("{0}s found:\n - {1}".format(
- component_type.capitalize(),
- "\n - ".join(component["available"])
- ))
+ logging.info(
+ "{0}s found:\n - {1}".format(
+ component_type.capitalize(), "\n - ".join(component["available"])
+ )
+ )
if len(component["available"]) == 0 and install_latest:
logging.warning(f"No {component_type} found.")
@@ -646,21 +673,17 @@ def get_programs(self, config: BottleConfig) -> List[dict]:
bottle = ManagerUtils.get_bottle_path(config)
winepath = WinePath(config)
- results = glob(
- f"{bottle}/drive_c/users/*/Desktop/*.lnk",
- recursive=True
- )
+ results = glob(f"{bottle}/drive_c/users/*/Desktop/*.lnk", recursive=True)
results += glob(
- f"{bottle}/drive_c/users/*/Start Menu/Programs/**/*.lnk",
- recursive=True
+ f"{bottle}/drive_c/users/*/Start Menu/Programs/**/*.lnk", recursive=True
)
results += glob(
f"{bottle}/drive_c/ProgramData/Microsoft/Windows/Start Menu/Programs/**/*.lnk",
- recursive=True
+ recursive=True,
)
results += glob(
f"{bottle}/drive_c/users/*/AppData/Roaming/Microsoft/Windows/Start Menu/Programs/**/*.lnk",
- recursive=True
+ recursive=True,
)
installed_programs = []
ignored_patterns = [
@@ -676,44 +699,48 @@ def get_programs(self, config: BottleConfig) -> List[dict]:
"OriginEr",
"*website*",
"*web site*",
- "*user_manual*"
+ "*user_manual*",
]
found = []
ext_programs = config.External_Programs
- '''
+ """
Process External_Programs
- '''
+ """
for _, _program in ext_programs.items():
found.append(_program["executable"])
if winepath.is_windows(_program["path"]):
- program_folder = ManagerUtils.get_exe_parent_dir(config, _program["path"])
+ program_folder = ManagerUtils.get_exe_parent_dir(
+ config, _program["path"]
+ )
else:
program_folder = os.path.dirname(_program["path"])
- installed_programs.append({
- "executable": _program["executable"],
- "arguments": _program.get("arguments", ""),
- "name": _program["name"],
- "path": _program["path"],
- "folder": _program.get("folder", program_folder),
- "icon": "com.usebottles.bottles-program",
- "script": _program.get("script"),
- "dxvk": _program.get("dxvk", config.Parameters.dxvk),
- "vkd3d": _program.get("vkd3d", config.Parameters.vkd3d),
- "dxvk_nvapi": _program.get("dxvk_nvapi", config.Parameters.dxvk_nvapi),
- "fsr": _program.get("fsr", config.Parameters.fsr),
- "pulseaudio_latency": _program.get("pulseaudio_latency", config.Parameters.pulseaudio_latency),
- "virtual_desktop": _program.get("virtual_desktop", config.Parameters.virtual_desktop),
- "removed": _program.get("removed"),
- "id": _program.get("id")
- })
+ installed_programs.append(
+ {
+ "executable": _program.get("executable"),
+ "arguments": _program.get("arguments"),
+ "name": _program.get("name"),
+ "path": _program.get("path"),
+ "folder": _program.get("folder", program_folder),
+ "icon": "com.usebottles.bottles-program",
+ "script": _program.get("script"),
+ "dxvk": _program.get("dxvk"),
+ "vkd3d": _program.get("vkd3d"),
+ "dxvk_nvapi": _program.get("dxvk_nvapi"),
+ "fsr": _program.get("fsr"),
+ "pulseaudio_latency": _program.get("pulseaudio_latency"),
+ "virtual_desktop": _program.get("virtual_desktop"),
+ "removed": _program.get("removed"),
+ "id": _program.get("id"),
+ }
+ )
for program in results:
- '''
+ """
for each .lnk file, try to get the executable path and
- append it to the installed_programs list with its icon,
+ append it to the installed_programs list with its icon,
skip if the path contains the "Uninstall" word.
- '''
+ """
executable_path = LnkUtils.get_data(program)
if executable_path in [None, ""]:
continue
@@ -732,48 +759,46 @@ def get_programs(self, config: BottleConfig) -> List[dict]:
continue
path_check = os.path.join(
- bottle,
- executable_path.replace("C:\\", "drive_c\\").replace("\\", "/")
+ bottle, executable_path.replace("C:\\", "drive_c\\").replace("\\", "/")
)
if os.path.exists(path_check):
if executable_name not in found:
- installed_programs.append({
- "executable": executable_name,
- "arguments": "",
- "name": executable_name.rsplit('.',1)[0],
- "path": executable_path,
- "folder": program_folder,
- "icon": "com.usebottles.bottles-program",
- "id": str(uuid.uuid4()),
- "script": "",
- "dxvk": config.Parameters.dxvk,
- "vkd3d": config.Parameters.vkd3d,
- "dxvk_nvapi": config.Parameters.dxvk_nvapi,
- "fsr": config.Parameters.fsr,
- "pulseaudio_latency": config.Parameters.pulseaudio_latency,
- "virtual_desktop": config.Parameters.virtual_desktop,
- "auto_discovered": True
- })
+ installed_programs.append(
+ {
+ "executable": executable_name,
+ "arguments": "",
+ "name": executable_name.rsplit(".", 1)[0],
+ "path": executable_path,
+ "folder": program_folder,
+ "icon": "com.usebottles.bottles-program",
+ "id": str(uuid.uuid4()),
+ "auto_discovered": True,
+ }
+ )
found.append(executable_name)
win_steam_manager = SteamManager(config, is_windows=True)
- if self.settings.get_boolean("steam-programs") \
- and win_steam_manager.is_steam_supported:
+ if (
+ self.settings.get_boolean("steam-programs")
+ and win_steam_manager.is_steam_supported
+ ):
programs_names = [p.get("name", "") for p in installed_programs]
for app in win_steam_manager.get_installed_apps_as_programs():
if app["name"] not in programs_names:
installed_programs.append(app)
- if self.settings.get_boolean("epic-games") \
- and EpicGamesStoreManager.is_epic_supported(config):
+ if self.settings.get_boolean(
+ "epic-games"
+ ) and EpicGamesStoreManager.is_epic_supported(config):
programs_names = [p.get("name", "") for p in installed_programs]
for app in EpicGamesStoreManager.get_installed_games(config):
if app["name"] not in programs_names:
installed_programs.append(app)
- if self.settings.get_boolean("ubisoft-connect") \
- and UbisoftConnectManager.is_uconnect_supported(config):
+ if self.settings.get_boolean(
+ "ubisoft-connect"
+ ) and UbisoftConnectManager.is_uconnect_supported(config):
programs_names = [p.get("name", "") for p in installed_programs]
for app in UbisoftConnectManager.get_installed_games(config):
if app["name"] not in programs_names:
@@ -802,7 +827,9 @@ def process_bottle(bottle):
try:
placeholder_yaml = yaml.load(f)
if placeholder_yaml.get("Path"):
- _config = os.path.join(placeholder_yaml.get("Path"), "bottle.yml")
+ _config = os.path.join(
+ placeholder_yaml.get("Path"), "bottle.yml"
+ )
else:
raise ValueError("Missing Path in placeholder.yml")
except (yaml.YAMLError, ValueError):
@@ -827,10 +854,12 @@ def process_bottle(bottle):
# if the folder name is "illegal" accross all platforms, rename the folder
# "universal" platform works for all filesystem/OSes
- sane_name = pathvalidate.sanitize_filepath(_name, platform='universal')
+ sane_name = pathvalidate.sanitize_filepath(_name, platform="universal")
if config.Custom_Path is False: # There shouldn't be problems with this
if config.Path != _name or sane_name != _name:
- logging.warning("Illegal bottle folder or mismatch between config \"Path\" and folder name")
+ logging.warning(
+ 'Illegal bottle folder or mismatch between config "Path" and folder name'
+ )
if sane_name != _name:
# This hopefully doesn't happen, but it's managed
logging.warning(f"Broken path in bottle {_name}, fixing...")
@@ -840,35 +869,29 @@ def process_bottle(bottle):
return
config.Path = sane_name
- self.update_config(
- config=config,
- key="Path",
- value=sane_name
- )
+ self.update_config(config=config, key="Path", value=sane_name)
sample = BottleConfig()
miss_keys = sample.keys() - config.keys()
for key in miss_keys:
logging.warning(f"Key {key} is missing for bottle {_name}, updating…")
- self.update_config(
- config=config,
- key=key,
- value=sample[key]
- )
+ self.update_config(config=config, key=key, value=sample[key])
miss_params_keys = sample.Parameters.keys() - config.Parameters.keys()
for key in miss_params_keys:
- '''
+ """
For each missing key in the bottle configuration, set
it to the default value.
- '''
- logging.warning(f"Parameters key {key} is missing for bottle {_name}, updating…")
+ """
+ logging.warning(
+ f"Parameters key {key} is missing for bottle {_name}, updating…"
+ )
self.update_config(
config=config,
key=key,
value=sample.Parameters[key],
- scope="Parameters"
+ scope="Parameters",
)
self.local_bottles[config.Name] = config
@@ -888,17 +911,26 @@ def process_bottle(bottle):
# if one or more already exist, it will fail silently as there
# is no need to create them again.
try:
- shutil.move(os.path.join(_bottle, c), os.path.join(_bottle, "cache", "dxvk_state"))
+ shutil.move(
+ os.path.join(_bottle, c),
+ os.path.join(_bottle, "cache", "dxvk_state"),
+ )
except shutil.Error:
pass
elif "vkd3d-proton.cache" in c:
try:
- shutil.move(os.path.join(_bottle, c), os.path.join(_bottle, "cache", "vkd3d_shader"))
+ shutil.move(
+ os.path.join(_bottle, c),
+ os.path.join(_bottle, "cache", "vkd3d_shader"),
+ )
except shutil.Error:
pass
elif c == "GLCache":
try:
- shutil.move(os.path.join(_bottle, c), os.path.join(_bottle, "cache", "gl_shader"))
+ shutil.move(
+ os.path.join(_bottle, c),
+ os.path.join(_bottle, "cache", "gl_shader"),
+ )
except shutil.Error:
pass
@@ -906,30 +938,34 @@ def process_bottle(bottle):
NVAPIComponent.check_bottle_nvngx(_bottle, config)
for b in bottles:
- '''
+ """
For each bottle add the path name to the `local_bottles` variable
and append the config.
- '''
+ """
process_bottle(b)
if len(self.local_bottles) > 0 and not silent:
- logging.info("Bottles found:\n - {0}".format("\n - ".join(self.local_bottles)))
+ logging.info(
+ "Bottles found:\n - {0}".format("\n - ".join(self.local_bottles))
+ )
- if self.settings.get_boolean("steam-proton-support") \
- and self.steam_manager.is_steam_supported \
- and not self.is_cli:
+ if (
+ self.settings.get_boolean("steam-proton-support")
+ and self.steam_manager.is_steam_supported
+ and not self.is_cli
+ ):
self.steam_manager.update_bottles()
self.local_bottles.update(self.steam_manager.list_prefixes())
# Update parameters in bottle config
def update_config(
- self,
- config: BottleConfig,
- key: str,
- value: Any,
- scope: str = "",
- remove: bool = False,
- fallback: bool = False
+ self,
+ config: BottleConfig,
+ key: str,
+ value: Any,
+ scope: str = "",
+ remove: bool = False,
+ fallback: bool = False,
) -> Result[dict]:
"""
Update parameters in bottle config. Use the scope argument to
@@ -947,11 +983,11 @@ def update_config(
bottle_path = ManagerUtils.get_bottle_path(config)
if key == "sync":
- '''
+ """
Workaround Bottles lets you run Windows software on Linux, such as applications and games. It introduces a workflow that helps you organize by categorizing each software to your liking. Bottles provides several tools and integrations to help you manage and optimize your applications.
Features:
@@ -64,19 +67,37 @@Fix running programs via CLI
+Fix handling of empty program arguments
+Removed obsolete faudio dependency from the environment
+Update translations
+Various bug fixes and refactoring
+Clean FSR settings
+Improve bad connections handling
+Update Flatpak runtime
+Update translations
+Various bug fixes
+Fix runners and components from not showing when prereleases are off
Fix Steam runtime compatibility with Wine runners
A few bug fixes
Support for the double-DLL VKD3D
Updated Flatpak runtime
Minor improvement and fixes to the library
@@ -86,34 +107,34 @@Update metadata information
Add more update information and correct release notes version
Fixed "Add to Steam" button
Fixed BottleConfig being not serializable
Fixed Patool double extraction failing
Correct version
Fix crash when creating a bottle
Major change: Redesign New Bottle interface
Quality of life improvements: