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

Only send economies and prohibited lists if present in the cAPI data

Browse Source
This commit is contained in:
Jonathan Harris 2017-09-23 13:27:43 +01:00
parent a90c1e982a
commit 0caa713581
1 changed files with 12 additions and 9 deletions

21
eddn.py

@ -178,17 +178,20 @@ class EDDN:
# Don't send empty commodities list - schema won't allow it
if commodities:
message = OrderedDict([
('timestamp', time.strftime('%Y-%m-%dT%H:%M:%SZ',
time.gmtime(config.getint('querytime') or int(time.time())))),
('systemName', data['lastSystem']['name']),
('stationName', data['lastStarport']['name']),
('commodities', commodities),
])
if 'economies' in data['lastStarport']:
message['economies'] = sorted([x for x in data['lastStarport'].get('economies', {}).itervalues()])
if 'prohibited' in data['lastStarport']:
message['prohibited'] = sorted([x for x in data['lastStarport'].get('prohibited', {}).itervalues()])
self.send(data['commander']['name'], {
'$schemaRef' : 'https://eddn.edcd.io/schemas/commodity/3' + (is_beta and '/test' or ''),
'message' : OrderedDict([
('timestamp', time.strftime('%Y-%m-%dT%H:%M:%SZ',
time.gmtime(config.getint('querytime') or int(time.time())))),
('systemName', data['lastSystem']['name']),
('stationName', data['lastStarport']['name']),
('commodities', commodities),
('economies', sorted([x for x in data['lastStarport'].get('economies', {}).itervalues()])),
('prohibited', sorted([x for x in data['lastStarport'].get('prohibited', {}).itervalues()])),
]),
'message' : message,
})
def export_outfitting(self, data, is_beta):