CodeMirror/legendary
1
0
Fork 0
mirror of https://github.com/derrod/legendary.git synced 2024-06-26 18:20:24 +12:00
Code Issues Projects Releases Wiki Activity

[cli] Use new launch command method in Origin launch

Browse source 
By doing this support for wrappers (e.g. Proton) is now also included.
This commit is contained in:
derrod 2021-09-28 05:23:39 +02:00
parent a1993eb568
commit dbc4131ec2
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
legendary/cli.py
View file

@ -478,7 +478,7 @@ class LegendaryCLI:
def launch_game(self, args, extra): def launch_game(self, args, extra):
app_name = args.app_name app_name = args.app_name
if args.origin: if args.origin:
return self.launch_origin(args) return self._launch_origin(args)
igame = self.core.get_installed_game(app_name) igame = self.core.get_installed_game(app_name)
if not igame: if not igame:
@ -576,7 +576,7 @@ class LegendaryCLI:
f'{k}={v}' for k, v in params.environment.items()))) f'{k}={v}' for k, v in params.environment.items())))
subprocess.Popen(full_params, cwd=params.working_directory, env=full_env) subprocess.Popen(full_params, cwd=params.working_directory, env=full_env)
def launch_origin(self, args): def _launch_origin(self, args):
# login is not required to launch the game, but linking does require it. # login is not required to launch the game, but linking does require it.
if not args.offline: if not args.offline:
logger.info('Logging in...') logger.info('Logging in...')
@ -594,18 +594,20 @@ class LegendaryCLI:
return webbrowser.open(origin_uri) return webbrowser.open(origin_uri)
# on linux, require users to specify at least the wine binary and prefix in config or command line # on linux, require users to specify at least the wine binary and prefix in config or command line
wine_pfx, wine_binary = args.wine_pfx, args.wine_bin command = self.core.get_app_launch_command(args.app_name, wrapper=args.wrapper,
if not wine_pfx: wine_binary=args.wine_bin,
wine_pfx = self.core.lgd.config.get(args.app_name, 'wine_prefix', fallback=None) disable_wine=args.no_wine)
if not wine_binary: env = self.core.get_app_environment(args.app_name, wine_pfx=args.wine_pfx)
wine_binary = self.core.lgd.config.get(args.app_name, 'wine_executable', fallback=args.wine_bin) full_env = os.environ.copy()
env = self.core.get_app_environment(args.app_name, wine_pfx=wine_pfx) full_env.update(env)
if not wine_binary or not env.get('WINEPREFIX'): if not command:
logger.error(f'In order to launch Origin correctly you must specify the wine binary and prefix ' logger.error(f'In order to launch Origin correctly you must specify a prefix and wine binary or '
f'to use in the configuration file or command line. See the README for details.') f'wrapper in the configuration file or command line. See the README for details.')
return return
subprocess.Popen([wine_binary, origin_uri], env=env)
command.append(origin_uri)
subprocess.Popen(command, env=full_env)
def install_game(self, args): def install_game(self, args):
if self.core.is_installed(args.app_name): if self.core.is_installed(args.app_name):