mir/NewPipeExtractor
2
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipeExtractor synced 2025-08-28 21:07:57 +00:00
Code Issues Releases Wiki Activity

[YouTube] Fix extraction of continuations in initial playlist responses

Browse Source
This commit is contained in:
AudricV 2025-05-24 10:28:15 +02:00
parent 61059b1afa
commit fec89a2cf1
No known key found for this signature in database
GPG Key ID: DA92EC7905614198
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubePlaylistExtractor.java
View File

@ -374,12 +374,37 @@ public class YoutubePlaylistExtractor extends PlaylistExtractor {
final JsonObject lastElement = contents.getObject(contents.size() - 1); final JsonObject lastElement = contents.getObject(contents.size() - 1);
if (lastElement.has("continuationItemRenderer")) { if (lastElement.has("continuationItemRenderer")) {
final String continuation = lastElement final JsonObject continuationEndpoint = lastElement
.getObject("continuationItemRenderer") .getObject("continuationItemRenderer")
.getObject("continuationEndpoint") .getObject("continuationEndpoint");
.getObject("continuationCommand")
final JsonObject continuationObject;
if (continuationEndpoint.has("commandExecutorCommand")) {
// This structure is only used at the time this code is written in initial playlist
// responses. continuationItemRenderer objects return multiple commands: one
// containing the continuation we need and one a playlistVotingRefreshPopupCommand
continuationObject = continuationEndpoint.getObject("commandExecutorCommand")
.getArray("commands")
.stream()
.filter(JsonObject.class::isInstance)
.map(JsonObject.class::cast)
.filter(command -> command.has("continuationCommand"))
.findFirst()
.orElse(new JsonObject());
} else {
// At the time this code is written, this "classic" continuation structure is only
// returned in browse responses of continuation requests
continuationObject = continuationEndpoint;
}
final String continuation = continuationObject.getObject("continuationCommand")
.getString("token"); .getString("token");
if (isNullOrEmpty(continuation)) {
// Invalid continuation or no continuation found
return null;
}
final byte[] body = JsonWriter.string(prepareDesktopJsonBuilder( final byte[] body = JsonWriter.string(prepareDesktopJsonBuilder(
getExtractorLocalization(), getExtractorContentCountry()) getExtractorLocalization(), getExtractorContentCountry())
.value("continuation", continuation) .value("continuation", continuation)
@ -387,9 +412,9 @@ public class YoutubePlaylistExtractor extends PlaylistExtractor {
.getBytes(StandardCharsets.UTF_8); .getBytes(StandardCharsets.UTF_8);
return new Page(YOUTUBEI_V1_URL + "browse?" + DISABLE_PRETTY_PRINT_PARAMETER, body); return new Page(YOUTUBEI_V1_URL + "browse?" + DISABLE_PRETTY_PRINT_PARAMETER, body);
} else {
return null;
} }
return null;
} }
private void collectStreamsFrom(@Nonnull final StreamInfoItemsCollector collector, private void collectStreamsFrom(@Nonnull final StreamInfoItemsCollector collector,