jan/fatamorgana
2
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

improve error handling

Browse Source
This commit is contained in:
Jan Petykiewicz 2024-07-29 18:09:20 -07:00
parent 1252edb7b5
commit 3ee1c03f66
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fatamorgana/main.py
View File

@ -163,11 +163,10 @@ class OasisLayout:
""" """
try: try:
record_id = read_uint(stream) record_id = read_uint(stream)
except EOFError as e: except EOFError:
if file_state.within_cblock: if file_state.within_cblock:
return True return True
else: raise
raise e
logger.info(f'read_record of type {record_id} at position 0x{stream.tell():x}') logger.info(f'read_record of type {record_id} at position 0x{stream.tell():x}')
@ -203,7 +202,7 @@ class OasisLayout:
file_state.within_cell = False file_state.within_cell = False
elif record_id in range(15, 28) or record_id in (32, 33): elif record_id in range(15, 28) or record_id in (32, 33):
if not file_state.within_cell: if not file_state.within_cell:
raise Exception('Geometry outside Cell') raise InvalidRecordError('Geometry outside Cell')
elif record_id in (13, 14): elif record_id in (13, 14):
file_state.within_cell = True file_state.within_cell = True
else: else: