ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 16:27:13 +03:00
Code Issues Projects Releases Wiki Activity

[Minor] Update System Profiler Logging

Browse Source
This commit is contained in:
David Sangrey 2024-05-28 08:53:18 -04:00
parent 5fa8f689ba
commit f53388e211
No known key found for this signature in database
GPG Key ID: 3AEADBB0186884BC
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EDMarketConnector.py
View File

@ -620,7 +620,7 @@ class AppWindow:
self.help_menu.add_command(command=lambda: not self.HelpAbout.showing and self.HelpAbout(self.w)) self.help_menu.add_command(command=lambda: not self.HelpAbout.showing and self.HelpAbout(self.w))
logfile_loc = pathlib.Path(tempfile.gettempdir()) / appname logfile_loc = pathlib.Path(tempfile.gettempdir()) / appname
self.help_menu.add_command(command=lambda: prefs.open_folder(logfile_loc)) # Open Log Folder self.help_menu.add_command(command=lambda: prefs.open_folder(logfile_loc)) # Open Log Folder
self.help_menu.add_command(command=prefs.help_open_system_profiler) # Open Log Folde self.help_menu.add_command(command=lambda: prefs.help_open_system_profiler(self)) # Open Log Folde
self.menubar.add_cascade(menu=self.help_menu) self.menubar.add_cascade(menu=self.help_menu)
if sys.platform == 'win32': if sys.platform == 'win32':

24
prefs.py
View File

@ -57,14 +57,18 @@ def open_folder(file: pathlib.Path) -> None:
system(f'xdg-open "{file}"') system(f'xdg-open "{file}"')
def help_open_system_profiler() -> None: def help_open_system_profiler(parent) -> None:
"""Open the EDMC System Profiler.""" """Open the EDMC System Profiler."""
profiler_path = pathlib.Path(config.respath_path) profiler_path = pathlib.Path(config.respath_path)
if getattr(sys, 'frozen', False): try:
profiler_path /= 'EDMCSystemProfiler.exe' if getattr(sys, 'frozen', False):
subprocess.run(profiler_path) profiler_path /= 'EDMCSystemProfiler.exe'
else: subprocess.run(profiler_path, check=True)
subprocess.run(['python', "EDMCSystemProfiler.py"], shell=True) else:
subprocess.run(['python', "EDMCSystemProfiler.py"], shell=True, check=True)
except Exception as err:
parent.status["text"] = "Unable to Launch System Profiler"
logger.exception(err)
class PrefsVersion: class PrefsVersion:
@ -927,7 +931,7 @@ class PreferencesDialog(tk.Toplevel):
).grid(column=1, padx=self.PADX, pady=self.PADY, sticky=tk.N, row=cur_row) ).grid(column=1, padx=self.PADX, pady=self.PADY, sticky=tk.N, row=cur_row)
enabled_plugins = list(filter(lambda x: x.folder and x.module, plug.PLUGINS)) enabled_plugins = list(filter(lambda x: x.folder and x.module, plug.PLUGINS))
if len(enabled_plugins): if enabled_plugins:
ttk.Separator(plugins_frame, orient=tk.HORIZONTAL).grid( ttk.Separator(plugins_frame, orient=tk.HORIZONTAL).grid(
columnspan=3, padx=self.PADX, pady=self.SEPY, sticky=tk.EW, row=row.get() columnspan=3, padx=self.PADX, pady=self.SEPY, sticky=tk.EW, row=row.get()
) )
@ -949,7 +953,7 @@ class PreferencesDialog(tk.Toplevel):
############################################################ ############################################################
# Show which plugins don't have Python 3.x support # Show which plugins don't have Python 3.x support
############################################################ ############################################################
if len(plug.PLUGINS_not_py3): if plug.PLUGINS_not_py3:
ttk.Separator(plugins_frame, orient=tk.HORIZONTAL).grid( ttk.Separator(plugins_frame, orient=tk.HORIZONTAL).grid(
columnspan=3, padx=self.PADX, pady=self.SEPY, sticky=tk.EW, row=row.get() columnspan=3, padx=self.PADX, pady=self.SEPY, sticky=tk.EW, row=row.get()
) )
@ -975,7 +979,7 @@ class PreferencesDialog(tk.Toplevel):
# Show disabled plugins # Show disabled plugins
############################################################ ############################################################
disabled_plugins = list(filter(lambda x: x.folder and not x.module, plug.PLUGINS)) disabled_plugins = list(filter(lambda x: x.folder and not x.module, plug.PLUGINS))
if len(disabled_plugins): if disabled_plugins:
ttk.Separator(plugins_frame, orient=tk.HORIZONTAL).grid( ttk.Separator(plugins_frame, orient=tk.HORIZONTAL).grid(
columnspan=3, padx=self.PADX, pady=self.SEPY, sticky=tk.EW, row=row.get() columnspan=3, padx=self.PADX, pady=self.SEPY, sticky=tk.EW, row=row.get()
) )
@ -992,7 +996,7 @@ class PreferencesDialog(tk.Toplevel):
############################################################ ############################################################
# Show plugins that failed to load # Show plugins that failed to load
############################################################ ############################################################
if len(plug.PLUGINS_broken): if plug.PLUGINS_broken:
ttk.Separator(plugins_frame, orient=tk.HORIZONTAL).grid( ttk.Separator(plugins_frame, orient=tk.HORIZONTAL).grid(
columnspan=3, padx=self.PADX, pady=self.SEPY, sticky=tk.EW, row=row.get() columnspan=3, padx=self.PADX, pady=self.SEPY, sticky=tk.EW, row=row.get()
) )