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

Fixes up "EDMC.py -j" for python3

Browse Source
This commit is contained in:
Athanasius 2019-09-18 15:09:22 +01:00
parent e9931aa348
commit df987a3a40
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EDMC.py
View File

@ -78,7 +78,7 @@ try:
if args.j: if args.j:
# Import and collate from JSON dump # Import and collate from JSON dump
data = json.load(open(args.j)) data = json.load(open(args.j))
config.set('querytime', getmtime(args.j)) config.set('querytime', int(getmtime(args.j)))
else: else:
# Get state from latest Journal file # Get state from latest Journal file
try: try:

4
collate.py
View File

@ -129,7 +129,7 @@ def addships(data):
ships[int(row['id'])] = row # index by int for easier lookup and sorting ships[int(row['id'])] = row # index by int for easier lookup and sorting
size_pre = len(ships) size_pre = len(ships)
for ship in (data['lastStarport']['ships'].get('shipyard_list') or {}).values() + data['lastStarport']['ships'].get('unavailable_list'): for ship in list((data['lastStarport']['ships'].get('shipyard_list') or {}).values()) + data['lastStarport']['ships'].get('unavailable_list'):
# sanity check # sanity check
key = ship['id'] key = ship['id']
new = { 'id': int(key), 'symbol': ship['name'], 'name': companion.ship_map.get(ship['name'].lower()) } new = { 'id': int(key), 'symbol': ship['name'], 'name': companion.ship_map.get(ship['name'].lower()) }
@ -152,7 +152,7 @@ def addships(data):
os.unlink(shipfile+'.bak') os.unlink(shipfile+'.bak')
os.rename(shipfile, shipfile+'.bak') os.rename(shipfile, shipfile+'.bak')
with open(shipfile, 'wb') as csvfile: with open(shipfile, 'w') as csvfile:
writer = csv.DictWriter(csvfile, ['id', 'symbol', 'name']) writer = csv.DictWriter(csvfile, ['id', 'symbol', 'name'])
writer.writeheader() writer.writeheader()
for key in sorted(ships): for key in sorted(ships):