mirrors/legendary
1
0
Fork 0
mirror of https://github.com/derrod/legendary.git synced 2025-08-04 15:01:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge 32d6c207f3 into 3963382b3f

Browse source
This commit is contained in:
Mathis Dröge 2024-11-30 18:50:49 +01:00 committed by GitHub
parent 3963382b3f 32d6c207f3
commit b5831ea7c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
legendary/cli.py
View file

@ -352,7 +352,7 @@ class LegendaryCLI:
# check if we even need to log in # check if we even need to log in
if args.override_manifest: if args.override_manifest:
logger.info(f'Loading manifest from "{args.override_manifest}"') logger.info(f'Loading manifest from "{args.override_manifest}"')
manifest_data, _ = self.core.get_uri_manifest(args.override_manifest) manifest_data = self.core.get_uri_manifest(args.override_manifest)
elif self.core.is_installed(args.app_name) and not args.force_download: elif self.core.is_installed(args.app_name) and not args.force_download:
logger.info(f'Loading installed manifest for "{args.app_name}"') logger.info(f'Loading installed manifest for "{args.app_name}"')
manifest_data, _ = self.core.get_installed_manifest(args.app_name) manifest_data, _ = self.core.get_installed_manifest(args.app_name)

24
legendary/core.py
View file

@ -1304,13 +1304,11 @@ class LegendaryCore:
r = self.egs.unauth_session.get(uri) r = self.egs.unauth_session.get(uri)
r.raise_for_status() r.raise_for_status()
new_manifest_data = r.content new_manifest_data = r.content
base_urls = [r.url.rpartition('/')[0]]
else: else:
base_urls = []
with open(uri, 'rb') as f: with open(uri, 'rb') as f:
new_manifest_data = f.read() new_manifest_data = f.read()
return new_manifest_data, base_urls return new_manifest_data
def get_delta_manifest(self, base_url, old_build_id, new_build_id): def get_delta_manifest(self, base_url, old_build_id, new_build_id):
"""Get optimized delta manifest (doesn't seem to exist for most games)""" """Get optimized delta manifest (doesn't seem to exist for most games)"""
@ -1338,7 +1336,7 @@ class LegendaryCore:
# load old manifest if we have one # load old manifest if we have one
if override_old_manifest: if override_old_manifest:
self.log.info(f'Overriding old manifest with "{override_old_manifest}"') self.log.info(f'Overriding old manifest with "{override_old_manifest}"')
old_bytes, _ = self.get_uri_manifest(override_old_manifest) old_bytes = self.get_uri_manifest(override_old_manifest)
old_manifest = self.load_manifest(old_bytes) old_manifest = self.load_manifest(old_bytes)
elif not disable_patching and not force and self.is_installed(game.app_name): elif not disable_patching and not force and self.is_installed(game.app_name):
old_bytes, _base_urls = self.get_installed_manifest(game.app_name) old_bytes, _base_urls = self.get_installed_manifest(game.app_name)
@ -1350,24 +1348,20 @@ class LegendaryCore:
else: else:
old_manifest = self.load_manifest(old_bytes) old_manifest = self.load_manifest(old_bytes)
base_urls = game.base_urls
# The EGS client uses plaintext HTTP by default for the purposes of enabling simple DNS based # The EGS client uses plaintext HTTP by default for the purposes of enabling simple DNS based
# CDN redirection to a (local) cache. In Legendary this will be a config option. # CDN redirection to a (local) cache. In Legendary this will be a config option.
disable_https = disable_https or self.lgd.config.getboolean('Legendary', 'disable_https', fallback=False) disable_https = disable_https or self.lgd.config.getboolean('Legendary', 'disable_https', fallback=False)
if override_manifest: if override_manifest:
self.log.info(f'Overriding manifest with "{override_manifest}"') self.log.info(f'Overriding manifest with "{override_manifest}"')
new_manifest_data, _base_urls = self.get_uri_manifest(override_manifest) new_manifest_data = self.get_uri_manifest(override_manifest)
# if override manifest has a base URL use that instead _, base_urls, _ = self.get_cdn_urls(game, platform)
if _base_urls:
base_urls = _base_urls
else: else:
new_manifest_data, base_urls = self.get_cdn_manifest(game, platform, disable_https=disable_https) new_manifest_data, base_urls = self.get_cdn_manifest(game, platform, disable_https=disable_https)
# overwrite base urls in metadata with current ones to avoid using old/dead CDNs # overwrite base urls in metadata with current ones to avoid using old/dead CDNs
game.base_urls = base_urls game.base_urls = base_urls
# save base urls to game metadata # save base urls to game metadata
self.lgd.set_game_meta(game.app_name, game) self.lgd.set_game_meta(game.app_name, game)
self.log.info('Parsing game manifest...') self.log.info('Parsing game manifest...')
new_manifest = self.load_manifest(new_manifest_data) new_manifest = self.load_manifest(new_manifest_data)
@ -1384,7 +1378,7 @@ class LegendaryCore:
if old_manifest and new_manifest and not disable_delta: if old_manifest and new_manifest and not disable_delta:
if override_delta_manifest: if override_delta_manifest:
self.log.info(f'Overriding delta manifest with "{override_delta_manifest}"') self.log.info(f'Overriding delta manifest with "{override_delta_manifest}"')
delta_manifest_data, _ = self.get_uri_manifest(override_delta_manifest) delta_manifest_data = self.get_uri_manifest(override_delta_manifest)
else: else:
delta_manifest_data = self.get_delta_manifest(base_urls[0], delta_manifest_data = self.get_delta_manifest(base_urls[0],
old_manifest.meta.build_id, old_manifest.meta.build_id,