Skip to content

Commit c7f7bd2

Browse files
committed
Fix error when YT Music videos has no uploader URL
1 parent ac15df4 commit c7f7bd2

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -319,31 +319,32 @@ public String getUploaderName() throws ParsingException {
319319

320320
@Override
321321
public String getUploaderUrl() throws ParsingException {
322-
String url = null;
323-
324322
if (searchType.equals(MUSIC_VIDEOS)) {
325323
JsonArray items = info.getObject("menu").getObject("menuRenderer").getArray("items");
326324
for (Object item : items) {
327325
final JsonObject menuNavigationItemRenderer = ((JsonObject) item).getObject("menuNavigationItemRenderer");
328326
if (menuNavigationItemRenderer != null && menuNavigationItemRenderer.getObject("icon").getString("iconType").equals("ARTIST")) {
329-
url = getUrlFromNavigationEndpoint(menuNavigationItemRenderer.getObject("navigationEndpoint"));
330-
break;
327+
return getUrlFromNavigationEndpoint(menuNavigationItemRenderer.getObject("navigationEndpoint"));
331328
}
332329
}
330+
331+
return null;
333332
} else {
334333
final JsonObject navigationEndpoint = info.getArray("flexColumns")
335334
.getObject(1).getObject("musicResponsiveListItemFlexColumnRenderer")
336335
.getObject("text").getArray("runs").getObject(0).getObject("navigationEndpoint");
336+
337337
if (navigationEndpoint == null) {
338338
return null;
339339
}
340-
url = getUrlFromNavigationEndpoint(navigationEndpoint);
341-
}
342340

343-
if (url != null && !url.isEmpty()) {
344-
return url;
341+
final String url = getUrlFromNavigationEndpoint(navigationEndpoint);
342+
343+
if (url != null && !url.isEmpty()) {
344+
return url;
345+
}
346+
throw new ParsingException("Could not get uploader url");
345347
}
346-
throw new ParsingException("Could not get uploader url");
347348
}
348349

349350
@Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ private void collectStreamsFrom(final InfoItemsSearchCollector collector, final
132132
}
133133
}
134134

135-
136135
private String getNextPageUrlFrom(final JsonArray continuations) throws ParsingException {
137136
if (continuations == null) {
138137
return "";

0 commit comments

Comments
 (0)