mirror of
https://github.com/EDCD/EDMarketConnector.git
synced 2025-04-12 15:27:14 +03:00
[2320] Update Hull Get
This commit is contained in:
parent
4bfb5b4829
commit
6abdaf1537
@ -149,7 +149,7 @@ def main() -> None:
|
|||||||
# Buttons
|
# Buttons
|
||||||
sys_report_btn = ttk.Button(
|
sys_report_btn = ttk.Button(
|
||||||
root,
|
root,
|
||||||
text="Copy System Report",
|
text="Copy System Report \U0001F5D0",
|
||||||
command=lambda: copy_sys_report(root, sys_report),
|
command=lambda: copy_sys_report(root, sys_report),
|
||||||
)
|
)
|
||||||
sys_report_btn.grid(row=3, column=0, padx=20, pady=10, sticky="w")
|
sys_report_btn.grid(row=3, column=0, padx=20, pady=10, sticky="w")
|
||||||
|
@ -213,7 +213,9 @@ outfitting_weaponrating_map = {
|
|||||||
'hpt_mininglaser_turret_small': 'D',
|
'hpt_mininglaser_turret_small': 'D',
|
||||||
'hpt_mininglaser_turret_medium': 'D',
|
'hpt_mininglaser_turret_medium': 'D',
|
||||||
'hpt_multicannon_fixed_small': 'F',
|
'hpt_multicannon_fixed_small': 'F',
|
||||||
|
'hpt_multicannon_fixed_small_advanced': 'F',
|
||||||
'hpt_multicannon_fixed_medium': 'E',
|
'hpt_multicannon_fixed_medium': 'E',
|
||||||
|
'hpt_multicannon_fixed_medium_advanced': 'E',
|
||||||
'hpt_multicannon_fixed_large': 'C',
|
'hpt_multicannon_fixed_large': 'C',
|
||||||
'hpt_multicannon_fixed_huge': 'A',
|
'hpt_multicannon_fixed_huge': 'A',
|
||||||
'hpt_multicannon_gimbal_small': 'G',
|
'hpt_multicannon_gimbal_small': 'G',
|
||||||
|
@ -710,8 +710,8 @@ class EDLogs(FileSystemEventHandler):
|
|||||||
'Ship': entry["Ship"],
|
'Ship': entry["Ship"],
|
||||||
'ShipName': entry['ShipName'],
|
'ShipName': entry['ShipName'],
|
||||||
'ShipIdent': entry['ShipIdent'],
|
'ShipIdent': entry['ShipIdent'],
|
||||||
'HullValue': entry['HullValue'],
|
'HullValue': entry.get('HullValue'),
|
||||||
'ModulesValue': entry['ModulesValue'],
|
'ModulesValue': entry.get('ModulesValue'),
|
||||||
'Rebuy': entry['Rebuy'],
|
'Rebuy': entry['Rebuy'],
|
||||||
'MaxJumpRange': entry['MaxJumpRange'],
|
'MaxJumpRange': entry['MaxJumpRange'],
|
||||||
'UnladenMass': entry['UnladenMass'],
|
'UnladenMass': entry['UnladenMass'],
|
||||||
@ -2151,7 +2151,7 @@ class EDLogs(FileSystemEventHandler):
|
|||||||
try:
|
try:
|
||||||
with p.oneshot():
|
with p.oneshot():
|
||||||
if p.status() not in [psutil.STATUS_RUNNING, psutil.STATUS_SLEEPING]:
|
if p.status() not in [psutil.STATUS_RUNNING, psutil.STATUS_SLEEPING]:
|
||||||
raise psutil.NoSuchProcess
|
raise psutil.NoSuchProcess(p.pid)
|
||||||
except psutil.NoSuchProcess:
|
except psutil.NoSuchProcess:
|
||||||
# Process likely expired
|
# Process likely expired
|
||||||
self.running_process = None
|
self.running_process = None
|
||||||
|
Loading…
x
Reference in New Issue
Block a user