Skip to content

[YouTube] Fix trending getName() #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TobiGr merged 1 commit into from
Mar 24, 2021
Merged

[YouTube] Fix trending getName() #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...tor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,16 @@ public static String getTextFromObject(JsonObject textObject) throws ParsingExce
return getTextFromObject(textObject, false);
}

@Nullable
public static String getTextAtKey(final JsonObject jsonObject, final String key)
throws ParsingException {
if (jsonObject.isString(key)) {
return jsonObject.getString(key);
} else {
return getTextFromObject(jsonObject.getObject(key));
}
}

public static String fixThumbnailUrl(String thumbnailUrl) {
if (thumbnailUrl.startsWith("//")) {
thumbnailUrl = thumbnailUrl.substring(2);
Expand Down
14 changes: 7 additions & 7 deletions ...va/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeTrendingExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import javax.annotation.Nonnull;

import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getJsonResponse;
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getTextAtKey;
import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.getTextFromObject;
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;

Expand Down Expand Up @@ -70,18 +71,17 @@ public InfoItemsPage<StreamInfoItem> getPage(final Page page) {
@Override
public String getName() throws ParsingException {
final JsonObject header = initialData.getObject("header");
JsonObject title = null;
String name = null;
if (header.has("feedTabbedHeaderRenderer")) {
title = header.getObject("feedTabbedHeaderRenderer").getObject("title");
name = getTextAtKey(header.getObject("feedTabbedHeaderRenderer"), "title");
} else if (header.has("c4TabbedHeaderRenderer")) {
title = header.getObject("c4TabbedHeaderRenderer").getObject("title");
name = getTextAtKey(header.getObject("c4TabbedHeaderRenderer"), "title");
}

String name = getTextFromObject(title);
if (!isNullOrEmpty(name)) {
return name;
if (isNullOrEmpty(name)) {
throw new ParsingException("Could not get Trending name");
}
throw new ParsingException("Could not get Trending name");
return name;
}

@Nonnull
Expand Down