feat(triggers): start and end modifiers (#115)

Author: Dolly132

src/torchlight/AudioClip.py

@@ -36,12 +36,13 @@ def __del__(self) -> None:
     def Play(
         self,
         seconds: int | None = None,
+        duration: int | None = None,
         *args: Any,
         volume: float | None = None,
         speed: float | None = None,
         pitch: float | None = None,
     ) -> bool:
-        return self.audio_player.PlayURI(self.uri, seconds, *args, volume=volume, speed=speed, pitch=pitch)
+        return self.audio_player.PlayURI(self.uri, seconds, duration, *args, volume=volume, speed=speed, pitch=pitch)
 
     def Stop(self) -> bool:
         return self.audio_player.Stop()

src/torchlight/AudioManager.py

@@ -27,12 +27,12 @@ def ParseParams(self, trigger_params: dict, msg: str) -> dict[str, float]:
             return trigger_params
 
         params: dict[str, float] = {}
-        for param in this_config:
+        for param, config in this_config.items():
             if param in trigger_params and trigger_params[param] is not None:
                 params[param] = float(trigger_params[param])
             else:
-                if isinstance(this_config[param], dict) and "Default" in this_config[param]:
-                    params[param] = float(this_config[param]["Default"])
+                if isinstance(config, dict) and "Default" in config:
+                    params[param] = float(config["Default"])
 
         msg_args = msg.split()
         for arg in msg_args:
@@ -42,21 +42,22 @@ def ParseParams(self, trigger_params: dict, msg: str) -> dict[str, float]:
                     continue
 
                 key = key.capitalize()
-                if key not in this_config:
-                    continue
 
-                if isinstance(this_config[key], dict):
-                    val: float = 1.0
+                if (key in this_config and isinstance(this_config[key], dict)) or key in ("Start", "End"):
                     try:
                         val = float(value)
                     except ValueError:
                         continue
 
-                    if "Min" not in this_config[key] or "Max" not in this_config[key]:
-                        continue
+                    if key in this_config:
+                        if "Min" not in this_config[key] or "Max" not in this_config[key]:
+                            continue
 
-                    val = max(this_config[key]["Min"], min(val, this_config[key]["Max"]))
-                    params[key] = val
+                        val = max(this_config[key]["Min"], min(val, this_config[key]["Max"]))
+                        params[key] = val
+                    else:
+                        # Key here is either Start or End
+                        params[key] = val
 
         return params
 

src/torchlight/Commands.py

@@ -701,7 +701,18 @@ async def _func(self, message: list[str], player: Player) -> int:
         speed = modifiers["Speed"]
         pitch = modifiers["Pitch"]
 
-        return audio_clip.Play(volume=volume, speed=speed, pitch=pitch)
+        start: int | None = None
+        duration: int | None = None
+
+        if "Start" in modifiers:
+            start = int(modifiers["Start"])
+            start = start if start >= 0 else None
+        if "End" in modifiers:
+            end = int(modifiers["End"])
+            if end > 0 and start is not None and end > start:
+                duration = end - start
+
+        return audio_clip.Play(seconds=start, duration=duration, volume=volume, speed=speed, pitch=pitch)
 
     def get_sound_path(self, player: Player, voice_trigger: str, trigger_number: str) -> str | None:
         level = player.admin.level
@@ -1189,7 +1200,7 @@ async def Say(self, player: Player, message: str) -> int:
             os.unlink(temp_file.name)
             return 1
 
-        if audio_clip.Play(None, "-af", "volume=10dB"):
+        if audio_clip.Play(None, None, "-af", "volume=10dB"):
             audio_clip.audio_player.AddCallback("Stop", lambda: os.unlink(temp_file.name))
             return 0
 

src/torchlight/FFmpegAudioPlayer.py

@@ -56,6 +56,7 @@ def PlayURI(
         self,
         uri: str,
         position: int | None,
+        duration: int | None,
         *args: Any,
         volume: float | None = None,
         speed: float | None = None,
@@ -108,7 +109,6 @@ def PlayURI(
             "s16le",
             "-vn",
             *args,
-            "-",
         ]
 
         if position is not None:
@@ -121,6 +121,16 @@ def PlayURI(
             )
             self.position = position
 
+        if duration is not None:
+            ffmpeg_command.extend(
+                [
+                    "-t",
+                    str(duration),
+                ]
+            )
+
+        ffmpeg_command.append("-")
+
         self.logger.debug(curl_command)
         self.logger.debug(ffmpeg_command)
 

src/torchlight/__init__.py

@@ -1 +1 @@
-__version__ = "1.6.0"
+__version__ = "1.7.0"