remotedesktop 1.9.2__tar.gz → 1.9.3__tar.gz

{remotedesktop-1.9.2 → remotedesktop-1.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remotedesktop
-Version: 1.9.2
+Version: 1.9.3
 Summary: Remote desktop app for Windows computers on the same LAN, with autodiscovery. View other computers and optionally share this one — screen, keyboard, mouse, and clipboard, without RDP or Microsoft authentication.
 Project-URL: Homepage, https://github.com/jamesabel/remotedesktop
 Project-URL: Repository, https://github.com/jamesabel/remotedesktop

{remotedesktop-1.9.2 → remotedesktop-1.9.3}/src/remotedesktop/__init__.py

@@ -1,3 +1,3 @@
 """Remote desktop client/server for Windows computers on the same LAN."""
 
-__version__ = "1.9.2"
+__version__ = "1.9.3"

{remotedesktop-1.9.2 → remotedesktop-1.9.3}/src/remotedesktop/logs.py

@@ -16,7 +16,7 @@ import logging.handlers
 from pathlib import Path
 
 import platformdirs
-from PySide6.QtCore import Qt
+from PySide6.QtCore import QMessageLogContext, Qt, QtMsgType, qInstallMessageHandler
 from PySide6.QtWidgets import QDialog, QPlainTextEdit, QVBoxLayout, QWidget
 
 # Cap on what a peer gets when it asks for our log: the most recent entries
@@ -70,12 +70,39 @@ class PeerLogDialog(QDialog):
         layout.addWidget(view)
 
 
+_QT_LEVELS = {
+    QtMsgType.QtDebugMsg: logging.DEBUG,
+    QtMsgType.QtInfoMsg: logging.INFO,
+    QtMsgType.QtWarningMsg: logging.WARNING,
+    QtMsgType.QtCriticalMsg: logging.ERROR,
+    QtMsgType.QtFatalMsg: logging.CRITICAL,
+}
+
+
+def _qt_message_handler(
+    mode: QtMsgType, context: QMessageLogContext, message: str
+) -> None:
+    # Category ("qt.qpa.mime", ...) is how Qt names the subsystem; file/line
+    # are only populated in debug builds of Qt, so they aren't included.
+    category = context.category
+    if category and category != "default":
+        message = f"{category}: {message}"
+    logging.getLogger("remotedesktop.qt").log(
+        _QT_LEVELS.get(mode, logging.WARNING), message
+    )
+
+
 def init_logging(app_name: str, *, directory: Path | None = None) -> Path:
     """Write "remotedesktop" logger output to <log dir>/<app_name>.log.
 
+    Also routes Qt's own log output (e.g. "qt.qpa.mime: Retrying to obtain
+    clipboard.") into the same file: Qt's default message handler writes to
+    stderr, which a GUI app must never do.
+
     Returns the log file path. `directory` exists for tests; the apps use
     the platformdirs log dir.
     """
+    qInstallMessageHandler(_qt_message_handler)
     log_dir = directory if directory is not None else default_log_dir()
     log_dir.mkdir(parents=True, exist_ok=True)
     path = log_path(app_name, directory=directory)

{remotedesktop-1.9.2 → remotedesktop-1.9.3}/tests/test_logs.py

@@ -1,5 +1,7 @@
 import logging
 
+from PySide6.QtCore import qInstallMessageHandler, qWarning
+
 from remotedesktop import logs
 
 
@@ -23,6 +25,26 @@ def test_init_logging_writes_formatted_records(tmp_path):
             handler.close()
 
 
+def test_init_logging_routes_qt_messages_to_the_log_file(tmp_path):
+    # Qt's default message handler writes to stderr — a GUI app must never
+    # do that, so init_logging redirects Qt's output into the log file.
+    path = logs.init_logging("client", directory=tmp_path)
+    root = logging.getLogger("remotedesktop")
+    try:
+        qWarning("qt grumbled about something")
+        for handler in root.handlers:
+            handler.flush()
+        text = path.read_text(encoding="utf-8")
+        assert "qt grumbled about something" in text
+        assert "WARNING" in text
+        assert "remotedesktop.qt" in text
+    finally:
+        qInstallMessageHandler(None)  # back to Qt's default handler
+        for handler in list(root.handlers):
+            root.removeHandler(handler)
+            handler.close()
+
+
 def test_read_log_tail_returns_recent_content(tmp_path):
     (tmp_path / "server.log").write_text("early line\nrecent line\n", encoding="utf-8")
     text = logs.read_log_tail("server", directory=tmp_path)