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

edsm: Send gameversion/build in all messages

Browse Source 
* Record the 'state' version of these in `this`.
* Use those when constructing the message.
* NB: Need to check if messages can be retained in the queue across client
  changes.  Coming up ....
This commit is contained in:
Athanasius 2022-11-28 10:51:25 +00:00
parent d902093f0b
commit ad95041605
No known key found for this signature in database
GPG Key ID: 772697E181BB2767
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/edsm.py
View File

@ -71,6 +71,9 @@ class This:
def __init__(self): def __init__(self):
self.shutting_down = False # Plugin is shutting down. self.shutting_down = False # Plugin is shutting down.
self.game_version = ""
self.game_build = ""
self.session: requests.Session = requests.Session() self.session: requests.Session = requests.Session()
self.session.headers['User-Agent'] = user_agent self.session.headers['User-Agent'] = user_agent
self.queue: Queue = Queue() # Items to be sent to EDSM by worker thread self.queue: Queue = Queue() # Items to be sent to EDSM by worker thread
@ -432,6 +435,9 @@ def journal_entry( # noqa: C901, CCR001
if should_return: if should_return:
return return
this.game_version = state['GameVersion']
this.game_build = state['GameBuild']
entry = new_entry entry = new_entry
this.on_foot = state['OnFoot'] this.on_foot = state['OnFoot']
@ -726,6 +732,8 @@ def worker() -> None: # noqa: CCR001 C901 # Cant be broken up currently
'apiKey': apikey, 'apiKey': apikey,
'fromSoftware': applongname, 'fromSoftware': applongname,
'fromSoftwareVersion': str(appversion()), 'fromSoftwareVersion': str(appversion()),
'fromGameVersion': this.game_version,
'fromGameBuild': this.game_build,
'message': json.dumps(pending, ensure_ascii=False).encode('utf-8'), 'message': json.dumps(pending, ensure_ascii=False).encode('utf-8'),
} }