From 72242764fdea7cf38d65327d73e5321ae7a4f622 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 27 May 2021 17:33:56 +0100 Subject: [PATCH] Suits: Set edmcName on CAPI data for all suits. --- companion.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/companion.py b/companion.py index 72dafc70..fd56a4de 100644 --- a/companion.py +++ b/companion.py @@ -689,7 +689,11 @@ class Session(object): monitor.state['Suits'] = suits # We need to be setting our edmcName for all suits - monitor.state['SuitCurrent']['edmcName'] = monitor.suit_sane_name(monitor.state['SuitCurrent']['locName']) + loc_name = monitor.state['SuitCurrent'].get('locName', monitor.state['SuitCurrent']['name']) + monitor.state['SuitCurrent']['edmcName'] = monitor.suit_sane_name(loc_name) + for s in monitor.state['Suits']: + loc_name = monitor.state['Suits'][s].get('locName', monitor.state['Suits'][s]['name']) + monitor.state['Suits'][s]['edmcName'] = monitor.suit_sane_name(loc_name) if (suit_loadouts := data.get('loadouts')) is None: logger.warning('CAPI data had "suit" but no (suit) "loadouts"')