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

Don't send the Training system to EDSM.

Browse Source 
Fixes #81.
This commit is contained in:
Jonathan Harris 2016-01-19 19:46:34 +00:00
parent 3534e89840
commit 49cc2e1f2a
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
edsm.py
View File

@ -15,6 +15,7 @@ if __debug__:
class EDSM: class EDSM:
_TIMEOUT = 10 _TIMEOUT = 10
FAKE = ['CQC', 'Training'] # Fake systems that shouldn't be sent to EDSM
def __init__(self): def __init__(self):
self.result = { 'img': None, 'url': None, 'done': True } self.result = { 'img': None, 'url': None, 'done': True }
@ -28,12 +29,17 @@ class EDSM:
# Just set link without doing a lookup # Just set link without doing a lookup
def link(self, system_name): def link(self, system_name):
self.cancel_lookup() self.cancel_lookup()
self.result = { 'img': '', 'url': 'http://www.edsm.net/show-system?systemName=%s' % urllib.quote(system_name), 'done': True, 'uncharted': False } if system_name in self.FAKE:
self.result = { 'img': '', 'url': None, 'done': True, 'uncharted': False }
else:
self.result = { 'img': '', 'url': 'http://www.edsm.net/show-system?systemName=%s' % urllib.quote(system_name), 'done': True, 'uncharted': False }
def lookup(self, system_name, known=0): def lookup(self, system_name, known=0):
self.cancel_lookup() self.cancel_lookup()
if known or system_name in self.syscache: if system_name in self.FAKE:
self.result = { 'img': '', 'url': None, 'done': True, 'uncharted': False }
elif known or system_name in self.syscache:
self.result = { 'img': EDSM._IMG_KNOWN, 'url': 'http://www.edsm.net/show-system?systemName=%s' % urllib.quote(system_name), 'done': True, 'uncharted': False } self.result = { 'img': EDSM._IMG_KNOWN, 'url': 'http://www.edsm.net/show-system?systemName=%s' % urllib.quote(system_name), 'done': True, 'uncharted': False }
else: else:
self.result = { 'img': EDSM._IMG_ERROR, 'url': 'http://www.edsm.net/show-system?systemName=%s' % urllib.quote(system_name), 'done': True, 'uncharted': False } self.result = { 'img': EDSM._IMG_ERROR, 'url': 'http://www.edsm.net/show-system?systemName=%s' % urllib.quote(system_name), 'done': True, 'uncharted': False }
@ -56,7 +62,9 @@ class EDSM:
def start_lookup(self, system_name, known=0): def start_lookup(self, system_name, known=0):
self.cancel_lookup() self.cancel_lookup()
if known or system_name in self.syscache: # Cache URLs of systems with known coordinates if system_name in self.FAKE:
self.result = { 'img': '', 'url': None, 'done': True, 'uncharted': False }
elif known or system_name in self.syscache: # Cache URLs of systems with known coordinates
self.result = { 'img': EDSM._IMG_KNOWN, 'url': 'http://www.edsm.net/show-system?systemName=%s' % urllib.quote(system_name), 'done': True, 'uncharted': False } self.result = { 'img': EDSM._IMG_KNOWN, 'url': 'http://www.edsm.net/show-system?systemName=%s' % urllib.quote(system_name), 'done': True, 'uncharted': False }
else: else:
self.result = { 'img': '', 'url': 'http://www.edsm.net/show-system?systemName=%s' % urllib.quote(system_name), 'done': False, 'uncharted': False } self.result = { 'img': '', 'url': 'http://www.edsm.net/show-system?systemName=%s' % urllib.quote(system_name), 'done': False, 'uncharted': False }
@ -107,6 +115,9 @@ def writelog(timestamp, system, edsmlookupfn):
# Look up the system before adding it to the log, since adding it to the log has the side-effect of creating it # Look up the system before adding it to the log, since adding it to the log has the side-effect of creating it
edsmlookupfn() edsmlookupfn()
if system in EDSM.FAKE:
return
r = requests.get('http://www.edsm.net/api-logs-v1/set-log?commanderName=%s&apiKey=%s&systemName=%s&dateVisited=%s&fromSoftware=%s&fromSoftwareVersion=%s' % (urllib.quote(config.get('edsm_cmdrname')), urllib.quote(config.get('edsm_apikey')), urllib.quote(system), urllib.quote(time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(timestamp))), urllib.quote(applongname), urllib.quote(appversion)), timeout=EDSM._TIMEOUT) r = requests.get('http://www.edsm.net/api-logs-v1/set-log?commanderName=%s&apiKey=%s&systemName=%s&dateVisited=%s&fromSoftware=%s&fromSoftwareVersion=%s' % (urllib.quote(config.get('edsm_cmdrname')), urllib.quote(config.get('edsm_apikey')), urllib.quote(system), urllib.quote(time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(timestamp))), urllib.quote(applongname), urllib.quote(appversion)), timeout=EDSM._TIMEOUT)
r.raise_for_status() r.raise_for_status()
reply = r.json() reply = r.json()

4
monitor.py
View File

@ -223,10 +223,10 @@ class EDLogs(FileSystemEventHandler):
cqc = True cqc = True
elif 'Left a playlist lobby' in match.group(1) or 'Destroying playlist lobby' in match.group(1): elif 'Left a playlist lobby' in match.group(1) or 'Destroying playlist lobby' in match.group(1):
cqc = False cqc = False
elif not cqc: else:
match = regexp.match(line) match = regexp.match(line)
if match: if match:
system, visited = match.group(2), match.group(1) system, visited = cqc and 'CQC' or match.group(2), match.group(1)
if system: if system:
self._restart_required = False # clearly logging is working self._restart_required = False # clearly logging is working