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

Merge pull request #1137 from EDCD/fix/1134/edsm-multi-cmdr

Browse Source 
EDSM: Don't blindly assume we *already* have EDSM cmdr name and apikey
This commit is contained in:
Athanasius 2021-06-04 10:46:28 +01:00 committed by GitHub
commit 752f4b78d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/edsm.py
View File

@ -329,9 +329,14 @@ def credentials(cmdr: str) -> Optional[Tuple[str, str]]:
cmdrs = [cmdr]
config.set('edsm_cmdrs', cmdrs)
if cmdr in cmdrs and config.get_list('edsm_usernames') and config.get_list('edsm_apikeys'):
if (cmdr in cmdrs and (edsm_usernames := config.get_list('edsm_usernames'))
and (edsm_apikeys := config.get_list('edsm_apikeys'))):
idx = cmdrs.index(cmdr)
return (config.get_list('edsm_usernames')[idx], config.get_list('edsm_apikeys')[idx])
# The EDSM cmdr and apikey might not exist yet!
if idx >= len(edsm_usernames) or idx >= len(edsm_apikeys):
return None
return (edsm_usernames[idx], edsm_apikeys[idx])
else:
return None