From 2253e45c18e98f3243aa9384dabf754f6b9706c5 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Thu, 29 Apr 2021 11:45:06 +0100
Subject: [PATCH] Suits: Add some paranoia around Loadouts

* Initialise to empty dict.
* try/except in case CAPI pull hasn't happened yet when parsing Journal
  events.
---
 monitor.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/monitor.py b/monitor.py
index 80adee29..b969f2d2 100644
--- a/monitor.py
+++ b/monitor.py
@@ -153,7 +153,7 @@ class EDLogs(FileSystemEventHandler):  # type: ignore # See below
             'SuitCurrent':        None,
             'Suits':              None,
             'SuitLoadoutCurrent': None,
-            'SuitLoadouts':       None,
+            'SuitLoadouts':       {},
         }
 
     def start(self, root: 'tkinter.Tk') -> bool:  # noqa: CCR001
@@ -982,13 +982,13 @@ class EDLogs(FileSystemEventHandler):  # type: ignore # See below
                 # "SuitName":"explorationsuit_class1", "SuitName_Localised":"Artemis Suit", "LoadoutID":4293000003,
                 # "LoadoutName":"Loadout 1" }
 
-                slotid = self.suit_loadout_id_from_loadoutid(entry['LoadoutID'])
+                loadout_id = self.suit_loadout_id_from_loadoutid(entry['LoadoutID'])
                 try:
-                    self.state['SuitLoadouts'].pop(f'{slotid}')
+                    self.state['SuitLoadouts'].pop(f'{loadout_id}')
 
                 except KeyError:
                     # This should no longer happen, as we're now handling CreateSuitLoadout properly
-                    logger.exception(f"slot id {slotid} doesn't exist, not in last CAPI pull ?")
+                    logger.exception(f"loadout slot id {loadout_id} doesn't exist, not in last CAPI pull ?")
 
             elif event_type == 'RenameSuitLoadout':
                 # alpha4
@@ -1002,7 +1002,11 @@ class EDLogs(FileSystemEventHandler):  # type: ignore # See below
                 # "SuitName":"explorationsuit_class1", "SuitName_Localised":"Artemis Suit", "LoadoutID":4293000003,
                 # "LoadoutName":"Art L/K" }
                 loadout_id = self.suit_loadout_id_from_loadoutid(entry['LoadoutID'])
-                self.state['SuitLoadouts'][loadout_id]['name'] = entry['LoadoutName']
+                try:
+                    self.state['SuitLoadouts'][loadout_id]['name'] = entry['LoadoutName']
+
+                except KeyError:
+                    logger.exception(f"loadout slot id {loadout_id} doesn't exist, not in last CAPI pull ?")
 
             elif event_type == 'BuySuit':
                 # alpha4 :