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

Tidy

Browse Source
This commit is contained in:
Jonathan Harris 2017-12-17 19:21:56 +00:00
parent b28355d182
commit 105f44e6ca
1 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/edsm.py
View File

@ -68,7 +68,6 @@ def plugin_start():
this.thread.start() this.thread.start()
# Get the last Discarded events from EDSM # Get the last Discarded events from EDSM
if __debug__: print('Calling Discarded Events API endpoint')
this.queue.put(('https://www.edsm.net/api-journal-v1/discard', {}, discarded_callback)) this.queue.put(('https://www.edsm.net/api-journal-v1/discard', {}, discarded_callback))
return 'EDSM' return 'EDSM'
@ -242,7 +241,6 @@ def worker():
retrying = 0 retrying = 0
while retrying < 3: while retrying < 3:
try: try:
#if __debug__: print(data)
r = this.session.post(url, data=data, timeout=_TIMEOUT) r = this.session.post(url, data=data, timeout=_TIMEOUT)
r.raise_for_status() r.raise_for_status()
reply = r.json() reply = r.json()
@ -268,13 +266,11 @@ def worker():
# Queue a call to the EDSM journal API with args (which should be quoted) # Queue a call to the EDSM journal API with args (which should be quoted)
def call(cmdr, args, callback=None): def call(cmdr, args, callback=None):
(username, apikey) = credentials(cmdr) (username, apikey) = credentials(cmdr)
args = dict(args) args = dict(args)
args['commanderName'] = username args['commanderName'] = username
args['apiKey'] = apikey args['apiKey'] = apikey
args['fromSoftware'] = applongname args['fromSoftware'] = applongname
args['fromSoftwareVersion'] = appversion args['fromSoftwareVersion'] = appversion
this.queue.put(('https://www.edsm.net/api-journal-v1', args, callback)) this.queue.put(('https://www.edsm.net/api-journal-v1', args, callback))
@ -293,17 +289,16 @@ def sendEntry(cmdr, system, station, entry, state):
eventCallback = null_callback eventCallback = null_callback
# Introduce transient states into the event # Introduce transient states into the event
entry['_systemName'] = system; entry['_systemName'] = system
#entry['_systemCoordinates'] = gameStatus.coordinates; #TODO: Track system coordinates #entry['_systemCoordinates'] = gameStatus.coordinates #TODO: Track system coordinates
entry['_stationName'] = station; entry['_stationName'] = station
entry['_shipId'] = state['ShipID']; entry['_shipId'] = state['ShipID']
# Make the API call # Make the API call
call(cmdr, { 'message': json.dumps(entry) }, eventCallback) call(cmdr, { 'message': json.dumps(entry) }, eventCallback)
def writelog_callback(reply): def writelog_callback(reply):
#if __debug__: print(reply)
this.lastlookup = reply['events'][0] # Get first response while we send events one by one this.lastlookup = reply['events'][0] # Get first response while we send events one by one
this.system.event_generate('<<EDSMStatus>>', when="tail") # calls update_status in main thread this.system.event_generate('<<EDSMStatus>>', when="tail") # calls update_status in main thread
@ -325,11 +320,11 @@ def update_status(event=None):
# When we don't care about return msgnum from EDSM # When we don't care about return msgnum from EDSM
def null_callback(reply): def null_callback(reply):
if not reply: if not reply:
plug.show_error(_("Error: Can't connect to EDSM"))# When we don't care about return msgnum from EDSM plug.show_error(_("Error: Can't connect to EDSM"))
# Grab the discarded list # Grab the discarded list
def discarded_callback(reply): def discarded_callback(reply):
if not reply: if not reply:
plug.show_error(_("Error: Can't get EDSM DIscarded Events")) plug.show_error(_("Error: Can't connect to EDSM"))
else: else:
this.discardedEvents = reply this.discardedEvents = reply