[2262] Move SLEF to Monitor

HullSeals · Jun 23, 2024 · 3b62592 · 3b62592
1 parent 0cc35db
commit 3b62592
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 311 deletions.
diff --git a/inara.json b/inara.json
diff --git a/monitor.py b/monitor.py
@@ -21,9 +21,10 @@
 from typing import TYPE_CHECKING, Any, BinaryIO, MutableMapping
 import semantic_version
 import util_ships
-from config import config
-from edmc_data import edmc_suit_shortnames, edmc_suit_symbol_localised
+from config import config, appname, appversion
+from edmc_data import edmc_suit_shortnames, edmc_suit_symbol_localised, ship_name_map
 from EDMCLogging import get_main_logger
+from edshipyard import ships
 
 if TYPE_CHECKING:
     import tkinter
@@ -109,6 +110,7 @@ def __init__(self) -> None:
         self.group: str | None = None
         self.cmdr: str | None = None
         self.started: int | None = None  # Timestamp of the LoadGame event
+        self.slef: str | None = None
 
         self._navroute_retries_remaining = 0
         self._last_navroute_journal_timestamp: float | None = None
@@ -701,6 +703,34 @@ def parse_entry(self, line: bytes) -> MutableMapping[str, Any]:  # noqa: C901, C
                         module.pop('AmmoInHopper')
 
                     self.state['Modules'][module['Slot']] = module
+                # SLEF
+                initial_dict = {
+                    "header": {"appName": appname, "appVersion": str(appversion())}
+                }
+                data_dict = {}
+                for module in entry['Modules']:
+                    if module.get('Slot') == 'FuelTank':
+                        cap = module['Item'].split('size')
+                        cap = cap[1].split('_')
+                        cap = 2 ** int(cap[0])
+                        ship = ship_name_map[entry["Ship"]]
+                        fuel = {'Main': cap, 'Reserve': ships[ship]['reserveFuelCapacity']}
+                        data_dict.update({"FuelCapacity": fuel})
+                data_dict.update({
+                    'Ship': entry["Ship"],
+                    'ShipName': entry['ShipName'],
+                    'ShipIdent': entry['ShipIdent'],
+                    'HullValue': entry['HullValue'],
+                    'ModulesValue': entry['ModulesValue'],
+                    'Rebuy': entry['Rebuy'],
+                    'MaxJumpRange': entry['MaxJumpRange'],
+                    'UnladenMass': entry['UnladenMass'],
+                    'CargoCapacity': entry['CargoCapacity'],
+                    'Modules': entry['Modules'],
+                })
+                initial_dict.update({'data': data_dict})
+                output = json.dumps(initial_dict, indent=4)
+                self.slef = str(output)
 
             elif event_type == 'modulebuy':
                 self.state['Modules'][entry['Slot']] = {

diff --git a/plugins/inara.py b/plugins/inara.py
@@ -35,7 +35,6 @@
 import edmc_data
 import killswitch
 import myNotebook as nb  # noqa: N813
-from edshipyard import ships
 import plug
 import timeout_session
 from companion import CAPIData
@@ -872,7 +871,6 @@ def journal_entry(  # noqa: C901, CCR001
                 cur_ship['shipRebuyCost'] = state['Rebuy']
 
             new_add_event('setCommanderShip', entry['timestamp'], cur_ship)
-            make_slef(entry)
 
         # Stored modules
         if event_name == 'StoredModules':
@@ -1479,39 +1477,6 @@ def make_loadout(state: dict[str, Any]) -> dict[str, Any]:  # noqa: CCR001
     }
 
 
-def make_slef(entry) -> None:
-    initial_dict = {
-        "header": {"appName": appname, "appVersion": str(appversion())}
-    }
-    data_dict = {}
-    for module in entry['Modules']:
-        if module.get('Slot') == 'FuelTank':
-            cap = module['Item'].split('size')
-            cap = cap[1].split('_')
-            cap = 2 ** int(cap[0])
-            ship = edmc_data.ship_name_map[entry["Ship"]]
-            fuel = {'Main': cap, 'Reserve': ships[ship]['reserveFuelCapacity']}
-            data_dict.update({"FuelCapacity": fuel})
-    data_dict.update({
-        'Ship': entry["Ship"],
-        'ShipName': entry['ShipName'],
-        'ShipIdent': entry['ShipIdent'],
-        'HullValue': entry['HullValue'],
-        'ModulesValue': entry['ModulesValue'],
-        'Rebuy': entry['Rebuy'],
-        'MaxJumpRange': entry['MaxJumpRange'],
-        'UnladenMass': entry['UnladenMass'],
-        'CargoCapacity': entry['CargoCapacity'],
-        'Modules': entry['Modules'],
-    })
-    initial_dict.update({'data': data_dict})
-    output = json.dumps(initial_dict, indent=4)
-    this.SLEF = str(output)
-    print('set output')
-    print(type(this.SLEF))
-    return None
-
-
 def new_add_event(
     name: str,
     timestamp: str,