PICARD-2300: Add qtdbus dark theme detect
#2692
Conversation
picard/ui/theme_detect.py
Outdated
| # Try D-Bus first (secure method) | ||
| try: | ||
| detector = get_dbus_detector() | ||
| result = detector.detect_freedesktop_portal_color_scheme() | ||
| if result is not None: | ||
| return result | ||
| except Exception: # noqa: BLE001 | ||
| log.debug("Unable to detect `freedesktop` color scheme with dbus.") |
There was a problem hiding this comment.
This largely duplicates the code from Lines 60-67. If there was a third test using similar code, I would suggest some refactoring, but it's likely not worth it in this case.
There was a problem hiding this comment.
Refactored for DRY and removed blind exception catch: e6c287e
| @@ -201,6 +242,10 @@ def detect_lxqt_dark_wrapper() -> bool: | |||
| def get_linux_dark_mode_strategies() -> list: | |||
| """Return the list of dark mode detection strategies in order of priority.""" | |||
| return [ | |||
| # Pure D-Bus methods (will gracefully fail if D-Bus unavailable) | |||
| detect_freedesktop_color_scheme_dbus, | |||
| detect_gnome_color_scheme_dbus, | |||
There was a problem hiding this comment.
One thing we could optimize is that we don't need to initialize DBusThemeDetector twice. It handles both interfaces already.
So either we add a single dbus strategy, that checks both the freedesktop and gnome interfaces, or we initialize DBusThemeDetector first and have the detect methods accept it as a parameter (and use partial to apply it here).
There was a problem hiding this comment.
So actually, this pattern already uses a singleton. DBusThemeDetector is only ever instantiated once.
picard\ui\theme_detect_qtdbus.py:160-169
# Global D-Bus detector instance
_dbus_detector = None
def get_dbus_detector() -> DBusThemeDetector:
"""Get or create the global D-Bus theme detector instance."""
global _dbus_detector
if _dbus_detector is None:
_dbus_detector = DBusThemeDetector()
return _dbus_detector
Summary
Problem
Existing linux dark theme detection uses
gsettings, calling insecure subprocesses and reading files/services that may not exist. Added support forqtdbus, which should be more secure, with fallback to legacy strategies.Note: Couldn't implement
dbus-python, as that requires system tools to be installed.Solution
Dark Theme Detection Implementation:
DBusThemeDetectorclass that communicates with freedesktop portal and GNOME dconf servicesComprehensive Test Coverage:
test_theme_detect_qtdbus.pywith 734 lines of test coverageTechnical Features:
Action
Additional actions required: