eddn: Extra System (name) augmentation paranoia

This commit is contained in:
Athanasius committed 2022-02-01 16:22:59 +00:00
1 parent 87193b4a51
commit 67019e91b2
1 file changed
+5 -4
+5 -4
View File
@@ -802,12 +802,13 @@ class EDDN:
# 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 'SystemName' not in entry and 'System' not in entry and 'StarSystem' not in entry:
if system_name is not None and system_name != '':
entry['StarSystem'] = system_name
if system_name is None or not isinstance(system_name, str) or 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:
# Bad assumptions if this is the case
logger.error(f'No system name in entry, and system_name was not set either! entry:\n{entry!r}\n')
entry['StarSystem'] = system_name
if 'SystemAddress' not in entry:
if this.systemaddress is None: