show streamer version

4 files changed, 26 insertions, 25 deletions

diff --git a/kvmd/server.py b/kvmd/server.py
index f0dd7aed..d48191ab 100644
--- a/kvmd/server.py
+++ b/kvmd/server.py
@@ -1,8 +1,6 @@
 import os
 import signal
 import asyncio
-import platform
-import functools
 import json
 import time
 
@@ -33,17 +31,6 @@ from .logging import get_logger
 __version__ = "0.78"
 
 
[email protected]_cache()
-def _get_system_info() -> Dict[str, Dict[str, str]]:
-    return {
-        "version": {
-            "platform": platform.platform(),
-            "python": platform.python_version(),
-            "kvmd": __version__,
-        },
-    }
-
-
 # =====
 def _system_task(method: Callable) -> Callable:
     async def wrap(self: "Server") -> None:
@@ -170,7 +157,13 @@ class Server:  # pylint: disable=too-many-instance-attributes
     # ===== INFO
 
     async def __info_handler(self, _: aiohttp.web.Request) -> aiohttp.web.Response:
-        return _json(_get_system_info())
+        return _json({
+            "version": {
+                "kvmd": __version__,
+                "streamer": await self.__streamer.get_version(),
+            },
+            "streamer": self.__streamer.get_app(),
+        })
 
     # ===== WEBSOCKET
 
diff --git a/kvmd/streamer.py b/kvmd/streamer.py
index 8a23c715..f4c49bf2 100644
--- a/kvmd/streamer.py
+++ b/kvmd/streamer.py
@@ -1,3 +1,4 @@
+import os
 import asyncio
 import asyncio.subprocess
 
@@ -64,6 +65,18 @@ class Streamer:  # pylint: disable=too-many-instance-attributes
             "quality": self.__quality,
         }
 
+    def get_app(self) -> str:
+        return os.path.basename(self.__cmd[0])
+
+    async def get_version(self) -> str:
+        proc = await asyncio.create_subprocess_exec(
+            *[self.__cmd[0], "--version"],
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.DEVNULL,
+        )
+        (stdout, _) = await proc.communicate()
+        return stdout.decode(errors="ignore").strip()
+
     async def cleanup(self) -> None:
         if self.is_running():
             await self.stop()
diff --git a/web/index.html b/web/index.html
index 86b64f3b..6b9979bb 100644
--- a/web/index.html
+++ b/web/index.html
@@ -541,12 +541,8 @@
 					<td id="about-version-kvmd" class="version"></td>
 				</tr>
 				<tr>
-					<td>Python:</td>
-					<td id="about-version-python" class="version"></td>
-				</tr>
-				<tr>
-					<td>Platform:</td>
-					<td id="about-version-platform" class="version"></td>
+					<td>Streamer:</td>
+					<td id="about-version-streamer" class="version"></td>
 				</tr>
 			</table>
 			<p>
diff --git a/web/js/session.js b/web/js/session.js
index 19df05cc..dcc968c7 100644
--- a/web/js/session.js
+++ b/web/js/session.js
@@ -20,11 +20,10 @@ function Session(atx, hid, msd) {
 		var http = tools.makeRequest("GET", "/kvmd/info", function() {
 			if (http.readyState === 4) {
 				if (http.status === 200) {
-					var version = JSON.parse(http.responseText).result.version;
-					$("kvmd-version").innerHTML = "kvmd " + version.kvmd;
-					$("about-version-kvmd").innerHTML = version.kvmd;
-					$("about-version-python").innerHTML = version.python;
-					$("about-version-platform").innerHTML = version.platform;
+					var info = JSON.parse(http.responseText).result;
+					$("kvmd-version").innerHTML = "Web-UI " + info.version.kvmd;
+					$("about-version-kvmd").innerHTML = info.version.kvmd;
+					$("about-version-streamer").innerHTML = info.version.streamer + " (" + info.streamer + ")";
 				} else {
 					setTimeout(__loadKvmdVersion, 1000);
 				}