diff --git a/EDMCSystemProfiler.py b/EDMCSystemProfiler.py index 92502cc8..873282b8 100644 --- 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 index abf08660..1f68dd77 100644 --- a/edmc_data.py +++ b/edmc_data.py @@ -213,7 +213,9 @@ outfitting_weaponrating_map = { '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 index 53832a61..e9fd7428 100644 --- a/monitor.py +++ b/monitor.py @@ -710,8 +710,8 @@ class EDLogs(FileSystemEventHandler): '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 @@ class EDLogs(FileSystemEventHandler): 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