Merge pull request slgobinath#749 from deltragon/thread-fixes

threading fixes

Author: deltragon

safeeyes/context.py

@@ -21,7 +21,7 @@
 import typing
 
 from safeeyes import utility
-from safeeyes.model import State
+from safeeyes.model import BreakType, State
 
 if typing.TYPE_CHECKING:
     from safeeyes.safeeyes import SafeEyes
@@ -60,8 +60,8 @@ def status(self) -> str:
     def quit(self) -> None:
         utility.execute_main_thread(self._application.quit)
 
-    def take_break(self, break_type=None) -> None:
-        self._application.take_break(break_type)
+    def take_break(self, break_type: typing.Optional[BreakType] = None) -> None:
+        utility.execute_main_thread(self._application.take_break, break_type)
 
     def has_breaks(self, break_type=None) -> bool:
         return self._application.safe_eyes_core.has_breaks(break_type)

safeeyes/plugins/trayicon/plugin.py

@@ -26,7 +26,6 @@
 from safeeyes import utility
 from safeeyes.context import Context
 from safeeyes.translations import translate as _
-import threading
 import typing
 
 """
@@ -440,6 +439,8 @@ class TrayIcon:
     _animation_timeout_id: typing.Optional[int] = None
     _animation_icon_enabled: bool = False
 
+    _resume_timeout_id: typing.Optional[int] = None
+
     def __init__(self, context: Context, plugin_config):
         self.context = context
         self.on_show_settings = context.api.show_settings
@@ -454,8 +455,6 @@ def __init__(self, context: Context, plugin_config):
         self.date_time = None
         self.active = True
         self.wakeup_time = None
-        self.idle_condition = threading.Condition()
-        self.lock = threading.Lock()
         self.allow_disabling = plugin_config["allow_disabling"]
         self.menu_locked = False
 
@@ -663,12 +662,9 @@ def quit_safe_eyes(self):
 
         This action terminates the application.
         """
-        with self.lock:
-            self.active = True
-            # Notify all schedulers
-            self.idle_condition.acquire()
-            self.idle_condition.notify_all()
-            self.idle_condition.release()
+        self.active = True
+        self.__clear_resume_timer()
+
         self.quit()
 
     def show_settings(self) -> None:
@@ -720,13 +716,9 @@ def on_enable_clicked(self):
         This action enables the application if it is currently disabled.
         """
         if not self.active:
-            with self.lock:
-                self.enable_ui()
-                self.enable_safeeyes()
-                # Notify all schedulers
-                self.idle_condition.acquire()
-                self.idle_condition.notify_all()
-                self.idle_condition.release()
+            self.enable_ui()
+            self.enable_safeeyes()
+            self.__clear_resume_timer()
 
     def on_disable_clicked(self, time_to_wait):
         """Handle the menu actions of all the sub menus of 'Disable Safe Eyes'.
@@ -746,7 +738,9 @@ def on_disable_clicked(self, time_to_wait):
                 )
                 info = _("Disabled until %s") % utility.format_time(self.wakeup_time)
                 self.disable_safeeyes(info)
-                utility.start_thread(self.__schedule_resume, time_minutes=time_to_wait)
+                self._resume_timeout_id = GLib.timeout_add_seconds(
+                    time_to_wait * 60, self.__resume
+                )
             self.update_menu()
 
     def lock_menu(self):
@@ -783,17 +777,19 @@ def enable_ui(self):
             self.sni_service.set_icon("io.github.slgobinath.SafeEyes-enabled")
             self.update_menu()
 
-    def __schedule_resume(self, time_minutes):
-        """Schedule a local timer to enable Safe Eyes after the given
-        timeout.
-        """
-        self.idle_condition.acquire()
-        self.idle_condition.wait(time_minutes * 60)  # Convert to seconds
-        self.idle_condition.release()
+    def __resume(self):
+        """Reenable Safe Eyes after the given timeout."""
+        if not self.active:
+            self.on_enable_clicked()
+
+        self._resume_timeout_id = None
+
+        return GLib.SOURCE_REMOVE
 
