Skip to content

Commit

Permalink
Carry on with station update after EDSM error.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Marginal
Marginal committed Nov 18, 2015
1 parent b799494 commit 62c85d5
Showing 1 changed file with 31 additions and 22 deletions.
53 changes: 31 additions & 22 deletions EDMarketConnector.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,10 @@ def getandsend(self, event=None, retrying=False):
# Validation
if not data.get('commander') or not data['commander'].get('name','').strip():
self.status['text'] = _("Who are you?!") # Shouldn't happen
if play_sound: hotkeymgr.play_bad()
elif not data.get('lastSystem') or not data['lastSystem'].get('name','').strip() or not data.get('lastStarport') or not data['lastStarport'].get('name','').strip():
self.status['text'] = _("Where are you?!") # Shouldn't happen
if play_sound: hotkeymgr.play_bad()
elif not data.get('ship') or not data['ship'].get('modules') or not data['ship'].get('name','').strip():
self.status['text'] = _("What are you flying?!") # Shouldn't happen
if play_sound: hotkeymgr.play_bad()

else:
if __debug__: # Recording
Expand All @@ -257,6 +254,7 @@ def getandsend(self, event=None, retrying=False):
self.cmdr['text'] = data.get('commander') and data.get('commander').get('name') or ''
self.system['text'] = data.get('lastSystem') and data.get('lastSystem').get('name') or ''
self.station['text'] = data.get('commander') and data.get('commander').get('docked') and data.get('lastStarport') and data.get('lastStarport').get('name') or (EDDB.system(self.system['text']) and self.STATION_UNDOCKED or '')
self.status['text'] = ''
self.edit_menu.entryconfigure(_('Copy'), state=tk.NORMAL)

# stuff we can do when not docked
Expand All @@ -266,32 +264,40 @@ def getandsend(self, event=None, retrying=False):
coriolis.export(data)
if config.getint('output') & config.OUT_LOG_FILE:
flightlog.export(data)
if config.getint('output') & config.OUT_LOG_EDSM:
self.status['text'] = _('Sending data to EDSM...')
self.w.update_idletasks()
edsm.export(data, lambda:self.edsm.lookup(self.system['text'], EDDB.system(self.system['text']))) # Do EDSM lookup during EDSM export
else:
self.edsm.start_lookup(self.system['text'], EDDB.system(self.system['text']))
self.edsmpoll()
try:
# Catch any EDSM errors here so that they don't prevent station update
if config.getint('output') & config.OUT_LOG_EDSM:
self.status['text'] = _('Sending data to EDSM...')
self.w.update_idletasks()
edsm.export(data, lambda:self.edsm.lookup(self.system['text'], EDDB.system(self.system['text']))) # Do EDSM lookup during EDSM export
else:
self.edsm.start_lookup(self.system['text'], EDDB.system(self.system['text']))
self.status['text'] = ''
self.edsmpoll()
except Exception as e:
if __debug__: print_exc()
self.status['text'] = unicode(e)

if not (config.getint('output') & (config.OUT_CSV|config.OUT_TD|config.OUT_BPC|config.OUT_EDDN)):
# no station data requested - we're done
self.status['text'] = strftime(_('Last updated at {HH}:{MM}:{SS}').format(HH='%H', MM='%M', SS='%S').encode('utf-8'), localtime(querytime)).decode('utf-8')
pass

elif not data['commander'].get('docked'):
self.status['text'] = _("You're not docked at a station!")
# signal as error because the user might actually be docked but the server hosting the Companion API hasn't caught up
if play_sound: hotkeymgr.play_bad()
if not self.status['text']:
self.status['text'] = _("You're not docked at a station!")

else:
# Finally - the data looks sane and we're docked at a station
(station_id, has_shipyard, has_outfitting) = EDDB.station(self.system['text'], self.station['text'])

if (config.getint('output') & config.OUT_EDDN) and not data['lastStarport'].get('commodities') and not has_outfitting and not has_shipyard:
self.status['text'] = _("Station doesn't have anything!")
if not self.status['text']:
self.status['text'] = _("Station doesn't have anything!")

elif not (config.getint('output') & config.OUT_EDDN) and not data['lastStarport'].get('commodities'):
self.status['text'] = _("Station doesn't have a market!")
if not self.status['text']:
self.status['text'] = _("Station doesn't have a market!")

else:
if data['lastStarport'].get('commodities'):
Expand All @@ -306,7 +312,9 @@ def getandsend(self, event=None, retrying=False):
bpc.export(data, False)

if config.getint('output') & config.OUT_EDDN:
self.status['text'] = _('Sending data to EDDN...')
old_status = self.status['text']
if not old_status:
self.status['text'] = _('Sending data to EDDN...')
self.w.update_idletasks()
eddn.export_commodities(data)
if has_outfitting:
Expand All @@ -324,8 +332,8 @@ def getandsend(self, event=None, retrying=False):
self.w.after(int(SERVER_RETRY * 1000), self.retry_for_shipyard)
elif __debug__ and data['lastStarport'].get('ships'):
print 'Spurious shipyard!'

self.status['text'] = strftime(_('Last updated at {HH}:{MM}:{SS}').format(HH='%H', MM='%M', SS='%S').encode('utf-8'), localtime(querytime)).decode('utf-8')
if not old_status:
self.status['text'] = ''

except companion.VerificationRequired:
return prefs.AuthenticationDialog(self.w, self.verify)
Expand All @@ -334,7 +342,6 @@ def getandsend(self, event=None, retrying=False):
except companion.ServerError as e:
if retrying:
self.status['text'] = unicode(e)
if play_sound: hotkeymgr.play_bad()
else:
# Retry once if Companion server is unresponsive
self.w.after(int(SERVER_RETRY * 1000), lambda:self.getandsend(event, True))
Expand All @@ -343,17 +350,19 @@ def getandsend(self, event=None, retrying=False):
except requests.exceptions.ConnectionError as e:
if __debug__: print_exc()
self.status['text'] = _("Error: Can't connect to EDDN")
if play_sound: hotkeymgr.play_bad()

except requests.exceptions.Timeout as e:
if __debug__: print_exc()
self.status['text'] = _("Error: Connection to EDDN timed out")
if play_sound: hotkeymgr.play_bad()

except Exception as e:
if __debug__: print_exc()
self.status['text'] = unicode(e)
if play_sound: hotkeymgr.play_bad()

if not self.status['text']: # no errors
self.status['text'] = strftime(_('Last updated at {HH}:{MM}:{SS}').format(HH='%H', MM='%M', SS='%S').encode('utf-8'), localtime(querytime)).decode('utf-8')
elif play_sound:
hotkeymgr.play_bad()

self.holdofftime = querytime + companion.holdoff
self.cooldown()
Expand Down

0 comments on commit 62c85d5

Please sign in to comment.