mirrors/legendary
1
0
Fork 0
mirror of https://github.com/derrod/legendary.git synced 2024-12-22 17:55:27 +00:00
Code Issues Projects Releases Wiki Activity

[core] Move getting env vars to separate method

Browse source
This commit is contained in:
derrod 2021-09-08 10:37:40 +02:00
parent e8a3a3ec8d
commit 0bf7110653
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
legendary/core.py
View file

@ -411,6 +411,24 @@ class LegendaryCore:
def _get_installed_game(self, app_name) -> InstalledGame: def _get_installed_game(self, app_name) -> InstalledGame:
return self.lgd.get_installed_game(app_name) return self.lgd.get_installed_game(app_name)
def get_app_environment(self, app_name, wine_pfx=None) -> dict:
# get environment overrides from config
env = os.environ.copy()
if 'default.env' in self.lgd.config:
env.update({k: v for k, v in self.lgd.config[f'default.env'].items() if v and not k.startswith(';')})
if f'{app_name}.env' in self.lgd.config:
env.update({k: v for k, v in self.lgd.config[f'{app_name}.env'].items() if v and not k.startswith(';')})
# override wine prefix if necessary
if wine_pfx:
env['WINEPREFIX'] = wine_pfx
elif 'WINEPREFIX' not in env:
# only use config variable if not already set in environment
if wine_pfx := self.lgd.config.get(app_name, 'wine_prefix', fallback=None):
env['WINEPREFIX'] = wine_pfx
return env
def get_launch_parameters(self, app_name: str, offline: bool = False, def get_launch_parameters(self, app_name: str, offline: bool = False,
user: str = None, extra_args: list = None, user: str = None, extra_args: list = None,
wine_bin: str = None, wine_pfx: str = None, wine_bin: str = None, wine_pfx: str = None,
@ -500,20 +518,7 @@ class LegendaryCore:
if config_args := self.lgd.config.get(app_name, 'start_params', fallback=None): if config_args := self.lgd.config.get(app_name, 'start_params', fallback=None):
params.extend(shlex.split(config_args.strip())) params.extend(shlex.split(config_args.strip()))
# get environment overrides from config env = self.get_app_environment(app_name, wine_pfx=wine_pfx)
env = os.environ.copy()
if 'default.env' in self.lgd.config:
env.update({k: v for k, v in self.lgd.config[f'default.env'].items() if v and not k.startswith(';')})
if f'{app_name}.env' in self.lgd.config:
env.update({k: v for k, v in self.lgd.config[f'{app_name}.env'].items() if v and not k.startswith(';')})
if wine_pfx:
env['WINEPREFIX'] = wine_pfx
elif 'WINEPREFIX' not in env:
# only use config variable if not already set in environment
if wine_pfx := self.lgd.config.get(app_name, 'wine_prefix', fallback=None):
env['WINEPREFIX'] = wine_pfx
return params, working_dir, env return params, working_dir, env
def get_origin_uri(self, app_name: str, offline: bool = False) -> str: def get_origin_uri(self, app_name: str, offline: bool = False) -> str: