Add repeating

Author: klegul

TestBot/src/main/java/com/shirkanesi/magmaplayer/testbot/MagmaPlayerTestBot.java

@@ -78,7 +78,8 @@ private static void updateSlashCommands(Guild guild) {
                 Commands.slash("skip", "Skip the current track"),
                 Commands.slash("queue", "Output the current queue"),
                 Commands.slash("track", "Output information about current track"),
-                Commands.slash("pause", "Pause or resume the current track")
+                Commands.slash("pause", "Pause or resume the current track"),
+                Commands.slash("repeat", "Repeat the currently playing track")
         );
 
         commands.queue();

TestBot/src/main/java/com/shirkanesi/magmaplayer/testbot/discord/SlashCommandListener.java

@@ -103,6 +103,14 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) {
                     event.reply("Audio player paused").setEphemeral(true).queue();
                 }
             }
+            case "repeat" -> {
+                audioPlayer.toggleRepeating();
+                if (audioPlayer.isRepeating()) {
+                    event.reply("Audio player is now repeated").setEphemeral(true).queue();
+                } else {
+                    event.reply("Audio player is now *not* repeated").setEphemeral(true).queue();
+                }
+            }
         }
     }
 }

main/src/main/java/com/shirkanesi/magmaplayer/AudioPlayer.java

@@ -5,10 +5,12 @@
 import com.shirkanesi.magmaplayer.listener.FiresEvent;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackEndEvent;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackPauseEvent;
+import com.shirkanesi.magmaplayer.listener.events.AudioTrackRepeatEvent;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackSkippedEvent;
 import com.shirkanesi.magmaplayer.model.AudioPlaylist;
 import com.shirkanesi.magmaplayer.model.AudioTrack;
 import com.shirkanesi.magmaplayer.model.Pauseable;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.audio.AudioSendHandler;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
@@ -28,6 +30,8 @@ public class AudioPlayer implements Pauseable, Closeable, AudioTrackEventListene
     private final BlockingQueue<AudioTrack> trackQueue = new LinkedBlockingQueue<>();
 
     private boolean paused = false;
+    @Getter
+    private boolean repeating = false;
 
     private AudioSendHandler sendHandler;
 
@@ -170,8 +174,20 @@ public void clearQueue() {
         this.trackQueue.clear();
     }
 
+    @FiresEvent(value = AudioTrackRepeatEvent.class, onEveryPass = true)
+    public void toggleRepeating() {
+        this.repeating = !this.repeating;
+        if (this.audioTrack != null) {
+            this.audioTrack.getAudioTrackObserver().triggerAudioTrackRepeat(repeating);
+        }
+    }
+
     @Override
     public void onAudioTrackEnded(AudioTrackEndEvent event) {
-        next();
+        if (repeating) {
+            setTrack(this.audioTrack);
+        } else {
+            next();
+        }
     }
 }

main/src/main/java/com/shirkanesi/magmaplayer/listener/AudioTrackEventListener.java

@@ -3,6 +3,7 @@
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackEndEvent;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackJumpEvent;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackPauseEvent;
+import com.shirkanesi.magmaplayer.listener.events.AudioTrackRepeatEvent;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackSkippedEvent;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackStartedEvent;
 
@@ -20,4 +21,6 @@ default void onAudioTrackPaused(final AudioTrackPauseEvent event) {}
 
     default void onAudioTrackJump(final AudioTrackJumpEvent event) {}
 
+    default void onAudioTrackRepeat(final AudioTrackRepeatEvent event) {}
+
 }

main/src/main/java/com/shirkanesi/magmaplayer/listener/AudioTrackObserver.java

@@ -1,5 +1,6 @@
 package com.shirkanesi.magmaplayer.listener;
 
+import com.shirkanesi.magmaplayer.listener.events.AudioTrackRepeatEvent;
 import com.shirkanesi.magmaplayer.model.AudioTrack;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackEndEvent;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackJumpEvent;
@@ -45,6 +46,11 @@ public void triggerAudioTrackJump(long from, long to) {
         this.listeners.forEach(listener -> listener.onAudioTrackJump(event));
     }
 
+    public void triggerAudioTrackRepeat(boolean repeating) {
+        AudioTrackRepeatEvent event = new AudioTrackRepeatEvent(audioTrack, repeating);
+        this.listeners.forEach(listener -> listener.onAudioTrackRepeat(event));
+    }
+
     public void addEventListener(AudioTrackEventListener listener) {
         this.listeners.add(listener);
     }

main/src/main/java/com/shirkanesi/magmaplayer/listener/events/AudioTrackRepeatEvent.java

@@ -0,0 +1,16 @@
+package com.shirkanesi.magmaplayer.listener.events;
+
+import com.shirkanesi.magmaplayer.model.AudioTrack;
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+
+@Getter
+public class AudioTrackRepeatEvent extends AudioTrackEvent {
+
+    private final boolean repeating;
+
+    public AudioTrackRepeatEvent(@NotNull AudioTrack audioTrack, boolean repeating) {
+        super(audioTrack);
+        this.repeating = repeating;
+    }
+}

main/src/main/java/com/shirkanesi/magmaplayer/ytdlp/YTDLPAudioTrack.java

@@ -9,7 +9,6 @@
 import com.shirkanesi.magmaplayer.listener.FiresEvent;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackJumpEvent;
 import com.shirkanesi.magmaplayer.listener.events.AudioTrackStartedEvent;
-import com.shirkanesi.magmaplayer.model.UserData;
 import com.shirkanesi.magmaplayer.util.FormatUtils;
 import lombok.Setter;
 import com.shirkanesi.magmaplayer.ytdlp.model.YTDLPAudioTrackInformation;
@@ -215,7 +214,7 @@ public void restart() throws AudioPlayerException {
         try {
             this.ready = false;
             if (this.opusFile != null) {
-                this.opusFile.close();
+                this.opusFile = null;
             }
 
             // This looks like busy-waiting. Well that's right. However, this will wait at most seconds.