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

eddn: Extra System (name) augmentation paranoia

Browse Source
This commit is contained in:
Athanasius 2022-02-01 16:11:35 +00:00
parent 87193b4a51
commit 67019e91b2
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
plugins/eddn.py
View File

@ -802,12 +802,13 @@ class EDDN:
# If 'SystemName' or 'System' is there, it's directly from a journal event. # If 'SystemName' or 'System' is there, it's directly from a journal event.
# If they're not there *and* 'StarSystem' isn't either, then we add the latter. # If they're not there *and* 'StarSystem' isn't either, then we add the latter.
if 'SystemName' not in entry and 'System' not in entry and 'StarSystem' not in entry: if 'SystemName' not in entry and 'System' not in entry and 'StarSystem' not in entry:
if system_name is not None and system_name != '': if system_name is None or not isinstance(system_name, str) or system_name == '':
entry['StarSystem'] = system_name # Bad assumptions if this is the case
logger.warning(f'No system name in entry, and system_name was not set either! entry:\n{entry!r}\n')
return "passed-in system_name is empty, can't add System"
else: else:
# Bad assumptions if this is the case entry['StarSystem'] = system_name
logger.error(f'No system name in entry, and system_name was not set either! entry:\n{entry!r}\n')
if 'SystemAddress' not in entry: if 'SystemAddress' not in entry:
if this.systemaddress is None: if this.systemaddress is None: