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

[2051] Revert Bool Check

Browse Source
This commit is contained in:
David Sangrey 2023-11-17 18:28:11 -05:00
parent 32cba245cd
commit c47552d678
No known key found for this signature in database
GPG Key ID: 3AEADBB0186884BC
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
EDMarketConnector.py
View File

@ -1166,19 +1166,22 @@ class AppWindow:
self.status['text'] = _('CAPI query aborted: GameVersion unknown') self.status['text'] = _('CAPI query aborted: GameVersion unknown')
return return
if not companion.session.retrying and time() >= self.capi_fleetcarrier_query_holdoff_time: if not companion.session.retrying:
if time() < self.capi_fleetcarrier_query_holdoff_time: # Was invoked while in cooldown
logger.debug('CAPI fleetcarrier query aborted, too soon since last request')
return
# LANG: Status - Attempting to retrieve data from Frontier CAPI # LANG: Status - Attempting to retrieve data from Frontier CAPI
self.status['text'] = _('Fetching data...') self.status['text'] = _('Fetching data...')
self.w.update_idletasks() self.w.update_idletasks()
query_time = int(time()) query_time = int(time())
logger.trace_if('capi.worker', 'Requesting fleetcarrier data') logger.trace_if('capi.worker', 'Requesting fleetcarrier data')
config.set('fleetcarrierquerytime', query_time) config.set('fleetcarrierquerytime', query_time)
logger.trace_if('capi.worker', 'Calling companion.session.fleetcarrier') logger.trace_if('capi.worker', 'Calling companion.session.fleetcarrier')
companion.session.fleetcarrier( companion.session.fleetcarrier(
query_time=query_time, tk_response_event=self._CAPI_RESPONSE_TK_EVENT_NAME query_time=query_time, tk_response_event=self._CAPI_RESPONSE_TK_EVENT_NAME
) )
def capi_handle_response(self, event=None): # noqa: C901, CCR001 def capi_handle_response(self, event=None): # noqa: C901, CCR001
""" """
@ -1274,7 +1277,7 @@ class AppWindow:
f"{monitor.state['SystemName']!r}") f"{monitor.state['SystemName']!r}")
raise companion.ServerLagging() raise companion.ServerLagging()
if capi_response.capi_data['lastStarport']['name'] != monitor.state['StationName']: elif capi_response.capi_data['lastStarport']['name'] != monitor.state['StationName']:
if monitor.state['OnFoot'] and monitor.state['StationName']: if monitor.state['OnFoot'] and monitor.state['StationName']:
logger.warning(f"({capi_response.capi_data['lastStarport']['name']!r} != " logger.warning(f"({capi_response.capi_data['lastStarport']['name']!r} != "
f"{monitor.state['StationName']!r}) AND " f"{monitor.state['StationName']!r}) AND "