CHANGES:

- Music: debug added for SRS audio player

Author: karel26

services/music/README.md

@@ -19,6 +19,7 @@ DEFAULT:
   popup: Now playing {song} on {frequency}{modulation}  # optional - popup message when a song starts to play
   chat: Now playing {song} on {frequency}{modulation}   # optional - chat message when a song starts to play
   pause_without_players: false    # Pause music, when no player is active (default: true)
+  debug: true                     # Put the output of DCS-SR-ExternalAudio.exe to the dcssb*.log
   radios:
     Radio 1:                      # Name of the radio, can be anything
       type: SRSRadio              # we currently only support SRS, so this has to be in

services/music/radios/srs.py

@@ -4,8 +4,8 @@
 
 from core import Server, Status, Coalition, utils
 from packaging.version import parse
+from threading import Thread
 from typing import Optional
-
 from services.music.radios.base import RadioInitError, Radio
 from plugins.music.utils import get_tag
 
@@ -41,8 +41,16 @@ def exe_path() -> str:
                 else:
                     return os.path.join(srs_inst, "DCS-SR-ExternalAudio.exe")
 
-            def run_subprocess():
-                return subprocess.Popen([
+            def run_subprocess() -> subprocess.Popen:
+                def _log_output(self, p: subprocess.Popen):
+                    for line in iter(p.stdout.readline, b''):
+                        self.log.debug(line.decode('utf-8').rstrip())
+
+                debug = self.service.get_config().get('debug', False)
+                out = subprocess.PIPE if debug else subprocess.DEVNULL
+                err = subprocess.PIPE if debug else subprocess.DEVNULL
+
+                args = [
                     exe_path(),
                     "-f", str(self.config['frequency']),
                     "-m", self.config['modulation'],
@@ -51,7 +59,13 @@ def run_subprocess():
                     "-p", str(srs_port),
                     "-n", self.config.get('display_name', 'DCSSB MusicBox'),
                     "-i", file
-                ], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                ]
+                if debug:
+                    self.log.debug(f"Running {' '.join(args)}")
+                p = subprocess.Popen(args, stdout=out, stderr=err)
+                if debug:
+                    Thread(target=_log_output, args=(p,), daemon=True).start()
+                return p
 
             self.process = await asyncio.to_thread(run_subprocess)
             coalition = Coalition.BLUE if int(self.config['coalition']) == 2 else Coalition.RED

services/music/schemas/music_schema.yaml

@@ -15,6 +15,7 @@ schema;element_schema:
     popup: {type: str, nullable: false, range: {min: 1}}
     chat: {type: str, nullable: false, range: {min: 1}}
     pause_without_players: {type: bool, nullable: false}
+    debug: {type: bool, nullable: false}
     radios:
       type: map
       nullable: false