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

Get Cmdr name from Journal

Browse Source
This commit is contained in:
Jonathan Harris 2017-08-21 19:56:26 +01:00
parent e070570387
commit 4042862d15
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
EDMC.py
View File

@ -95,6 +95,10 @@ try:
sys.stderr.write("Can't read Journal file: %s\n" % unicode(e).encode('ascii', 'replace')) sys.stderr.write("Can't read Journal file: %s\n" % unicode(e).encode('ascii', 'replace'))
sys.exit(EXIT_SYS_ERR) sys.exit(EXIT_SYS_ERR)
if not monitor.cmdr:
sys.stderr.write('Not available while E:D is at the main menu\n')
sys.exit(EXIT_SYS_ERR)
# Get data from Companion API # Get data from Companion API
session = companion.Session() session = companion.Session()
if args.p: if args.p:
@ -110,7 +114,10 @@ try:
username = config.get('fdev_usernames')[idx] username = config.get('fdev_usernames')[idx]
session.login(username, config.get_password(username), monitor.is_beta) session.login(username, config.get_password(username), monitor.is_beta)
elif config.get('cmdrs'): elif config.get('cmdrs'):
username = config.get('fdev_usernames')[0] cmdrs = config.get('cmdrs') or []
if monitor.cmdr not in cmdrs:
raise companion.CredentialsError
username = config.get('fdev_usernames')[cmdrs.index(monitor.cmdr)]
session.login(username, config.get_password(username), monitor.is_beta) session.login(username, config.get_password(username), monitor.is_beta)
else: # <= 2.25 not yet migrated else: # <= 2.25 not yet migrated
session.login(config.get('username'), config.get('password'), monitor.is_beta) session.login(config.get('username'), config.get('password'), monitor.is_beta)