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

[models] Make manifest deserializer skip unknown data instead of failing

Browse source
This commit is contained in:
derrod 2021-10-29 14:19:52 +02:00
parent eacb8eb006
commit 3145fdb534
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
legendary/models/manifest.py
View file

@ -118,10 +118,10 @@ class Manifest:
_manifest.version = struct.unpack('<I', bio.read(4))[0] _manifest.version = struct.unpack('<I', bio.read(4))[0]
if bio.tell() != _manifest.header_size: if bio.tell() != _manifest.header_size:
logger.fatal(f'Did not read entire header {bio.tell()} != {_manifest.header_size}! ' logger.warning(f'Did not read entire header {bio.tell()} != {_manifest.header_size}! '
f'Header version: {_manifest.version}, please report this on ' f'Header version: {_manifest.version}, please report this on '
f'GitHub along with a sample of the problematic manifest!') f'GitHub along with a sample of the problematic manifest!')
raise ValueError('Did not read complete manifest header!') bio.seek(_manifest.header_size)
data = bio.read() data = bio.read()
if _manifest.compressed: if _manifest.compressed:
@ -234,8 +234,12 @@ class ManifestMeta:
if _meta.data_version > 0: if _meta.data_version > 0:
_meta._build_id = read_fstring(bio) _meta._build_id = read_fstring(bio)
if bio.tell() != _meta.meta_size: if (size_read := bio.tell()) != _meta.meta_size:
raise ValueError('Did not read entire meta!') logger.warning(f'Did not read entire manifest metadata! Version: {_meta.data_version}, '
f'{_meta.meta_size - size_read} bytes missing, skipping...')
bio.seek(_meta.meta_size - size_read, 1)
# downgrade version to prevent issues during serialisation
_meta.data_version = 0
return _meta return _meta
@ -366,8 +370,12 @@ class CDL:
for chunk in _cdl.elements: for chunk in _cdl.elements:
chunk.file_size = struct.unpack('<q', bio.read(8))[0] chunk.file_size = struct.unpack('<q', bio.read(8))[0]
if bio.tell() - cdl_start != _cdl.size: if (size_read := bio.tell() - cdl_start) != _cdl.size:
raise ValueError('Did not read entire chunk data list!') logger.warning(f'Did not read entire chunk data list! Version: {_cdl.version}, '
f'{_cdl.size - size_read} bytes missing, skipping...')
bio.seek(_cdl.size - size_read, 1)
# downgrade version to prevent issues during serialisation
_cdl.version = 0
return _cdl return _cdl
@ -546,7 +554,7 @@ class FML:
f'{_fml.size - size_read} bytes missing, skipping...') f'{_fml.size - size_read} bytes missing, skipping...')
bio.seek(_fml.size - size_read, 1) bio.seek(_fml.size - size_read, 1)
# downgrade version to prevent issues during serialisation # downgrade version to prevent issues during serialisation
_fml.version = 2 _fml.version = 0
return _fml return _fml
@ -554,7 +562,7 @@ class FML:
fml_start = bio.tell() fml_start = bio.tell()
bio.write(struct.pack('<I', 0)) # placeholder size bio.write(struct.pack('<I', 0)) # placeholder size
# currently we only serialise version 0 # currently we only serialise version 0
bio.write(struct.pack('B', 0)) bio.write(struct.pack('B', 0)) # self.version
bio.write(struct.pack('<I', len(self.elements))) bio.write(struct.pack('<I', len(self.elements)))
for fm in self.elements: for fm in self.elements:
@ -704,8 +712,12 @@ class CustomFields:
_cf._dict = dict(zip(_keys, _values)) _cf._dict = dict(zip(_keys, _values))
if bio.tell() - cf_start != _cf.size: if (size_read := bio.tell() - cf_start) != _cf.size:
raise ValueError('Did not read entire custom fields list!') logger.warning(f'Did not read entire custom fields part! Version: {_cf.version}, '
f'{_cf.size - size_read} bytes missing, skipping...')
bio.seek(_cf.size - size_read, 1)
# downgrade version to prevent issues during serialisation
_cf.version = 0
return _cf return _cf