gaming/lutris
gaming/lutris
1
0
Fork 0
mirror of https://github.com/lutris/lutris synced 2024-09-05 23:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove on_watched_error in favor of more specific, callback-type specific methods.

Browse source 
Still too implicit, but it's just installerwindow.py.
This commit is contained in:
Daniel Johnson 2023-12-16 04:52:57 -05:00 committed by Mathieu Comandon
parent aae0444566
commit b50a4bcb97
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lutris/exceptions.py
View file

@ -104,15 +104,16 @@ def watch_game_errors(game_stop_result, game=None):
return inner_decorator
def _handle_callback_error(error_objects, error):
def _handle_callback_error(error_objects, error, error_method_name):
first_toplevel = None
for error_object in error_objects:
if not error_object:
continue
if error_object and hasattr(error_object, "on_watched_error"):
error_object.on_watched_error(error)
if error_object and hasattr(error_object, error_method_name):
error_method = getattr(error_object, error_method_name)
error_method(error)
return
if error_object and hasattr(error_object, "get_toplevel"):
@ -120,10 +121,6 @@ def _handle_callback_error(error_objects, error):
else:
toplevel = None
if toplevel and hasattr(toplevel, "on_watched_error"):
toplevel.on_watched_error(error)
return
if not first_toplevel:
first_toplevel = toplevel
@ -133,7 +130,6 @@ def _handle_callback_error(error_objects, error):
first_toplevel = application.window
ErrorDialog(error, parent=first_toplevel)
return
def _error_handling_connect(self: Gtk.Widget, signal_spec: str, handler, *args, **kwargs):
@ -144,7 +140,7 @@ def _error_handling_connect(self: Gtk.Widget, signal_spec: str, handler, *args,
logger.exception("Error handling signal '%s': %s", signal_spec, ex)
error_objects = [handler.__self__, self] if hasattr(handler, "__self__") else [self]
_handle_callback_error(error_objects, ex)
_handle_callback_error(error_objects, ex, "on_signal_error")
return None
return _original_connect(self, signal_spec, wrapper, *args, **kwargs)
@ -157,7 +153,7 @@ def _error_handling_add_emission_hook(emitting_type, signal_spec, handler, *args
except Exception as ex:
logger.exception("Error handling emission hook '%s.%s': %s", emitting_type, signal_spec, ex)
error_objects = [handler.__self__] if hasattr(handler, "__self__") else []
_handle_callback_error(error_objects, ex)
_handle_callback_error(error_objects, ex, "on_emission_hook_error")
return True
return _original_add_emission_hook(emitting_type, signal_spec, wrapper, *args, **kwargs)
@ -170,7 +166,7 @@ def _error_handling_idle_add(handler, *args, **kwargs):
except Exception as ex:
logger.exception("Error handling idle function: %s", ex)
error_objects = [handler.__self__] if hasattr(handler, "__self__") else []
_handle_callback_error(error_objects, ex)
_handle_callback_error(error_objects, ex, "on_idle_error")
return False
return _original_idle_add(wrapper, *args, **kwargs)
@ -183,7 +179,7 @@ def _error_handling_timeout_add(interval, handler, *args, **kwargs):
except Exception as ex:
logger.exception("Error handling timeout function: %s", ex)
error_objects = [handler.__self__] if hasattr(handler, "__self__") else []
_handle_callback_error(error_objects, ex)
_handle_callback_error(error_objects, ex, "on_timeout_error")
return False
return _original_timeout_add(interval, wrapper, *args, **kwargs)

6
lutris/gui/installerwindow.py
View file

@ -254,7 +254,11 @@ class InstallerWindow(ModelessDialog,
self
)
def on_watched_error(self, error):
def on_signal_error(self, error):
ErrorDialog(error, parent=self)
self.stack.navigation_reset()
def on_idle_error(self, error):
ErrorDialog(error, parent=self)
self.stack.navigation_reset()