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

Suppress cAPI queries if waiting for Auth callback

Browse Source
This commit is contained in:
Jonathan Harris 2019-04-26 13:17:42 +01:00
parent dc20d6a449
commit 1ac76d11db
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
EDMarketConnector.py
View File

@ -366,10 +366,22 @@ class AppWindow:
if not self.status['text']: if not self.status['text']:
self.status['text'] = _('Logging in...') self.status['text'] = _('Logging in...')
self.button['state'] = self.theme_button['state'] = tk.DISABLED self.button['state'] = self.theme_button['state'] = tk.DISABLED
if platform == 'darwin':
self.view_menu.entryconfigure(0, state=tk.DISABLED) # Status
self.file_menu.entryconfigure(0, state=tk.DISABLED) # Save Raw Data
else:
self.file_menu.entryconfigure(0, state=tk.DISABLED) # Status
self.file_menu.entryconfigure(1, state=tk.DISABLED) # Save Raw Data
self.w.update_idletasks() self.w.update_idletasks()
try: try:
if companion.session.login(monitor.cmdr, monitor.is_beta): if companion.session.login(monitor.cmdr, monitor.is_beta):
self.status['text'] = _('Authentication successful') # Successfully authenticated with the Frontier website self.status['text'] = _('Authentication successful') # Successfully authenticated with the Frontier website
if platform == 'darwin':
self.view_menu.entryconfigure(0, state=tk.NORMAL) # Status
self.file_menu.entryconfigure(0, state=tk.NORMAL) # Save Raw Data
else:
self.file_menu.entryconfigure(0, state=tk.NORMAL) # Status
self.file_menu.entryconfigure(1, state=tk.NORMAL) # Save Raw Data
except (companion.CredentialsError, companion.ServerError, companion.ServerLagging) as e: except (companion.CredentialsError, companion.ServerError, companion.ServerLagging) as e:
self.status['text'] = unicode(e) self.status['text'] = unicode(e)
except Exception as e: except Exception as e:
@ -386,6 +398,11 @@ class AppWindow:
if not monitor.cmdr or not monitor.mode or monitor.state['Captain'] or not monitor.system: if not monitor.cmdr or not monitor.mode or monitor.state['Captain'] or not monitor.system:
return # In CQC or on crew - do nothing return # In CQC or on crew - do nothing
if companion.session.state == companion.Session.STATE_AUTH:
# Attempt another Auth
self.login()
return
if not retrying: if not retrying:
if time() < self.holdofftime: # Was invoked by key while in cooldown if time() < self.holdofftime: # Was invoked by key while in cooldown
self.status['text'] = '' self.status['text'] = ''
@ -557,8 +574,7 @@ class AppWindow:
if entry['event'] in [None, 'StartUp', 'NewCommander', 'LoadGame'] and monitor.cmdr: if entry['event'] in [None, 'StartUp', 'NewCommander', 'LoadGame'] and monitor.cmdr:
if not config.get('cmdrs') or monitor.cmdr not in config.get('cmdrs'): if not config.get('cmdrs') or monitor.cmdr not in config.get('cmdrs'):
config.set('cmdrs', (config.get('cmdrs') or []) + [monitor.cmdr]) config.set('cmdrs', (config.get('cmdrs') or []) + [monitor.cmdr])
if config.getint('output') & config.OUT_MKT_EDDN: self.login()
self.login()
if not entry['event'] or not monitor.mode: if not entry['event'] or not monitor.mode:
return # Startup or in CQC return # Startup or in CQC
@ -579,8 +595,8 @@ class AppWindow:
if not config.getint('hotkey_mute'): if not config.getint('hotkey_mute'):
hotkeymgr.play_bad() hotkeymgr.play_bad()
# Auto-Update after docking # Auto-Update after docking, but not if auth callback is pending
if entry['event'] in ['StartUp', 'Location', 'Docked'] and monitor.station and not config.getint('output') & config.OUT_MKT_MANUAL and config.getint('output') & config.OUT_STATION_ANY: if entry['event'] in ['StartUp', 'Location', 'Docked'] and monitor.station and not config.getint('output') & config.OUT_MKT_MANUAL and config.getint('output') & config.OUT_STATION_ANY and companion.session.state != companion.Session.STATE_AUTH:
self.w.after(int(SERVER_RETRY * 1000), self.getandsend) self.w.after(int(SERVER_RETRY * 1000), self.getandsend)
# cAPI auth # cAPI auth
@ -588,6 +604,12 @@ class AppWindow:
try: try:
companion.session.auth_callback() companion.session.auth_callback()
self.status['text'] = _('Authentication successful') # Successfully authenticated with the Frontier website self.status['text'] = _('Authentication successful') # Successfully authenticated with the Frontier website
if platform == 'darwin':
self.view_menu.entryconfigure(0, state=tk.NORMAL) # Status
self.file_menu.entryconfigure(0, state=tk.NORMAL) # Save Raw Data
else:
self.file_menu.entryconfigure(0, state=tk.NORMAL) # Status
self.file_menu.entryconfigure(1, state=tk.NORMAL) # Save Raw Data
except companion.ServerError as e: except companion.ServerError as e:
self.status['text'] = unicode(e) self.status['text'] = unicode(e)
except Exception as e: except Exception as e: