Add playlists

Author: klegul

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

@@ -3,7 +3,7 @@
 import com.shirkanesi.magmaplayer.AudioPlayer;
 import com.shirkanesi.magmaplayer.AudioTrack;
 import com.shirkanesi.magmaplayer.AudioTrackInformation;
-import com.shirkanesi.magmaplayer.YTDLPAudioTrack;
+import com.shirkanesi.magmaplayer.ytdlp.YTDLPAudioTrack;
 import com.shirkanesi.magmaplayer.testbot.discord.DiscordController;
 import com.shirkanesi.magmaplayer.testbot.discord.SlashCommandListener;
 import com.shirkanesi.magmaplayer.listener.AudioTrackEventListener;
@@ -87,7 +87,7 @@ private static void addTestTrack(AudioPlayer audioPlayer) {
         String[] tracks = System.getenv("TEST_TRACKS").split(";");
         for (String track : tracks) {
             AudioTrack ytdlpAudioTrack = new YTDLPAudioTrack(track);
-            audioPlayer.enqueueTrack(ytdlpAudioTrack);
+            audioPlayer.enqueue(ytdlpAudioTrack);
         }
     }
 
@@ -128,7 +128,7 @@ public void onAudioTrackEnded(AudioTrackEndEvent event) {
         });
 
         guildById.getAudioManager().setSendingHandler(audioPlayer.createSendHandler());
-        audioPlayer.enqueueTrack(ytdlpAudioTrack3);
+        audioPlayer.enqueue(ytdlpAudioTrack3);
     }
 
 }

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

@@ -3,7 +3,10 @@
 import com.shirkanesi.magmaplayer.AudioPlayer;
 import com.shirkanesi.magmaplayer.AudioTrack;
 import com.shirkanesi.magmaplayer.AudioTrackInformation;
-import com.shirkanesi.magmaplayer.YTDLPAudioTrack;
+import com.shirkanesi.magmaplayer.util.YTDLPManager;
+import com.shirkanesi.magmaplayer.ytdlp.YTDLPAudioItem;
+import com.shirkanesi.magmaplayer.ytdlp.YTDLPAudioPlaylist;
+import com.shirkanesi.magmaplayer.ytdlp.YTDLPAudioTrack;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -22,15 +25,22 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) {
         switch (event.getName()) {
             case "play" -> {
                 String url = event.getOption("url", OptionMapping::getAsString);
-                audioPlayer.enqueueTrack(new YTDLPAudioTrack(url));
-                event.reply("Track enqueued").setEphemeral(true).queue();
+                YTDLPAudioItem item = YTDLPManager.loadUrl(url);
+                if (item instanceof YTDLPAudioTrack track) {
+                    audioPlayer.enqueue(track);
+                    event.reply("Track enqueued").setEphemeral(true).queue();
+                } else if (item instanceof YTDLPAudioPlaylist playlist) {
+                    audioPlayer.enqueue(playlist);
+                    event.reply(playlist.getTracks().size() + " tracks enqueued").setEphemeral(true).queue();
+                }
             }
             case "skip" -> {
                 audioPlayer.next();
                 event.reply("Skipped").setEphemeral(true).queue();
             }
             case "queue" -> {
                 EmbedBuilder embedBuilder = new EmbedBuilder();
+                event.deferReply(true).queue();
 
                 int index = 1;
                 for (AudioTrack audioTrack : audioPlayer.getTrackQueue()) {

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

@@ -0,0 +1,15 @@
+package com.shirkanesi.magmaplayer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class AbstractAudioPlaylist implements AudioPlaylist {
+
+    protected List<AudioTrack> tracks = new ArrayList<>();
+
+    @Override
+    public List<AudioTrack> getTracks() {
+        return tracks;
+    }
+
+}

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

@@ -0,0 +1,9 @@
+package com.shirkanesi.magmaplayer;
+
+import java.io.Closeable;
+
+public interface AudioItem {
+
+    void load();
+
+}

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

@@ -68,7 +68,7 @@ public boolean isPaused() {
         return paused || !this.canProvide();
     }
 
-    public synchronized void enqueueTrack(AudioTrack audioTrack) {
+    private synchronized void enqueueTrack(AudioTrack audioTrack) {
         this.trackQueue.add(audioTrack);
         log.debug("Enqueue track {}", audioTrack);
         audioTrack.getAudioTrackObserver().addEventListener(this);
@@ -77,6 +77,20 @@ public synchronized void enqueueTrack(AudioTrack audioTrack) {
         }
     }
 
+    public synchronized void enqueue(AudioTrack audioTrack) {
+        this.enqueueTrack(audioTrack);
+    }
+
+    public synchronized void enqueue(AudioPlaylist audioPlaylist) {
+        if (audioPlaylist.getTracks().isEmpty()) {
+            audioPlaylist.load();
+        }
+
+        for (AudioTrack audioTrack : audioPlaylist.getTracks()) {
+            this.enqueueTrack(audioTrack);
+        }
+    }
+
     public boolean isFinished() {
         return this.audioTrack.isFinished();
     }

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

@@ -0,0 +1,9 @@
+package com.shirkanesi.magmaplayer;
+
+import java.util.List;
+
+public interface AudioPlaylist extends AudioItem {
+
+    List<AudioTrack> getTracks();
+
+}

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

@@ -7,9 +7,7 @@
 import java.io.Closeable;
 import java.nio.ByteBuffer;
 
-public interface AudioTrack extends Closeable {
-
-    void load();
+public interface AudioTrack extends Closeable, AudioItem {
 
     @FiresEvent(value = AudioTrackJumpEvent.class, onEveryPass = true)
     void jumpTo(int seconds);

main/src/main/java/com/shirkanesi/magmaplayer/util/YTDLPManager.java

@@ -1,5 +1,8 @@
 package com.shirkanesi.magmaplayer.util;
 
+import com.shirkanesi.magmaplayer.ytdlp.YTDLPAudioItem;
+import com.shirkanesi.magmaplayer.ytdlp.YTDLPAudioPlaylist;
+import com.shirkanesi.magmaplayer.ytdlp.YTDLPAudioTrack;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 
@@ -16,14 +19,12 @@ public final class YTDLPManager {
     private static final String YT_DLP_LINUX_DOWNLOAD_URL = "https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp";
     private static final String YT_DLP_WINDOWS_DOWNLOAD_URL = "https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.exe";
 
-    private static final YTDLPManager INSTANCE = new YTDLPManager();
-
     /**
      * Get the version of yt-dlp
      *
      * @return an optional containing the version-string of yt-dlp (or empty iff not found)
      */
-    private synchronized Optional<String> getYTDLPVersion() {
+    public static synchronized Optional<String> getYTDLPVersion() {
         try {
             Process exec = Runtime.getRuntime().exec("yt-dlp --version");
             return Optional.ofNullable(new BufferedReader(new InputStreamReader(exec.getInputStream())).readLine());
@@ -36,7 +37,7 @@ private synchronized Optional<String> getYTDLPVersion() {
      * Downloads the latest version of yt-dlp into the current working-directory.
      * Note: this will currently only work with windows and linux
      */
-    private synchronized void downloadYTDLP() {
+    public static synchronized void downloadYTDLP() {
         String osName = System.getProperty("os.name").toLowerCase();
 
         String downloadUrl;
@@ -61,11 +62,21 @@ private synchronized void downloadYTDLP() {
     }
 
     /**
-     * Get the default {@link YTDLPManager}
-     * @return the default {@link YTDLPManager}
+     * Load an url that is compatible with yt-dlp.
+     * This will return a playlist if this is the case.
+     * Otherwise, it will return a track.
+     * @param url url of playlist or track
+     * @return {@link YTDLPAudioPlaylist} if playlist and {@link YTDLPAudioTrack} otherwise
      */
-    public static YTDLPManager getDefault() {
-        return YTDLPManager.INSTANCE;
+    public static YTDLPAudioItem loadUrl(String url) {
+        YTDLPAudioPlaylist playlist = new YTDLPAudioPlaylist(url);
+        playlist.load();
+
+        if (playlist.getTracks().isEmpty()) {
+            return new YTDLPAudioTrack(url);
+        }
+
+        return playlist;
     }
 
 }

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

@@ -0,0 +1,6 @@
+package com.shirkanesi.magmaplayer.ytdlp;
+
+import com.shirkanesi.magmaplayer.AudioItem;
+
+public interface YTDLPAudioItem extends AudioItem {
+}

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

@@ -0,0 +1,55 @@
+package com.shirkanesi.magmaplayer.ytdlp;
+
+import com.shirkanesi.magmaplayer.AbstractAudioPlaylist;
+import com.shirkanesi.magmaplayer.exception.AudioTrackPullException;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+public class YTDLPAudioPlaylist extends AbstractAudioPlaylist implements YTDLPAudioItem {
+
+    private static final String LOAD_PLAYLIST_COMMAND = "yt-dlp --flat-playlist --print \"%(url)s\"";
+
+    private final String url;
+
+    public YTDLPAudioPlaylist(String url) {
+        this.url = url;
+    }
+
+    @Override
+    public void load() {
+        try {
+            List<String> urls = getPlaylistTracks();
+
+            for (String url : urls) {
+                tracks.add(new YTDLPAudioTrack(url));
+            }
+        } catch (IOException e) {
+            throw new AudioTrackPullException("Failed while loading playlist " + url, e);
+        }
+    }
+
+    private List<String> getPlaylistTracks() throws IOException {
+        Process process = Runtime.getRuntime().exec(LOAD_PLAYLIST_COMMAND + " " + url);
+        try {
+            process.waitFor();
+        } catch (InterruptedException e) {
+            process.destroy();
+        }
+
+        List<String> urls = new ArrayList<>();
+        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                if (line.startsWith("http")) {
+                    urls.add(line);
+                }
+            }
+        }
+        return urls;
+    }
+
+}