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

Merge pull request #1483 from EDCD/fix/1481/codexentry-can-have-empty-string-nearestdestination

Browse Source 
EDDN: codexentry/1: Tighten up 'empty string' checks
This commit is contained in:
Athanasius 2022-02-21 11:44:20 +00:00 committed by GitHub
commit 210012a4a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/eddn.py
View File

@ -970,7 +970,9 @@ class EDDN:
logger.warning(f'this.body_id was not set properly: "{this.body_id}" ({type(this.body_id)})') logger.warning(f'this.body_id was not set properly: "{this.body_id}" ({type(this.body_id)})')
####################################################################### #######################################################################
for k, v in entry.items(): # Check just the top-level strings with minLength=1 in the schema
for k in ('System', 'Name', 'Region', 'Category', 'SubCategory'):
v = entry[k]
if v is None or isinstance(v, str) and v == '': if v is None or isinstance(v, str) and v == '':
logger.warning(f'post-processing entry contains entry["{k}"] = {v} {(type(v))}') logger.warning(f'post-processing entry contains entry["{k}"] = {v} {(type(v))}')
# We should drop this message and VERY LOUDLY inform the # We should drop this message and VERY LOUDLY inform the
@ -978,6 +980,13 @@ class EDDN:
# raw Journal event that caused this. # raw Journal event that caused this.
return 'CodexEntry had empty string, PLEASE ALERT THE EDMC DEVELOPERS' return 'CodexEntry had empty string, PLEASE ALERT THE EDMC DEVELOPERS'
# Also check traits
if 'Traits' in entry:
for v in entry['Traits']:
if v is None or isinstance(v, str) and v == '':
logger.warning(f'post-processing entry[\'Traits\'] contains {v} {(type(v))}\n{entry["Traits"]}\n')
return 'CodexEntry Trait had empty string, PLEASE ALERT THE EDMC DEVELOPERS'
msg = { msg = {
'$schemaRef': f'https://eddn.edcd.io/schemas/codexentry/1{"/test" if is_beta else ""}', '$schemaRef': f'https://eddn.edcd.io/schemas/codexentry/1{"/test" if is_beta else ""}',
'message': entry 'message': entry