CypherpunkSamurai
/
NewPipeExtractor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[YouTube] Music: Fix search extraction caused by changed JSON response

This commit is contained in:
TobiGr 2020-12-22 20:02:36 +01:00
parent c9d9bd1e24
commit b62144b49d
1 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java
View File

@ -20,6 +20,8 @@ import org.schabi.newpipe.extractor.localization.TimeAgoParser;
import org.schabi.newpipe.extractor.search.InfoItemsSearchCollector; import org.schabi.newpipe.extractor.search.InfoItemsSearchCollector;
import org.schabi.newpipe.extractor.search.SearchExtractor; import org.schabi.newpipe.extractor.search.SearchExtractor;
import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper; import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper;
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubePlaylistLinkHandlerFactory;
import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeStreamLinkHandlerFactory;
import org.schabi.newpipe.extractor.utils.JsonUtils; import org.schabi.newpipe.extractor.utils.JsonUtils;
import org.schabi.newpipe.extractor.utils.Utils; import org.schabi.newpipe.extractor.utils.Utils;
@ -258,16 +260,29 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor {
final TimeAgoParser timeAgoParser = getTimeAgoParser(); final TimeAgoParser timeAgoParser = getTimeAgoParser();
for (Object item : videos) { for (Object item : videos) {
final JsonObject info = ((JsonObject) item).getObject("musicResponsiveListItemRenderer", null); final JsonObject info = ((JsonObject) item)
.getObject("musicResponsiveListItemRenderer", null);
if (info != null) { if (info != null) {
final String displayPolicy = info.getString("musicItemRendererDisplayPolicy", EMPTY_STRING);
if (displayPolicy.equals("MUSIC_ITEM_RENDERER_DISPLAY_POLICY_GREY_OUT")) {
continue; // no info about video URL available
}
final JsonObject flexColumnRenderer = info
.getArray("flexColumns")
.getObject(1)
.getObject("musicResponsiveListItemFlexColumnRenderer");
final JsonArray descriptionElements = flexColumnRenderer
.getObject("text")
.getArray("runs");
final String searchType = getLinkHandler().getContentFilters().get(0); final String searchType = getLinkHandler().getContentFilters().get(0);
if (searchType.equals(MUSIC_SONGS) || searchType.equals(MUSIC_VIDEOS)) { if (searchType.equals(MUSIC_SONGS) || searchType.equals(MUSIC_VIDEOS)) {
collector.commit(new YoutubeStreamInfoItemExtractor(info, timeAgoParser) { collector.commit(new YoutubeStreamInfoItemExtractor(info, timeAgoParser) {
@Override @Override
public String getUrl() throws ParsingException { public String getUrl() throws ParsingException {
final String url = getUrlFromNavigationEndpoint(info.getObject("doubleTapCommand")); final String id = info.getObject("playlistItemData").getString("videoId");
if (!isNullOrEmpty(url)) { if (!isNullOrEmpty(id)) {
return url; return "https://music.youtube.com/watch?v=" + id;
} }
throw new ParsingException("Could not get url"); throw new ParsingException("Could not get url");
} }
@ -284,8 +299,9 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor {
@Override @Override
public long getDuration() throws ParsingException { public long getDuration() throws ParsingException {
final String duration = getTextFromObject(info.getArray("flexColumns").getObject(3) final String duration = descriptionElements
.getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text")); .getObject(descriptionElements.size() - 1)
.getString("text");
if (!isNullOrEmpty(duration)) { if (!isNullOrEmpty(duration)) {
return YoutubeParsingHelper.parseDurationString(duration); return YoutubeParsingHelper.parseDurationString(duration);
} }
@ -294,8 +310,7 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor {
@Override @Override
public String getUploaderName() throws ParsingException { public String getUploaderName() throws ParsingException {
final String name = getTextFromObject(info.getArray("flexColumns").getObject(1) final String name = descriptionElements.getObject(0).getString("text");
.getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
if (!isNullOrEmpty(name)) { if (!isNullOrEmpty(name)) {
return name; return name;
} }
@ -346,8 +361,9 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor {
if (searchType.equals(MUSIC_SONGS)) { if (searchType.equals(MUSIC_SONGS)) {
return -1; return -1;
} }
final String viewCount = getTextFromObject(info.getArray("flexColumns").getObject(2) final String viewCount = descriptionElements
.getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text")); .getObject(descriptionElements.size() - 3)
.getString("text");
if (!isNullOrEmpty(viewCount)) { if (!isNullOrEmpty(viewCount)) {
return Utils.mixedNumberWordToLong(viewCount); return Utils.mixedNumberWordToLong(viewCount);
} }
@ -451,9 +467,27 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor {
@Override @Override
public String getUrl() throws ParsingException { public String getUrl() throws ParsingException {
final String url = getUrlFromNavigationEndpoint(info.getObject("doubleTapCommand")); String playlistId = info.getObject("menu")
if (!isNullOrEmpty(url)) { .getObject("menuRenderer")
return url; .getArray("items")
.getObject(4)
.getObject("toggleMenuServiceItemRenderer")
.getObject("toggledServiceEndpoint")
.getObject("likeEndpoint")
.getObject("target")
.getString("playlistId");
if (isNullOrEmpty(playlistId)) {
playlistId = info.getObject("overlay")
.getObject("musicItemThumbnailOverlayRenderer")
.getObject("content")
.getObject("musicPlayButtonRenderer")
.getObject("playNavigationEndpoint")
.getObject("watchPlaylistEndpoint")
.getString("playlistId");
}
if (!isNullOrEmpty(playlistId)) {
return "https://music.youtube.com/playlist?list=" + playlistId;
} }
throw new ParsingException("Could not get url"); throw new ParsingException("Could not get url");
} }
@ -462,11 +496,9 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor {
public String getUploaderName() throws ParsingException { public String getUploaderName() throws ParsingException {
final String name; final String name;
if (searchType.equals(MUSIC_ALBUMS)) { if (searchType.equals(MUSIC_ALBUMS)) {
name = getTextFromObject(info.getArray("flexColumns").getObject(2) name = descriptionElements.getObject(2).getString("text");
.getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
} else { } else {
name = getTextFromObject(info.getArray("flexColumns").getObject(1) name = descriptionElements.getObject(0).getString("text");
.getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
} }
if (!isNullOrEmpty(name)) { if (!isNullOrEmpty(name)) {
return name; return name;
@ -479,8 +511,7 @@ public class YoutubeMusicSearchExtractor extends SearchExtractor {
if (searchType.equals(MUSIC_ALBUMS)) { if (searchType.equals(MUSIC_ALBUMS)) {
return ITEM_COUNT_UNKNOWN; return ITEM_COUNT_UNKNOWN;
} }
final String count = getTextFromObject(info.getArray("flexColumns").getObject(2) final String count = descriptionElements.getObject(2).getString("text");
.getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
if (!isNullOrEmpty(count)) { if (!isNullOrEmpty(count)) {
if (count.contains("100+")) { if (count.contains("100+")) {
return ITEM_COUNT_MORE_THAN_100; return ITEM_COUNT_MORE_THAN_100;