CHANGES:

- SRS: added instructor mode

Author: karel26

extensions/srs/README.md

@@ -44,11 +44,11 @@ MyNode:
           show_passwords: false   # Optional: do not show red/blue passwords in the status embed (default: true)
           radio_effect_override: false                # optional: disable radio effects (LOS, etc)
           global_lobby_frequencies: 248.22,30.0,127.0 # optional: set your music channels in here
-          autostart: true     # optional: if you manage your SRS servers outside of DCSSB, set that to false
-          always_on: true     # start SRS as soon as possible  (includes no_shutdown: true)
-          no_shutdown: true   # optional: don't shut down SRS on mission end (default: false)
+          autostart: true         # optional: if you manage your SRS servers outside of DCSSB, set that to false
+          always_on: true         # start SRS as soon as possible  (includes no_shutdown: true)
+          no_shutdown: true       # optional: don't shut down SRS on mission end (default: false)
           srs_nudge_message: 'Optional nudge message' # optional: overwrite the existing nudge message
-          
+          instructor_mode: true   # enable instructor mode (as of SRS 2.3.3.0)
 ```
 You need one entry in the node section, pointing to your DCS-SRS installation and one in every instance section, 
 where you want to use SRS with. The next time the bot starts your server, it will auto-launch SRS and take care of it.

extensions/srs/extension.py

@@ -178,6 +178,10 @@ async def prepare(self) -> bool:
         self.config['spectators_audio_disabled'] = False
         dirty |= self._maybe_update_config('General Settings', 'SPECTATORS_AUDIO_DISABLED',
                                            'spectators_audio_disabled')
+        # new instructor mode
+        if parse(self.version) >= parse('2.3.3.0'):
+            dirty |= self._maybe_update_config('General Settings', 'ALLOW_INSTRUCTOR_MODE',
+                                               'instructor_mode')
         # disable effects (for music plugin)
         # TODO: better alignment with the music plugin!
         dirty |= self._maybe_update_config('General Settings', 'RADIO_EFFECT_OVERRIDE',
@@ -272,11 +276,16 @@ def run_subprocess():
                     info = None
                 out = subprocess.PIPE if self.config.get('debug', False) else subprocess.DEVNULL
                 err = subprocess.PIPE if self.config.get('debug', False) else subprocess.STDOUT
-
-                proc = subprocess.Popen([
-                    self.get_exe_path(),
-                    f"-cfg={self.get_config_path()}"
-                ], startupinfo=info, stdout=out, stderr=err, close_fds=True)
+                # we want the SRS logfile in our normal logs folder
+                cwd = os.path.join(self.server.instance.home, 'Logs')
+
+                proc = subprocess.Popen(
+                    [
+                        self.get_exe_path(),
+                        f"-cfg={self.get_config_path()}"
+                    ],
+                    cwd=cwd, startupinfo=info, stdout=out, stderr=err, close_fds=True
+                )
 
                 if self.config.get('debug', False):
                     Thread(target=log_output, args=(proc.stdout,logging.DEBUG), daemon=True).start()

extensions/srs/schemas/srs_schema.yaml

@@ -35,6 +35,7 @@ schema;node_srs_schema:
     always_on: {type: bool, nullable: false}
     radio_effect_override: {type: bool, nullable: false}
     global_lobby_frequencies: {type: str, nullable: false, range: {min: 1}}
+    instructor_mode: {type: bool, nullable: false}
 
 schema;instance_srs_schema:
   type: map