CreatBot/CreatBotKlipperScreen
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screen: raise more specific errors if panels cannot load

Browse Source
This commit is contained in:
alfrix 2022-11-17 08:45:22 -03:00
parent 45ab86204b
commit bd82d211f5
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
screen.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
import argparse import argparse
import gi import gi
import json import json
@ -281,23 +282,18 @@ class KlipperScreen(Gtk.Window):
panel_path = os.path.join(os.path.dirname(__file__), 'panels', f"{panel}.py") panel_path = os.path.join(os.path.dirname(__file__), 'panels', f"{panel}.py")
logging.info(f"Panel path: {panel_path}") logging.info(f"Panel path: {panel_path}")
if not os.path.exists(panel_path): if not os.path.exists(panel_path):
msg = f"Panel {panel} does not exist" logging.error(f"Panel {panel} does not exist")
logging.info(msg) raise FileNotFoundError(os.strerror(2), "\n" + panel_path)
raise Exception(msg)
module = importlib.import_module(f"panels.{panel}") module = importlib.import_module(f"panels.{panel}")
if not hasattr(module, "create_panel"): if not hasattr(module, "create_panel"):
msg = f"Cannot locate create_panel function for {panel}" raise ImportError(f"Cannot locate create_panel function for {panel}")
logging.info(msg)
raise Exception(msg)
self.load_panel[panel] = getattr(module, "create_panel") self.load_panel[panel] = getattr(module, "create_panel")
try: try:
return self.load_panel[panel](*args) return self.load_panel[panel](*args)
except Exception as e: except Exception as e:
msg = f"Unable to create panel {panel}\n{e}" raise RuntimeError(f"Unable to create panel: {panel}\n{e}") from e
logging.exception(msg)
raise Exception(msg) from e
def show_panel(self, panel_name, panel_type, title, remove=None, pop=True, **kwargs): def show_panel(self, panel_name, panel_type, title, remove=None, pop=True, **kwargs):
try: try:
@ -387,7 +383,7 @@ class KlipperScreen(Gtk.Window):
self.popup_message = None self.popup_message = None
def show_error_modal(self, err, e=""): def show_error_modal(self, err, e=""):
logging.exception(f"Showing error modal: {err}") logging.error(f"Showing error modal: {err}")
title = Gtk.Label() title = Gtk.Label()
title.set_markup(f"<b>{err}</b>\n") title.set_markup(f"<b>{err}</b>\n")
@ -419,9 +415,9 @@ class KlipperScreen(Gtk.Window):
] ]
self.gtk.Dialog(self, buttons, grid, self.error_modal_response) self.gtk.Dialog(self, buttons, grid, self.error_modal_response)
@staticmethod def error_modal_response(self, widget, response_id):
def error_modal_response(widget, response_id):
widget.destroy() widget.destroy()
self.reload_panels()
def restart_warning(self, value): def restart_warning(self, value):