Distinguish between inner and outer M3U(8) playlists. (#131)

lavalink-devs · Jun 5, 2024 · dd8d1ae · dd8d1ae
1 parent 8da0444
commit dd8d1ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...ava/com/sedmelluq/discord/lavaplayer/container/playlists/HlsStreamSegmentUrlProvider.java b/...ava/com/sedmelluq/discord/lavaplayer/container/playlists/HlsStreamSegmentUrlProvider.java
@@ -8,6 +8,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 
 import static com.sedmelluq.discord.lavaplayer.tools.io.HttpClientTools.fetchResponseLines;
@@ -29,15 +30,24 @@ protected String getQualityFromM3uDirective(ExtendedM3uParser.Line directiveLine
         return "default";
     }
 
+    protected boolean isSegmentPlaylist(String[] lines) {
+        return Arrays.stream(lines).noneMatch(line -> line.startsWith("#EXT-X-STREAM-INF"));
+    }
+
     @Override
     protected String fetchSegmentPlaylistUrl(HttpInterface httpInterface) throws IOException {
         if (segmentPlaylistUrl != null) {
             return segmentPlaylistUrl;
         }
 
         HttpUriRequest request = new HttpGet(streamListUrl);
-        List<ChannelStreamInfo> streams = loadChannelStreamsList(fetchResponseLines(httpInterface, request,
-            "HLS stream list"));
+        String[] lines = fetchResponseLines(httpInterface, request, "HLS stream list");
+
+        if (isSegmentPlaylist(lines)) {
+            return (segmentPlaylistUrl = streamListUrl);
+        }
+
+        List<ChannelStreamInfo> streams = loadChannelStreamsList(lines);
 
         if (streams.isEmpty()) {
             throw new IllegalStateException("No streams listed in HLS stream list.");

diff --git a/...main/java/com/sedmelluq/discord/lavaplayer/source/stream/M3uStreamSegmentUrlProvider.java b/...main/java/com/sedmelluq/discord/lavaplayer/source/stream/M3uStreamSegmentUrlProvider.java
@@ -170,7 +170,7 @@ protected List<ChannelStreamInfo> loadChannelStreamsList(String[] lines) {
                 }
 
                 streamInfoLine = null;
-            } else if (line.isDirective() && "EXT-X-STREAM-INF".equals(line.directiveName)) {
+            } else if (line.isDirective() && ("EXT-X-STREAM-INF".equals(line.directiveName)  || "EXTINF".equals(line.directiveName))) {
                 streamInfoLine = line;
             }
         }