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

Revert part of e510b783

Browse Source 
Apparently config.get does _not_ take a default param. It really should.
This commit is contained in:
A_D 2020-07-13 08:10:52 +02:00 committed by Athanasius
parent 664605a315
commit 4ee8869426
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EDMC.py
View File

@ -98,7 +98,7 @@ def main():
else:
# Get state from latest Journal file
try:
logdir = config.get('journaldir', config.default_journal_dir)
logdir = config.get('journaldir') or config.default_journal_dir
logfiles = sorted((x for x in os.listdir(logdir) if JOURNAL_RE.search(x)), key=lambda x: x.split('.')[1:])
logfile = join(logdir, logfiles[-1])
@ -121,7 +121,7 @@ def main():
# Get data from Companion API
if args.p:
cmdrs = config.get('cmdrs', [])
cmdrs = config.get('cmdrs') or []
if args.p in cmdrs:
idx = cmdrs.index(args.p)
@ -135,7 +135,7 @@ def main():
companion.session.login(cmdrs[idx], monitor.is_beta)
else:
cmdrs = config.get('cmdrs', [])
cmdrs = config.get('cmdrs') or []
if monitor.cmdr not in cmdrs:
raise companion.CredentialsError()