Merge pull request #2356 from HullSeals/fix/2320/hull-get

[2320] Update Hull Get
EDCD · Jan 9, 2025 · 44c5b24 · 44c5b24
2 parents 4bfb5b4 + 6abdaf1
commit 44c5b24
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/EDMCSystemProfiler.py b/EDMCSystemProfiler.py
@@ -149,7 +149,7 @@ def main() -> None:
     # Buttons
     sys_report_btn = ttk.Button(
         root,
-        text="Copy System Report",
+        text="Copy System Report \U0001F5D0",
         command=lambda: copy_sys_report(root, sys_report),
     )
     sys_report_btn.grid(row=3, column=0, padx=20, pady=10, sticky="w")

diff --git a/edmc_data.py b/edmc_data.py
@@ -213,7 +213,9 @@
     'hpt_mininglaser_turret_small':              'D',
     'hpt_mininglaser_turret_medium':             'D',
     'hpt_multicannon_fixed_small':               'F',
+    'hpt_multicannon_fixed_small_advanced':      'F',
     'hpt_multicannon_fixed_medium':              'E',
+    'hpt_multicannon_fixed_medium_advanced':     'E',
     'hpt_multicannon_fixed_large':               'C',
     'hpt_multicannon_fixed_huge':                'A',
     'hpt_multicannon_gimbal_small':              'G',

diff --git a/monitor.py b/monitor.py
@@ -710,8 +710,8 @@ def parse_entry(self, line: bytes) -> MutableMapping[str, Any]:  # noqa: C901, C
                     'Ship': entry["Ship"],
                     'ShipName': entry['ShipName'],
                     'ShipIdent': entry['ShipIdent'],
-                    'HullValue': entry['HullValue'],
-                    'ModulesValue': entry['ModulesValue'],
+                    'HullValue': entry.get('HullValue'),
+                    'ModulesValue': entry.get('ModulesValue'),
                     'Rebuy': entry['Rebuy'],
                     'MaxJumpRange': entry['MaxJumpRange'],
                     'UnladenMass': entry['UnladenMass'],
@@ -2151,7 +2151,7 @@ def game_running(self) -> bool:
             try:
                 with p.oneshot():
                     if p.status() not in [psutil.STATUS_RUNNING, psutil.STATUS_SLEEPING]:
-                        raise psutil.NoSuchProcess
+                        raise psutil.NoSuchProcess(p.pid)
             except psutil.NoSuchProcess:
                 # Process likely expired
                 self.running_process = None