gaming/lutris
gaming/lutris
1
0
Fork 0
mirror of https://github.com/lutris/lutris synced 2024-10-14 19:53:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move swizzling code to explicit init function

Browse source 
This way we control when it happens, instead of relying on Python module import.
This commit is contained in:
Daniel Johnson 2023-12-16 06:09:24 -05:00 committed by Mathieu Comandon
parent 0dad8fbf19
commit e6ac83ea5c
2 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
lutris/exceptions.py
View file

@ -155,44 +155,40 @@ def _create_error_wrapper(handler: Callable, handler_name: str,
return error_wrapper
def _error_handling_connect(self: Gtk.Widget, signal_spec: str, handler, *args, **kwargs):
error_wrapper = _create_error_wrapper(handler, f"signal '{signal_spec}'",
error_result=None,
error_method_name="on_signal_error",
error_objects=[self])
return _original_connect(self, signal_spec, error_wrapper, *args, **kwargs)
def init_exception_backstops():
def _error_handling_connect(self: Gtk.Widget, signal_spec: str, handler, *args, **kwargs):
error_wrapper = _create_error_wrapper(handler, f"signal '{signal_spec}'",
error_result=None,
error_method_name="on_signal_error",
error_objects=[self])
return _original_connect(self, signal_spec, error_wrapper, *args, **kwargs)
def _error_handling_add_emission_hook(emitting_type, signal_spec, handler, *args, **kwargs):
error_wrapper = _create_error_wrapper(handler, f"emission hook '{emitting_type}.{signal_spec}'",
error_result=True, # stay attached
error_method_name="on_emission_hook_error")
return _original_add_emission_hook(emitting_type, signal_spec, error_wrapper, *args, **kwargs)
def _error_handling_add_emission_hook(emitting_type, signal_spec, handler, *args, **kwargs):
error_wrapper = _create_error_wrapper(handler, f"emission hook '{emitting_type}.{signal_spec}'",
error_result=True, # stay attached
error_method_name="on_emission_hook_error")
return _original_add_emission_hook(emitting_type, signal_spec, error_wrapper, *args, **kwargs)
def _error_handling_idle_add(handler, *args, **kwargs):
error_wrapper = _create_error_wrapper(handler, "idle function",
error_result=False, # stop calling idle func
error_method_name="on_idle_error")
return _original_idle_add(error_wrapper, *args, **kwargs)
def _error_handling_timeout_add(interval, handler, *args, **kwargs):
error_wrapper = _create_error_wrapper(handler, "timeout function",
error_result=False, # stop calling timeout fund
error_method_name="on_timeout_error")
return _original_timeout_add(interval, error_wrapper, *args, **kwargs)
def _error_handling_idle_add(handler, *args, **kwargs):
error_wrapper = _create_error_wrapper(handler, "idle function",
error_result=False, # stop calling idle func
error_method_name="on_idle_error")
return _original_idle_add(error_wrapper, *args, **kwargs)
_original_connect = Gtk.Widget.connect
GObject.Object.connect = _error_handling_connect
_original_add_emission_hook = GObject.add_emission_hook
GObject.add_emission_hook = _error_handling_add_emission_hook
def _error_handling_timeout_add(interval, handler, *args, **kwargs):
error_wrapper = _create_error_wrapper(handler, "timeout function",
error_result=False, # stop calling timeout fund
error_method_name="on_timeout_error")
return _original_timeout_add(interval, error_wrapper, *args, **kwargs)
_original_idle_add = GLib.idle_add
GLib.idle_add = _error_handling_idle_add
# TODO: explicit init call is probably safer
_original_connect = Gtk.Widget.connect
GObject.Object.connect = _error_handling_connect
_original_add_emission_hook = GObject.add_emission_hook
GObject.add_emission_hook = _error_handling_add_emission_hook
_original_idle_add = GLib.idle_add
GLib.idle_add = _error_handling_idle_add
_original_timeout_add = GLib.timeout_add
GLib.timeout_add = _error_handling_timeout_add
_original_timeout_add = GLib.timeout_add
GLib.timeout_add = _error_handling_timeout_add

5
lutris/gui/application.py
View file

@ -58,6 +58,7 @@ from lutris.util.savesync import show_save_stats, upload_save, save_check
from lutris.services import get_enabled_services
from lutris.database.services import ServiceGameCollection
from lutris.util.jobs import AsyncCall
from lutris.exceptions import init_exception_backstops
from .lutriswindow import LutrisWindow
@ -73,6 +74,10 @@ class Application(Gtk.Application):
register_session=True,
)
# Prepare the backstop logic just before the first emission hook (or connection) is
# established; this will apply to all connections from this point forward.
init_exception_backstops()
GObject.add_emission_hook(Game, "game-launch", self.on_game_launch)
GObject.add_emission_hook(Game, "game-start", self.on_game_start)
GObject.add_emission_hook(Game, "game-stop", self.on_game_stop)