refactor(modules): improve exception handling and simplify service usage
Enhancements - Replace bare `except:` with `except Exception:` in multiple modules- Cast step calculation to `int` for consistent type - Simplify `get_battery_icon_file` to return a string directly - Use `get_todo_service()` instead of module-level `todo_service` throughout todo widget - Remove unused `"zen": "zen-browser"` mapping entry Bug Fixes - Prevent bare exception swallowing by catching `Exception` explicitly - Ensure proper cleanup of timer IDs and other resources - Delete unused modules/osdd components New Features - None
This commit is contained in:
34 files changed
+682
-519
No files matched your search
@@ -0,0 +1,145 @@
|
||||
from abc import abstractmethod
|
||||
from fabric.utils import Gdk, GLib, invoke_repeater, remove_handler, time
|
||||
from fabric.widgets.box import Box
|
||||
from fabric.widgets.wayland import WaylandWindow as Window
|
||||
|
||||
|
||||
class BaseOSDContainer(Box):
|
||||
MAX_VISIBLE_TIME = 6.0
|
||||
COOLDOWN_MS = 200
|
||||
|
||||
def __init__(self, window: Window, **kwargs):
|
||||
super().__init__(**kwargs, orientation="v", spacing=12, name="osd-container")
|
||||
self.last_handler: int = 0
|
||||
self.window = window
|
||||
self.osd = None
|
||||
self.show_timestamp: float = 0.0
|
||||
self.watchdog_handler: int = 0
|
||||
self._update_in_progress = False
|
||||
self._is_hovered = False
|
||||
self._last_trigger_time: float = 0.0
|
||||
|
||||
GLib.idle_add(self._setup_window_signals)
|
||||
|
||||
def _setup_window_signals(self):
|
||||
self.window.add_events(
|
||||
Gdk.EventMask.ENTER_NOTIFY_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK
|
||||
)
|
||||
self.window.connect("enter-notify-event", self._on_enter_notify)
|
||||
self.window.connect("leave-notify-event", self._on_leave_notify)
|
||||
return False
|
||||
|
||||
def _on_enter_notify(self, widget, event):
|
||||
if event.detail != Gdk.NotifyType.INFERIOR:
|
||||
self._is_hovered = True
|
||||
|
||||
def _on_leave_notify(self, widget, event):
|
||||
if event.detail != Gdk.NotifyType.INFERIOR:
|
||||
self._is_hovered = False
|
||||
|
||||
def is_hovered(self):
|
||||
return self._is_hovered
|
||||
|
||||
def remove_last_handler(self):
|
||||
if self.last_handler:
|
||||
try:
|
||||
remove_handler(self.last_handler)
|
||||
except Exception:
|
||||
pass
|
||||
self.last_handler = 0
|
||||
|
||||
def remove_watchdog_handler(self):
|
||||
if self.watchdog_handler:
|
||||
try:
|
||||
GLib.source_remove(self.watchdog_handler)
|
||||
except Exception:
|
||||
pass
|
||||
self.watchdog_handler = 0
|
||||
|
||||
def cleanup_all_handlers(self):
|
||||
self.remove_last_handler()
|
||||
self.remove_watchdog_handler()
|
||||
self.show_timestamp = 0.0
|
||||
self._update_in_progress = False
|
||||
|
||||
def hide_window(self):
|
||||
if self.osd and hasattr(self.osd, "revealer"):
|
||||
self.osd.revealer.set_reveal_child(False)
|
||||
GLib.timeout_add(150, lambda: self.window.hide() or False)
|
||||
else:
|
||||
self.window.hide()
|
||||
|
||||
def watchdog_force_hide(self, *_):
|
||||
if not self.window.get_visible():
|
||||
self.cleanup_all_handlers()
|
||||
return False
|
||||
|
||||
elapsed = time.time() - self.show_timestamp
|
||||
if elapsed >= self.MAX_VISIBLE_TIME:
|
||||
if not self.is_hovered():
|
||||
self.hide_window()
|
||||
self.cleanup_all_handlers()
|
||||
return False
|
||||
else:
|
||||
return True
|
||||
return True
|
||||
|
||||
def update(self, *_):
|
||||
if self._update_in_progress:
|
||||
return
|
||||
|
||||
current_time = time.time()
|
||||
time_since_last_trigger = (current_time - self._last_trigger_time) * 1000
|
||||
|
||||
if time_since_last_trigger < self.COOLDOWN_MS:
|
||||
return
|
||||
|
||||
self._last_trigger_time = current_time
|
||||
self._update_in_progress = True
|
||||
|
||||
self.cleanup_all_handlers()
|
||||
self.show_timestamp = time.time()
|
||||
|
||||
if self.osd:
|
||||
self.osd.show_container(self)
|
||||
|
||||
self.window.show()
|
||||
|
||||
self.focus()
|
||||
self.last_handler = invoke_repeater(1700, self.unfocus, initial_call=False)
|
||||
self.watchdog_handler = GLib.timeout_add(1000, self.watchdog_force_hide)
|
||||
self._update_in_progress = False
|
||||
|
||||
def focus(self, *_):
|
||||
self.add_style_class("focused")
|
||||
return False
|
||||
|
||||
def unfocus(self, *_):
|
||||
if not self.window.get_visible():
|
||||
self.cleanup_all_handlers()
|
||||
return False
|
||||
|
||||
self.remove_style_class("focused")
|
||||
self.remove_last_handler()
|
||||
self.last_handler = invoke_repeater(1700, self.unpop, initial_call=False)
|
||||
return False
|
||||
|
||||
def unpop(self, *_):
|
||||
if not self.window.get_visible():
|
||||
self.cleanup_all_handlers()
|
||||
return False
|
||||
|
||||
if not self.is_hovered():
|
||||
self.hide_window()
|
||||
self.cleanup_all_handlers()
|
||||
else:
|
||||
self.last_handler = invoke_repeater(500, self.unpop, initial_call=False)
|
||||
return False
|
||||
|
||||
@abstractmethod
|
||||
def _setup_specific_components(self):
|
||||
pass
|
||||
|
||||
@abstractmethod
|
||||
def _connect_specific_signals(self):
|
||||
pass
|
||||
Reference in new issue
Block a user