ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-09 03:42:16 +03:00
Code Issues Projects Releases Wiki Activity

Suits: Only process SwitchSuitLoadout if we know about Suits and Loadouts

Browse Source
This commit is contained in:
Athanasius 2021-05-01 10:25:39 +01:00
parent 3ab8b97562
commit 0e18666054
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
monitor.py
View File

@ -943,28 +943,30 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
# ◦ ModuleName # ◦ ModuleName
loadoutid = entry['LoadoutID'] loadoutid = entry['LoadoutID']
new_slot = self.suit_loadout_id_from_loadoutid(loadoutid) new_slot = self.suit_loadout_id_from_loadoutid(loadoutid)
try: # If this application is run with the latest Journal showing such an event then we won't
self.state['SuitLoadoutCurrent'] = self.state['SuitLoadouts'][f'{new_slot}'] # yet have the CAPI data, so no idea about Suits or Loadouts.
if self.state['Suits'] and self.state['SuitLoadouts']:
except KeyError:
logger.debug(f"Getting suit loadout after switch, bad slot: {new_slot} ({loadoutid})")
# Might mean that a new suit loadout was created and we need a new CAPI fetch ?
self.state['SuitCurrent'] = None
self.state['SuitLoadoutCurrent'] = None
else:
try: try:
new_suitid = self.state['SuitLoadoutCurrent']['suit']['suitId'] self.state['SuitLoadoutCurrent'] = self.state['SuitLoadouts'][f'{new_slot}']
except KeyError: except KeyError:
logger.exception(f"Getting switched-to suit ID from slot {new_slot} ({loadoutid})") logger.debug(f"KeyError getting suit loadout after switch, bad slot: {new_slot} ({loadoutid})")
self.state['SuitCurrent'] = None
self.state['SuitLoadoutCurrent'] = None
else: else:
try: try:
self.state['SuitCurrent'] = self.state['Suits'][f'{new_suitid}'] new_suitid = self.state['SuitLoadoutCurrent']['suit']['suitId']
except KeyError: except KeyError:
logger.exception(f"Getting switched-to suit from slot {new_slot} ({loadoutid}") logger.debug(f"KeyError getting switched-to suit ID from slot {new_slot} ({loadoutid})")
else:
try:
self.state['SuitCurrent'] = self.state['Suits'][f'{new_suitid}']
except KeyError:
logger.debug(f"KeyError getting switched-to suit from slot {new_slot} ({loadoutid}")
elif event_type == 'CreateSuitLoadout': elif event_type == 'CreateSuitLoadout':
# We know we won't have data for this new one # We know we won't have data for this new one