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

EDDB: Use CAPI for system_address/station_marketid only if not already set

Browse Source 
See issue  - a user had incorrect system_address set, but only sometimes.

This could possibly be due to CAPI errors/lag, so only use it as the source
when the values aren't yet set.  Otherwise Journal should always have provided
the correct value in a timely manner.
This commit is contained in:
Athanasius 2020-07-11 18:57:04 +01:00
parent 0282d0c6ba
commit 6932fdc883
1 changed files with 11 additions and 5 deletions

16
plugins/eddb.py

@ -69,10 +69,16 @@ def journal_entry(cmdr, is_beta, system, station, entry, state):
def cmdr_data(data, is_beta):
if config.get('system_provider') == 'eddb':
this.system_address = data['lastSystem']['id'] or this.system_address
this.system_link['url'] = system_url(this.system_address) # Override standard URL function
# Only fill in system_address from CAPI if it's not set yet
# This is to avoid CAPI lagging causing incorrect value
if not this.system_address:
this.system_address = data['lastSystem']['id']
this.system_link['url'] = system_url(this.system_address) # Override standard URL function
if config.get('station_provider') == 'eddb':
this.station_marketid = data['commander']['docked'] and data['lastStarport']['id']
this.station_link['text'] = data['commander']['docked'] and data['lastStarport']['name'] or (data['lastStarport']['name'] and data['lastStarport']['name'] != "" and STATION_UNDOCKED or '')
this.station_link.update_idletasks()
# Only use CAPI value if not yet set
# This is to avoid CAPI lagging causing incorrect value
if not this.station_marketid:
this.station_marketid = data['commander']['docked'] and data['lastStarport']['id']
this.station_link['text'] = data['commander']['docked'] and data['lastStarport']['name'] or (data['lastStarport']['name'] and data['lastStarport']['name'] != "" and STATION_UNDOCKED or '')
this.station_link.update_idletasks()