Added monitor state TypedDict definitions

EDMarketConnector.py

@@ -660,13 +660,13 @@ def update_suit_text(self) -> None:
             self.suit['text'] = ''
             return
 
-        if (suit := monitor.state.get('SuitCurrent')) is None:
+        if (suit := monitor.state['SuitCurrent']) is None:
             self.suit['text'] = f'<{_("Unknown")}>'  # LANG: Unknown suit
             return
 
         suitname = suit['edmcName']
 
-        if (suitloadout := monitor.state.get('SuitLoadoutCurrent')) is None:
+        if (suitloadout := monitor.state['SuitLoadoutCurrent']) is None:
             self.suit['text'] = ''
             return
 
@@ -739,7 +739,7 @@ def set_labels(self):
         """Set main window labels, e.g. after language change."""
         self.cmdr_label['text'] = _('Cmdr') + ':'  # LANG: Label for commander name in main window
         # LANG: 'Ship' or multi-crew role label in main window, as applicable
-        self.ship_label['text'] = (monitor.state['Captain'] and _('Role') or _('Ship')) + ':'  # Main window
+        self.ship_label['text'] = (_('Role') if monitor.state['Captain'] else _('Ship')) + ':'  # Main window
         self.suit_label['text'] = _('Suit') + ':'  # LANG: Label for 'Suit' line in main UI
         self.system_label['text'] = _('System') + ':'  # LANG: Label for 'System' line in main UI
         self.station_label['text'] = _('Station') + ':'  # LANG: Label for 'Station' line in main UI
@@ -991,7 +991,7 @@ def getandsend(self, event=None, retrying: bool = False):  # noqa: C901, CCR001
                 if monitor.state['Modules']:
                     self.ship.configure(state=True)
 
-                if monitor.state.get('SuitCurrent') is not None:
+                if monitor.state['SuitCurrent'] is not None:
                     if (loadout := data.get('loadout')) is not None:
                         if (suit := loadout.get('suit')) is not None:
                             if (suitname := suit.get('edmcName')) is not None:
@@ -1076,6 +1076,7 @@ def crewroletext(role: str) -> str:
             """
             return {
                 None:         '',
+                '':           '',
                 'Idle':       '',
                 'FighterCon': _('Fighter'),  # LANG: Multicrew role
                 'FireCon':    _('Gunner'),  # LANG: Multicrew role

companion.py

@@ -28,6 +28,7 @@
 from edmc_data import companion_category_map as category_map
 from EDMCLogging import get_main_logger
 from monitor import monitor
+from monitor_state_dict import SuitDict, SuitLoadoutDict
 from protocol import protocolhandler
 
 logger = get_main_logger()
@@ -388,7 +389,7 @@ def authorize(self, payload: str) -> str:  # noqa: CCR001
 
                 # All 'FID' seen in Journals so far have been 'F<id>'
                 # Frontier, Steam and Epic
-                if f'F{customer_id}' != monitor.state.get('FID'):
+                if f'F{customer_id}' != monitor.state['FID']:
                     # LANG: Frontier auth customer_id doesn't match game session FID
                     raise CredentialsError(_("Error: customer_id doesn't match!"))
 
@@ -713,28 +714,37 @@ def suit_update(self, data: CAPIData) -> None:
 
         :param data: CAPI data to extra suit data from.
         """
+        current_suit: Optional[SuitDict]
         if (current_suit := data.get('suit')) is None:
             # Probably no Odyssey on the account, so point attempting more.
             return
 
         monitor.state['SuitCurrent'] = current_suit
         # It's easier to always have this in the 'sparse array' dict form
-        suits = data.get('suits')
+        suits: Optional[Union[List[SuitDict], Dict[int, SuitDict]]] = data.get('suits')
         if isinstance(suits, list):
             monitor.state['Suits'] = dict(enumerate(suits))
 
-        else:
+        elif isinstance(suits, dict):
             monitor.state['Suits'] = suits
+        else:
+            # If it was neither, it didn't exist, so ... dont muck with it, as something is either broken or
+            # we didn't see a bunch of info.
+            pass
 
         # We need to be setting our edmcName for all suits
-        loc_name = monitor.state['SuitCurrent'].get('locName', monitor.state['SuitCurrent']['name'])
-        monitor.state['SuitCurrent']['edmcName'] = monitor.suit_sane_name(loc_name)
+        if (current_suit := monitor.state['SuitCurrent']) is not None:
+            loc_name = current_suit['locName'] if current_suit.get('locName') else current_suit['name']
+            current_suit['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)
 
+        suit_loadouts: Optional[Union[List[SuitLoadoutDict], Dict[int, SuitLoadoutDict]]]
         if (suit_loadouts := data.get('loadouts')) is None:
             logger.warning('CAPI data had "suit" but no (suit) "loadouts"')
+            return
 
         monitor.state['SuitLoadoutCurrent'] = data.get('loadout')
         # It's easier to always have this in the 'sparse array' dict form