-        with self.lock:
-            if not self.active:
-                utility.execute_main_thread(self.on_enable_clicked)
+    def __clear_resume_timer(self):
+        if self._resume_timeout_id is not None:
+            GLib.source_remove(self._resume_timeout_id)
+            self._resume_timeout_id = None
 
     def start_animation(self) -> None:
         if self._animation_timeout_id is not None:

safeeyes/safeeyes.py

@@ -30,7 +30,7 @@
 from safeeyes.ui.about_dialog import AboutDialog
 from safeeyes.ui.break_screen import BreakScreen
 from safeeyes.ui.required_plugin_dialog import RequiredPluginDialog
-from safeeyes.model import State, RequiredPluginException
+from safeeyes.model import BreakType, State, RequiredPluginException
 from safeeyes.translations import translate as _
 from safeeyes.plugin_manager import PluginManager
 from safeeyes.core import SafeEyesCore
@@ -536,9 +536,9 @@ def stop_break(self):
         self.plugins_manager.stop_break()
         return True
 
-    def take_break(self, break_type=None):
+    def take_break(self, break_type: typing.Optional[BreakType] = None) -> None:
         """Take a break now."""
-        utility.execute_main_thread(self.safe_eyes_core.take_break, break_type)
+        self.safe_eyes_core.take_break(break_type)
 
     def status(self):
         """Return the status of Safe Eyes."""

safeeyes/ui/break_screen.py

@@ -33,7 +33,6 @@
 
 gi.require_version("Gtk", "4.0")
 from gi.repository import Gdk
-from gi.repository import GLib
 from gi.repository import Gtk
 from gi.repository import GdkX11
 
@@ -121,7 +120,7 @@ def show_count_down(self, countdown: int, seconds: int) -> None:
         self.enable_shortcut = self.shortcut_disable_time <= seconds
         mins, secs = divmod(countdown, 60)
         timeformat = "{:02d}:{:02d}".format(mins, secs)
-        GLib.idle_add(lambda: self.__update_count_down(timeformat))
+        self.__update_count_down(timeformat)
 
     def show_message(
         self, break_obj: Break, widget: str, tray_actions: list[TrayAction] = []
@@ -130,9 +129,7 @@ def show_message(
         message = break_obj.name
         image_path = break_obj.image
         self.enable_shortcut = self.shortcut_disable_time <= 0
-        GLib.idle_add(
-            lambda: self.__show_break_screen(message, image_path, widget, tray_actions)
-        )
+        self.__show_break_screen(message, image_path, widget, tray_actions)
 
     def close(self) -> None:
         """Hide the break screen from active window and destroy all other
@@ -143,7 +140,7 @@ def close(self) -> None:
             self.__release_keyboard_x11()
 
         # Destroy other windows if exists
-        GLib.idle_add(lambda: self.__destroy_all_screens())
+        self.__destroy_all_screens()
 
     def __show_break_screen(
         self,
@@ -298,18 +295,21 @@ def __lock_keyboard_x11(self) -> None:
                         event.detail == self.keycode_shortcut_skip
                         and self.show_skip_button
                     ):
-                        self.skip_break()
+                        utility.execute_main_thread(lambda: self.skip_break())
                         break
                     elif (
                         event.detail == self.keycode_shortcut_postpone
                         and self.show_postpone_button
                     ):
-                        self.postpone_break()
+                        utility.execute_main_thread(lambda: self.postpone_break())
                         break
             else:
                 # Reduce the CPU usage by sleeping for a second
                 time.sleep(1)
 
+        self.x11_display.ungrab_keyboard(X.CurrentTime)
+        self.x11_display.flush()
+
     def on_key_pressed_wayland(
         self, event_controller_key, keyval, keycode, state
     ) -> bool:
@@ -325,13 +325,8 @@ def on_key_pressed_wayland(
 
     def __release_keyboard_x11(self) -> None:
         """Release the locked keyboard."""
-        if self.x11_display is None:
-            return
-
         logging.info("Unlock the keyboard")
         self.lock_keyboard = False
-        self.x11_display.ungrab_keyboard(X.CurrentTime)
-        self.x11_display.flush()
 
     def __destroy_all_screens(self) -> None:
         """Close all the break screens."""