ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-05-31 15:49:41 +03:00
Code Issues Projects Releases Wiki Activity

Filter commodities on legality

Browse Source
This commit is contained in:
Jonathan Harris 2017-09-14 18:16:55 +01:00
parent 323b414e19
commit d0cba6f4c4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
companion.py
View File

@ -292,6 +292,8 @@ def fixup(data):
else: else:
if not category_map.get(commodity['categoryname'], True): # Check marketable if not category_map.get(commodity['categoryname'], True): # Check marketable
pass pass
elif commodity.get('legality'): # Check not prohibited
pass
elif not commodity.get('categoryname'): elif not commodity.get('categoryname'):
if __debug__: print 'Missing "categoryname" for "%s"' % commodity.get('name', '') if __debug__: print 'Missing "categoryname" for "%s"' % commodity.get('name', '')
elif not commodity.get('name'): elif not commodity.get('name'):

3
eddn.py
View File

@ -159,7 +159,8 @@ class EDDN:
def export_commodities(self, data, is_beta): def export_commodities(self, data, is_beta):
commodities = [] commodities = []
for commodity in data['lastStarport'].get('commodities') or []: for commodity in data['lastStarport'].get('commodities') or []:
if category_map.get(commodity['categoryname'], True): # Check marketable if (category_map.get(commodity['categoryname'], True) and # Check marketable
not commodity.get('legality')): # check not prohibited
commodities.append(OrderedDict([ commodities.append(OrderedDict([
('name', commodity['name']), ('name', commodity['name']),
('meanPrice', int(commodity['meanPrice'])), ('meanPrice', int(commodity['meanPrice'])),