Fix queue system

Author: duncte123

bot/src/main/java/me/duncte123/skybot/audio/AudioLoader.java

@@ -35,6 +35,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -140,19 +141,17 @@ public void onPlaylistLoaded(@NotNull PlaylistLoaded playlistLoaded) {
                 tracksRaw = tracksRaw.subList(selectedTrackIndex, tracksRaw.size());
             }
 
-            final List<Track> limitedTracks = tracksRaw.stream().peek((track) -> {
+            final List<Track> userTracks = tracksRaw.stream().peek((track) -> {
                 track.setUserData(new UUIDUserData());
 
                 mng.getScheduler().storeUserData(track, new TrackUserData(this.requester));
             }).toList();
+            final var tracksCopy = new ArrayList<>(userTracks);
 
-            for (final Track track : limitedTracks) {
-                trackScheduler.addToQueue(track, this.isPatron);
-            }
+            final int totalTracksQueued = trackScheduler.queuePlaylistTracks(tracksCopy, this.isPatron);
 
             if (this.announce) {
-                // TODO: find a way to fix up BigChungusPlaylist
-                final String msg = getPlaylistMsg(tracks, playlistInfo);
+                final String msg = getPlaylistMsg(tracks, totalTracksQueued, playlistInfo);
 
                 sendMsg(
                     new MessageConfig.Builder()
@@ -240,22 +239,6 @@ public void loadFailed(@NotNull LoadFailed loadFailed) {
         );
     }
 
-    private String getPlaylistMsg(List<Track> tracks, PlaylistInfo playlistInfo) {
-        final String sizeMsg = String.valueOf(tracks.size());
-
-        /*if (playlist instanceof BigChungusPlaylist bigBoi && bigBoi.isBig()) {
-            sizeMsg = tracks.size() + "/" + bigBoi.getOriginalSize();
-        } else {
-            sizeMsg = String.valueOf(tracks.size());
-        }*/
-
-        return String.format(
-            "Adding **%s** tracks to the queue from **%s**",
-            sizeMsg,
-            playlistInfo.getName()
-        );
-    }
-
 //    private void searchLoaded(LoadResult.SearchResult searchResult) {
 //        System.out.println("WARNING A SEARCH RESULT WAS TRIGGERED " + searchResult);
 //    }
@@ -273,6 +256,22 @@ public void noMatches() {
         }
     }
 
+    private String getPlaylistMsg(List<Track> tracks, int totalTracksAdded, PlaylistInfo playlistInfo) {
+        final String sizeMsg;
+
+        if (tracks.size() < totalTracksAdded) {
+            sizeMsg = totalTracksAdded + "/" + tracks.size();
+        } else {
+            sizeMsg = String.valueOf(tracks.size());
+        }
+
+        return String.format(
+            "Adding **%s** tracks to the queue from **%s**",
+            sizeMsg,
+            playlistInfo.getName()
+        );
+    }
+
     private static String getSteamTitle(Track track, String rawTitle, CommandManager commandManager) {
         String title = rawTitle;
 

bot/src/main/java/me/duncte123/skybot/audio/BigChungusPlaylist.java

@@ -0,0 +1,51 @@
+/*
+ * Skybot, a multipurpose discord bot
+ *      Copyright (C) 2017  Duncan "duncte123" Sterken & Ramid "ramidzkh" Khan & Maurice R S "Sanduhr32"
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package me.duncte123.skybot.audio;
+
+import dev.arbjerg.lavalink.client.protocol.Track;
+
+import java.util.List;
+
+public class BigChungusPlaylist {
+    private final int originalSize;
+    private final String name;
+    private final List<Track> tracks;
+
+    public BigChungusPlaylist(String name, List<Track> tracks, int originalSize) {
+        this.name = name;
+        this.tracks = tracks;
+        this.originalSize = originalSize;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public List<Track> getTracks() {
+        return tracks;
+    }
+
+    public int getOriginalSize() {
+        return originalSize;
+    }
+
+    public boolean isBig() {
+        return originalSize > tracks.size();
+    }
+}

bot/src/main/java/me/duncte123/skybot/audio/TrackScheduler.java

@@ -90,6 +90,31 @@ public void addToQueue(Track track, boolean isPatron) throws LimitReachedExcepti
         }
     }
 
+    /**
+     *
+     * @param tracks
+     * @param isPatron
+     * @return The total amount of tracks that were added to the queue.
+     * @throws LimitReachedException
+     */
+    public int queuePlaylistTracks(List<Track> tracks, boolean isPatron) throws LimitReachedException {
+        final List<Track> tmpQueue = new ArrayList<>();
+
+        while (!tracks.isEmpty() && (tmpQueue.size() + queue.size() + 1 < MAX_QUEUE_SIZE || isPatron)) {
+            tmpQueue.add(tracks.removeFirst());
+        }
+
+        final int tracksAdded = tmpQueue.size();
+
+        if (this.guildMusicManager.getPlayer().getCurrentTrack() == null) {
+            this.play(tmpQueue.removeFirst());
+        }
+
+        queue.addAll(tmpQueue);
+
+        return tracksAdded;
+    }
+
     /**
      * This is a special case for the skip command where it has to announce the next track
      * due to it being a user interaction