From 7a5635b3fba4631914a3082f0707e5a26cef61c0 Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Sun, 27 Apr 2025 16:26:33 -0400 Subject: [PATCH 1/2] [#579] Allow EDMC to Iterate Known CMDRs --- EDMC.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/EDMC.py b/EDMC.py index fd241ec2..a0a94a30 100755 --- a/EDMC.py +++ b/EDMC.py @@ -126,6 +126,12 @@ def main() -> None: # noqa: C901, CCR001 action='store_true' ) + parser.add_argument( + '--refresh-all', + help='Iterate over all known CMDRs to try and refresh access tokens', + action='store_true', + ) + parser.add_argument('-a', metavar='FILE', help='write ship loadout to FILE in Companion API json format') parser.add_argument('-e', metavar='FILE', help='write ship loadout to FILE in E:D Shipyard plain text format') parser.add_argument('-l', metavar='FILE', help='write ship locations to FILE in CSV format') @@ -184,6 +190,16 @@ def main() -> None: # noqa: C901, CCR001 logger.info(f'marked {d} for TRACE') log_locale('Initial Locale') + if args.refresh_all: + logger.info("Refreshing all known CMDRs") + cmdrs = config.get_list('cmdrs', default=[]) + for cmdr in cmdrs: + logger.info(f'Attempting to use commander "{cmdr}"') + try: + companion.session.login(cmdr, monitor.is_beta) + logger.debug("Succeeded!") + except AttributeError: + logger.debug(f"Unable to refresh CMDR {cmdr}.") if args.j: logger.debug('Import and collate from JSON dump') From e8d4b95bd268d0cdefccdd2341423952998ba0f6 Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Sun, 27 Apr 2025 16:29:04 -0400 Subject: [PATCH 2/2] [579] Alter Logging --- EDMC.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/EDMC.py b/EDMC.py index a0a94a30..b8e95a55 100755 --- a/EDMC.py +++ b/EDMC.py @@ -191,10 +191,11 @@ def main() -> None: # noqa: C901, CCR001 log_locale('Initial Locale') if args.refresh_all: - logger.info("Refreshing all known CMDRs") + # Attempt to refresh all known CMDRs. This MAY cause additional output if a token is invalid. + logger.debug("Refreshing all known CMDRs") cmdrs = config.get_list('cmdrs', default=[]) for cmdr in cmdrs: - logger.info(f'Attempting to use commander "{cmdr}"') + logger.debug(f'Attempting to use commander "{cmdr}"') try: companion.session.login(cmdr, monitor.is_beta) logger.debug("Succeeded!")