Merge pull request #370 from wb9688/fix-yt-age-restricted
Fix age restricted YouTube videos
This commit is contained in:
commit
32dff1541f
|
@ -118,7 +118,13 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
@Override
|
@Override
|
||||||
public String getName() throws ParsingException {
|
public String getName() throws ParsingException {
|
||||||
assertPageFetched();
|
assertPageFetched();
|
||||||
String title = getTextFromObject(getVideoPrimaryInfoRenderer().getObject("title"));
|
String title = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
title = getTextFromObject(getVideoPrimaryInfoRenderer().getObject("title"));
|
||||||
|
} catch (ParsingException ignored) {
|
||||||
|
// age-restricted videos cause a ParsingException here
|
||||||
|
}
|
||||||
|
|
||||||
if (isNullOrEmpty(title)) {
|
if (isNullOrEmpty(title)) {
|
||||||
title = playerResponse.getObject("videoDetails").getString("title");
|
title = playerResponse.getObject("videoDetails").getString("title");
|
||||||
|
@ -196,11 +202,15 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
public Description getDescription() throws ParsingException {
|
public Description getDescription() {
|
||||||
assertPageFetched();
|
assertPageFetched();
|
||||||
// description with more info on links
|
// description with more info on links
|
||||||
String description = getTextFromObject(getVideoSecondaryInfoRenderer().getObject("description"), true);
|
try {
|
||||||
if (description != null && !description.isEmpty()) return new Description(description, Description.HTML);
|
String description = getTextFromObject(getVideoSecondaryInfoRenderer().getObject("description"), true);
|
||||||
|
if (description != null && !description.isEmpty()) return new Description(description, Description.HTML);
|
||||||
|
} catch (ParsingException ignored) {
|
||||||
|
// age-restricted videos cause a ParsingException here
|
||||||
|
}
|
||||||
|
|
||||||
// raw non-html description
|
// raw non-html description
|
||||||
return new Description(playerResponse.getObject("videoDetails").getString("shortDescription"), Description.PLAIN_TEXT);
|
return new Description(playerResponse.getObject("videoDetails").getString("shortDescription"), Description.PLAIN_TEXT);
|
||||||
|
@ -249,8 +259,14 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
@Override
|
@Override
|
||||||
public long getViewCount() throws ParsingException {
|
public long getViewCount() throws ParsingException {
|
||||||
assertPageFetched();
|
assertPageFetched();
|
||||||
String views = getTextFromObject(getVideoPrimaryInfoRenderer().getObject("viewCount")
|
String views = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
views = getTextFromObject(getVideoPrimaryInfoRenderer().getObject("viewCount")
|
||||||
.getObject("videoViewCountRenderer").getObject("viewCount"));
|
.getObject("videoViewCountRenderer").getObject("viewCount"));
|
||||||
|
} catch (ParsingException ignored) {
|
||||||
|
// age-restricted videos cause a ParsingException here
|
||||||
|
}
|
||||||
|
|
||||||
if (isNullOrEmpty(views)) {
|
if (isNullOrEmpty(views)) {
|
||||||
views = playerResponse.getObject("videoDetails").getString("viewCount");
|
views = playerResponse.getObject("videoDetails").getString("viewCount");
|
||||||
|
@ -282,6 +298,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
throw new ParsingException("Could not parse \"" + likesString + "\" as an Integer", nfe);
|
throw new ParsingException("Could not parse \"" + likesString + "\" as an Integer", nfe);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
if (ageLimit == 18) return -1;
|
||||||
throw new ParsingException("Could not get like count", e);
|
throw new ParsingException("Could not get like count", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -305,6 +322,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
throw new ParsingException("Could not parse \"" + dislikesString + "\" as an Integer", nfe);
|
throw new ParsingException("Could not parse \"" + dislikesString + "\" as an Integer", nfe);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
if (ageLimit == 18) return -1;
|
||||||
throw new ParsingException("Could not get dislike count", e);
|
throw new ParsingException("Could not get dislike count", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -314,14 +332,20 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
public String getUploaderUrl() throws ParsingException {
|
public String getUploaderUrl() throws ParsingException {
|
||||||
assertPageFetched();
|
assertPageFetched();
|
||||||
|
|
||||||
|
try {
|
||||||
String uploaderUrl = getUrlFromNavigationEndpoint(getVideoSecondaryInfoRenderer()
|
String uploaderUrl = getUrlFromNavigationEndpoint(getVideoSecondaryInfoRenderer()
|
||||||
.getObject("owner").getObject("videoOwnerRenderer").getObject("navigationEndpoint"));
|
.getObject("owner").getObject("videoOwnerRenderer").getObject("navigationEndpoint"));
|
||||||
if (uploaderUrl != null && !uploaderUrl.isEmpty()) return uploaderUrl;
|
if (!isNullOrEmpty(uploaderUrl)) {
|
||||||
|
return uploaderUrl;
|
||||||
|
}
|
||||||
|
} catch (ParsingException ignored) {
|
||||||
|
// age-restricted videos cause a ParsingException here
|
||||||
|
}
|
||||||
|
|
||||||
String uploaderId = playerResponse.getObject("videoDetails").getString("channelId");
|
String uploaderId = playerResponse.getObject("videoDetails").getString("channelId");
|
||||||
if (uploaderId != null && !uploaderId.isEmpty())
|
if (!isNullOrEmpty(uploaderId)) {
|
||||||
return YoutubeChannelLinkHandlerFactory.getInstance().getUrl("channel/" + uploaderId);
|
return YoutubeChannelLinkHandlerFactory.getInstance().getUrl("channel/" + uploaderId);
|
||||||
|
}
|
||||||
|
|
||||||
throw new ParsingException("Could not get uploader url");
|
throw new ParsingException("Could not get uploader url");
|
||||||
}
|
}
|
||||||
|
@ -330,8 +354,13 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
@Override
|
@Override
|
||||||
public String getUploaderName() throws ParsingException {
|
public String getUploaderName() throws ParsingException {
|
||||||
assertPageFetched();
|
assertPageFetched();
|
||||||
String uploaderName = getTextFromObject(getVideoSecondaryInfoRenderer().getObject("owner")
|
|
||||||
|
String uploaderName = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
uploaderName = getTextFromObject(getVideoSecondaryInfoRenderer().getObject("owner")
|
||||||
.getObject("videoOwnerRenderer").getObject("title"));
|
.getObject("videoOwnerRenderer").getObject("title"));
|
||||||
|
} catch (ParsingException ignored) { }
|
||||||
|
|
||||||
if (isNullOrEmpty(uploaderName)) {
|
if (isNullOrEmpty(uploaderName)) {
|
||||||
uploaderName = playerResponse.getObject("videoDetails").getString("author");
|
uploaderName = playerResponse.getObject("videoDetails").getString("author");
|
||||||
|
@ -346,14 +375,22 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
@Override
|
@Override
|
||||||
public String getUploaderAvatarUrl() throws ParsingException {
|
public String getUploaderAvatarUrl() throws ParsingException {
|
||||||
assertPageFetched();
|
assertPageFetched();
|
||||||
try {
|
|
||||||
String url = getVideoSecondaryInfoRenderer().getObject("owner").getObject("videoOwnerRenderer")
|
|
||||||
.getObject("thumbnail").getArray("thumbnails").getObject(0).getString("url");
|
|
||||||
|
|
||||||
return fixThumbnailUrl(url);
|
String url = null;
|
||||||
} catch (Exception e) {
|
|
||||||
throw new ParsingException("Could not get uploader avatar url", e);
|
try {
|
||||||
|
url = getVideoSecondaryInfoRenderer().getObject("owner").getObject("videoOwnerRenderer")
|
||||||
|
.getObject("thumbnail").getArray("thumbnails").getObject(0).getString("url");
|
||||||
|
} catch (ParsingException ignored) {
|
||||||
|
// age-restricted videos cause a ParsingException here
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isNullOrEmpty(url)) {
|
||||||
|
if (ageLimit == 18) return "";
|
||||||
|
throw new ParsingException("Could not get uploader avatar URL");
|
||||||
|
}
|
||||||
|
|
||||||
|
return fixThumbnailUrl(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
|
@ -872,7 +909,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (videoPrimaryInfoRenderer == null) {
|
if (isNullOrEmpty(videoPrimaryInfoRenderer)) {
|
||||||
throw new ParsingException("Could not find videoPrimaryInfoRenderer");
|
throw new ParsingException("Could not find videoPrimaryInfoRenderer");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -894,7 +931,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (videoSecondaryInfoRenderer == null) {
|
if (isNullOrEmpty(videoSecondaryInfoRenderer)) {
|
||||||
throw new ParsingException("Could not find videoSecondaryInfoRenderer");
|
throw new ParsingException("Could not find videoSecondaryInfoRenderer");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -904,6 +941,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
|
||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
private static String getVideoInfoUrl(final String id, final String sts) {
|
private static String getVideoInfoUrl(final String id, final String sts) {
|
||||||
|
// TODO: Try parsing embedded_player_response first
|
||||||
return "https://www.youtube.com/get_video_info?" + "video_id=" + id +
|
return "https://www.youtube.com/get_video_info?" + "video_id=" + id +
|
||||||
"&eurl=https://youtube.googleapis.com/v/" + id +
|
"&eurl=https://youtube.googleapis.com/v/" + id +
|
||||||
"&sts=" + sts + "&ps=default&gl=US&hl=en";
|
"&sts=" + sts + "&ps=default&gl=US&hl=en";
|
||||||
|
|
Loading…
Reference in New Issue