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

collate.py: Fix references to companion_category_map

Browse Source
This commit is contained in:
Athanasius 2021-04-03 12:47:17 +01:00
parent 5c5e5b507e
commit 32d87f68dd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
collate.py
View File

@ -12,7 +12,7 @@ from traceback import print_exc
import companion import companion
import outfitting import outfitting
from edmc_data import ship_name_map from edmc_data import companion_category_map, ship_name_map
def __make_backup(file_name: str, suffix: str = '.bak') -> None: def __make_backup(file_name: str, suffix: str = '.bak') -> None:
@ -54,13 +54,13 @@ def addcommodities(data):
new = { new = {
'id' : commodity['id'], 'id' : commodity['id'],
'symbol' : commodity['name'], 'symbol' : commodity['name'],
'category' : data.companion_category_map.get(commodity['categoryname']) or commodity['categoryname'], 'category' : companion_category_map.get(commodity['categoryname']) or commodity['categoryname'],
'name' : commodity.get('locName') or 'Limpets', 'name' : commodity.get('locName') or 'Limpets',
} }
old = commodities.get(key) old = commodities.get(key)
if old and data.companion_category_map.get(commodity['categoryname'], True): if old and companion_category_map.get(commodity['categoryname'], True):
if new['symbol'] != old['symbol'] or new['name'] != old['name']: if new['symbol'] != old['symbol'] or new['name'] != old['name']:
raise ValueError('{}: {!r} != {!r}'.format(key, new, old)) raise ValueError('{}: {!r} != {!r}'.format(key, new, old))