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

Fix 2.4 cAPI queries

Browse Source
This commit is contained in:
Jonathan Harris 2017-09-23 13:17:10 +01:00
parent c491659ef0
commit a90c1e982a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EDMarketConnector.py
View File

@ -514,7 +514,7 @@ class AppWindow:
self.eddn.export_outfitting(data, monitor.is_beta) self.eddn.export_outfitting(data, monitor.is_beta)
if data['lastStarport'].get('ships'): if data['lastStarport'].get('ships'):
self.eddn.export_shipyard(data, monitor.is_beta) self.eddn.export_shipyard(data, monitor.is_beta)
elif data['lastStarport']['services'].get('shipyard'): elif data['lastStarport'].get('services', {}).get('shipyard'):
# API is flakey about shipyard info - silently retry if missing (<1s is usually sufficient - 5s for margin). # API is flakey about shipyard info - silently retry if missing (<1s is usually sufficient - 5s for margin).
self.w.after(int(SERVER_RETRY * 1000), lambda:self.retry_for_shipyard(2)) self.w.after(int(SERVER_RETRY * 1000), lambda:self.retry_for_shipyard(2))
if not old_status: if not old_status:

7
companion.py
View File

@ -245,15 +245,16 @@ class Session:
def station(self): def station(self):
data = self.query(URL_QUERY) data = self.query(URL_QUERY)
if data.get('docked'): if data['commander'].get('docked'):
if data['lastStarport']['services'].get('commodities'): services = data['lastStarport'].get('services', {})
if services.get('commodities'):
marketdata = self.query(URL_MARKET) marketdata = self.query(URL_MARKET)
if (data['lastStarport']['name'] != marketdata['name'] or if (data['lastStarport']['name'] != marketdata['name'] or
int(data['lastStarport']['id']) != int(marketdata['id'])): int(data['lastStarport']['id']) != int(marketdata['id'])):
raise ServerLagging() raise ServerLagging()
else: else:
data['lastStarport'].update(marketdata) data['lastStarport'].update(marketdata)
if data['lastStarport']['services'].get('outfitting') or data['lastStarport']['services'].get('shipyard'): if services.get('outfitting') or services.get('shipyard'):
shipdata = self.query(URL_SHIPYARD) shipdata = self.query(URL_SHIPYARD)
if (data['lastStarport']['name'] != shipdata['name'] or if (data['lastStarport']['name'] != shipdata['name'] or
int(data['lastStarport']['id']) != int(shipdata['id'])): int(data['lastStarport']['id']) != int(shipdata['id'])):