contrib/sway.cfg

@@ -1,12 +0,0 @@
-# Prevent window resizing when we open the player apps
-workspace_layout stacking
-
-# Hide the window titlebar
-default_border none
-default_floating_border none
-font pango:monospace 0
-titlebar_padding 1
-titlebar_border_thickness 0
-
-# Start microkodi
-exec bash <repo path>/start-microkodi.sh

microkodi/jsonrpc.py

@@ -145,7 +145,6 @@ class PlayerRpcObject(JsonRpcObject):
         config: Config = I.get("Config")
         scheme_configuration = config.players.get(url.scheme)
         if scheme_configuration is None:
-            I.get("DataBridge").notification.emit(f"No player available for {url.scheme}")
             self.logger.warn("Client requested unknown scheme: '%s'", url.scheme)
             return {
                 "error": "invalid protocol"
@@ -154,7 +153,6 @@ class PlayerRpcObject(JsonRpcObject):
         if player_class_name is None:
             player_class_name = scheme_configuration.get("*")
         if player_class_name is None:
-            I.get("DataBridge").notification.emit(f"No player available for {url.netloc}")
             self.logger.warn("No player was picked for url '%s'", url)
             return {
                 "error": "invalid protocol"
@@ -173,7 +171,6 @@ class PlayerRpcObject(JsonRpcObject):
         program_cls = getattr(sys.modules[module_name], class_name, None) 
 
         if program_cls is None:
-            I.get("DataBridge").notification.emit("Could not start player")
             self.logger.warn("Class %s not found in module %s", class_name, module_name)
             return {
                 "error": "invalid protocol"

microkodi/main.py

@@ -14,6 +14,7 @@ from microkodi.jsonrpc import JsonRpcHandler, GlobalMethodHandler
 from microkodi.ui.bridge import DataBridge
 from microkodi.config import Config, load_config
 from microkodi.repository import I
+from microkodi.udev import is_display_connected, block_until_display_connected
 
 
 def run_kodi_server():
@@ -95,6 +96,21 @@ if __name__ == "__main__":
     if config.watch_connector:
         logger.info("Will be watching display if it's gone")
 
-    exit_code = app.exec()
+    exit_code = 0
+    while True:
+        exit_code = app.exec()
+
+        if not config.watch_connector:
+            break
+
+        # Exit if the display is still connected
+        if is_display_connected(config.card, config.connector):
+            break
+        
+        logger.info("Display is gone. Waiting until it's back")
+        block_until_display_connected(config.card, config.connector)
+        logger.info("Display is back. Waiting 500ms...")
+        time.sleep(0.5)
+
     del engine
     sys.exit(exit_code)

microkodi/programs/mpv.py

@@ -108,11 +108,8 @@ class MpvProgram(Program):
 
     def _when_mpv_exit(self):
         self.logger.info("MPV has exited")
-        I.get("DataBridge").set_loading(False)
-
-        if self._process.returncode != 0:
-            I.get("DataBridge").notification.emit("mpv exited with an error")
         self._process = None
+        I.get("DataBridge").set_loading(False)
 
     def pause(self):
         self.__mpv_command(["set_property", "pause", True])

microkodi/programs/vlc.py

@@ -122,7 +122,6 @@ class VlcProgram(Program):
             "--http-port=9090",
             f"--http-password={self._vlc_password}",
             "--quiet",
-            "--play-and-exit",
             *extra_args,
             final_url,
         ]
@@ -131,13 +130,10 @@ class VlcProgram(Program):
 
     def _when_vlc_exit(self):
         self.logger.info("vlc has exited")
+        self._process = None
         I.get("VlcConfig").run_event_listeners(EVENT_PLAYER_EXIT)
         I.get("DataBridge").set_loading(False)
 
-        if self._process.returncode != 0:
-            I.get("DataBridge").notification.emit("VLC exited with an error")
-        self._process = None
-
     def __vlc_command(self, command: str) -> str | None:
         try:
             req = requests.get(

microkodi/qml/Main.qml

@@ -20,10 +20,6 @@ Window {
         function onIsLoading(loading) {
             isLoading = loading
         }
-
-        function onNotification(text) {
-            notificationModel.append({"message": text})
-        }
     }
 
     Image {
@@ -71,47 +67,4 @@ Window {
         anchors.rightMargin: 20
         font.pixelSize: window.height * 0.1
     }
-
-    ListModel {
-        id: notificationModel
-    }
-
-    Timer {
-        interval: 8 * 1000
-        running: notificationModel.count > 0
-        repeat: true
-        onTriggered: notificationModel.remove(0, 1)
-    }
-
-    Component {
-        id: notificationDelegate
-
-        Rectangle {
-            color: "#37474F"
-            width: 400
-            height: 100
-            radius: 10
-
-            Label {
-                text: message
-                color: "white"
-                font.pixelSize: 20
-                anchors.fill: parent
-                anchors.margins: 10
-            }
-        }
-    }
-
-    ListView {
-        anchors.right: wallpaperImage.right
-        anchors.top: wallpaperImage.top
-        anchors.topMargin: 20 * 2 + window.height * 0.1
-        anchors.rightMargin: 20
-        width: 400
-        height: window.height * 0.9 - 20 * 2
-
-        spacing: 50
-        model: notificationModel
-        delegate: notificationDelegate
-    }
 }

microkodi/udev.py

@@ -0,0 +1,27 @@
+import logging
+
+import pyudev
+
+def is_display_connected(card: str, connector: str) -> bool:
+    logger = logging.getLogger("udev")
+    status_file = f"/sys/class/drm/{card}-{connector}/status"
+    logger.debug("Reading file %s", status_file)
+    with open(status_file, "r") as f:
+        result = f.read().strip()
+        logger.debug("Result: '%s'", result)
+        return result == "connected"
+
+def block_until_display_connected(card: str, connector: str):
+    ctx = pyudev.Context()
+    monitor = pyudev.Monitor.from_netlink(ctx)
+    monitor.filter_by("drm")
+    for device in iter(monitor.poll, None):
+        if not "DEVNAME" in device:
+            continue
+        
+        if device.get("DEVNAME") != f"/dev/dri/{card}":
+            continue
+        
+        if not is_display_connected(card, connector):
+            continue
+        break

microkodi/ui/bridge.py

@@ -8,8 +8,6 @@ class DataBridge(QObject):
     # Indicates whether we're currently loading something or not
     isLoading = Signal(bool, arguments=["loading"])
 
-    notification = Signal(str, arguments=["text"])
-
     def __init__(self):
         super().__init__()
 

pyproject.toml

@@ -4,7 +4,8 @@ version = "0.1.0"
 dependencies = [
     "pyside6",
     "requests",
-    "yt-dlp"
+    "yt-dlp",
+    "pyudev"
 ]
 
 [tools.build]

start-microkodi.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-cd `dirname $0`
-source .venv/bin/activate
-python3 microkodi/main.py -c ./config.json