Now app shows some inner-thread exceptions while in developer mode

Author: MaxBQb

active_window_checker.py

@@ -24,6 +24,7 @@
 from app_close import AppCloseManager
 from commented_config import CommentsHolder
 from inversion_rules import InversionRulesController
+from utils import show_exceptions
 
 user32 = ctypes.windll.user32
 ole32 = ctypes.windll.ole32
@@ -174,6 +175,7 @@ def titles(iterable):
         yield win32gui.GetWindowText(hwnd)
 
 
+@show_exceptions()
 @inject.autoparams()
 def listen_switch_events(callback, close_manager: AppCloseManager):
     ole32.CoInitialize(0)

main_thread_loop.py

@@ -2,8 +2,11 @@
 from dataclasses import dataclass, field
 from queue import PriorityQueue
 from typing import Callable
+
 import inject
 
+from utils import show_exceptions
+
 
 @dataclass(order=True)
 class Callback:
@@ -25,8 +28,9 @@ async def run_loop(self):
             raise RuntimeError()
 
         while self._alive:
-            callback = self.callbacks.get()
-            callback.func()
+            with show_exceptions():
+                callback = self.callbacks.get()
+                callback.func()
 
     def send_callback(self, callback: Callback):
         self.callbacks.put_nowait(callback)

tray/tray.py

@@ -1,21 +1,23 @@
 from asyncio import to_thread
-from traceback import print_exc
+from contextlib import closing
+
 import inject
-import win32gui
-from win32con import SW_HIDE, SW_SHOW
 import win32console
+import win32gui
 from PIL import Image
 from pystray import Menu, MenuItem, Icon
+from win32con import SW_HIDE, SW_SHOW
+
 import _meta as app
 from active_window_checker import AppMode
-from tray.utils import ref, make_toggle, make_radiobutton
-from uac import has_admin_rights
 from app_close import AppCloseManager
 from auto_update import AutoUpdater
 from interaction import InteractionManager
 from inversion_rules import InversionRulesController
-from settings import UserSettingsController, UserSettings, OPTION_PATH, OPTION_CHANGE_HANDLER, T
-from utils import explore, app_abs_path
+from settings import UserSettingsController, OPTION_PATH, OPTION_CHANGE_HANDLER, T
+from tray.utils import ref, make_toggle, make_radiobutton
+from uac import has_admin_rights
+from utils import explore, app_abs_path, show_exceptions
 
 
 class Tray:
@@ -39,23 +41,18 @@ def setup(self):
         ))
         win32gui.ShowWindow(self.console_hwnd, SW_HIDE)
 
+    @show_exceptions()
     def run(self):
-        try:
-            self.tray = Icon(
-                app.__product_name__,
-                Image.open(app_abs_path(app.__icon__)),
-                menu=self.build_menu()
-            )
-            self.tray.run()
-        except:
-            print_exc()
-            raise
+        self.tray = Icon(
+            app.__product_name__,
+            Image.open(app_abs_path(app.__icon__)),
+            menu=self.build_menu()
+        )
+        self.tray.run()
 
     async def run_async(self):
-        try:
+        with closing(self):
             await to_thread(self.run)
-        finally:
-            self.close()
 
     def close(self):
         if self.tray:

utils.py

@@ -1,8 +1,11 @@
+import contextlib
 import os
-from _meta import APP_DIR
 import re
 import subprocess
+import threading
+from traceback import print_exc
 
+from _meta import APP_DIR, __developer_mode__
 
 FILEBROWSER_PATH = os.path.join(os.getenv('WINDIR'), 'explorer.exe')
 
@@ -149,3 +152,14 @@ def public_fields(object):
 
 def app_abs_path(path: str):
     return os.path.join(APP_DIR, os.path.normpath(path))
+
+
+@contextlib.contextmanager
+def show_exceptions():
+    try:
+        yield
+    except:
+        if __developer_mode__:
+            print("in Tread:", threading.current_thread().name)
+            print_exc()
+        raise