ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-05-31 23:59:38 +03:00
Code Issues Projects Releases Wiki Activity

monitor: Prepare for more-paranoid Shiplocker.json loading

Browse Source
This commit is contained in:
Athanasius 2021-08-07 14:20:05 +01:00
parent bb54bc25b4
commit 292b508985
No known key found for this signature in database
GPG Key ID: AE3E527847057C7D
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monitor.py
View File

@ -203,7 +203,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
key=lambda x: x.split('.')[1:] key=lambda x: x.split('.')[1:]
) )
self.logfile = join(self.currentdir, logfiles[-1]) if logfiles else None self.logfile = join(self.currentdir, logfiles[-1]) if logfiles else None # type: ignore
except Exception: except Exception:
logger.exception('Failed to find latest logfile') logger.exception('Failed to find latest logfile')
@ -872,9 +872,10 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
# Always attempt loading of this. # Always attempt loading of this.
# Confirmed filename for 4.0.0.400 # Confirmed filename for 4.0.0.400
currentdir_path = pathlib.Path(str(self.currentdir))
shiplocker_filename = currentdir_path / 'ShipLocker.json'
try: try:
currentdir_path = pathlib.Path(str(self.currentdir)) with open(shiplocker_filename, 'rb') as h: # type: ignore
with open(currentdir_path / 'ShipLocker.json', 'rb') as h: # type: ignore
entry = json.load(h, object_pairs_hook=OrderedDict) entry = json.load(h, object_pairs_hook=OrderedDict)
self.state['ShipLockerJSON'] = entry self.state['ShipLockerJSON'] = entry
@ -1601,7 +1602,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.state['GameVersion'] = entry['gameversion'] self.state['GameVersion'] = entry['gameversion']
self.state['GameBuild'] = entry['build'] self.state['GameBuild'] = entry['build']
self.version = self.state['GameVersion'] self.version = self.state['GameVersion']
self.is_beta = any(v in self.version.lower() for v in ('alpha', 'beta')) self.is_beta = any(v in self.version.lower() for v in ('alpha', 'beta')) # type: ignore
except KeyError: except KeyError:
if not suppress: if not suppress:
raise raise