kavin/NewPipeExtractor
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipeExtractor.git synced 2025-04-27 23:40:36 +05:30
Code Issues Projects Releases Wiki Activity

Adress requested changes in YoutubeStreamExtractor

Browse Source
This commit is contained in:
TiA4f8R 2021-06-06 15:40:19 +02:00
parent 632772d17f
commit accd5ddef3
No known key found for this signature in database
GPG Key ID: E6D3E7F5949450DD
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
View File

@ -719,17 +719,12 @@ public class YoutubeStreamExtractor extends StreamExtractor {
.done()) .done())
.getBytes(UTF_8); .getBytes(UTF_8);
// This boolean is needed if we don't want to fetch again the JSON player if the sts string
// is not null.
boolean stsKnown = false;
// Put the sts string if we already know it so we don't have to fetch again the player // Put the sts string if we already know it so we don't have to fetch again the player
// endpoint of the desktop internal API if something went wrong when parsing the Android // endpoint of the desktop internal API if something went wrong when parsing the Android
// API. // API.
if (sts != null) { if (sts != null) {
playerResponse = getJsonPostResponse("player", createPlayerBodyWithSts(localization, playerResponse = getJsonPostResponse("player", createPlayerBodyWithSts(localization,
contentCountry, videoId), localization); contentCountry, videoId), localization);
stsKnown = true;
} else { } else {
playerResponse = getJsonPostResponse("player", body, localization); playerResponse = getJsonPostResponse("player", body, localization);
} }
@ -760,7 +755,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
streamingData = playerResponse.getObject("streamingData"); streamingData = playerResponse.getObject("streamingData");
if (hasOtfStreams() || isCipherProtectedContent()) { if (hasOtfStreams() || isCipherProtectedContent()) {
fetchAndroidMobileJsonPlayer(contentCountry, localization, videoId, stsKnown); fetchAndroidMobileJsonPlayer(contentCountry, localization, videoId);
} }
} }
@ -777,11 +772,10 @@ public class YoutubeStreamExtractor extends StreamExtractor {
if (status.equalsIgnoreCase("login_required")) { if (status.equalsIgnoreCase("login_required")) {
if (reason == null) { if (reason == null) {
final String message = playabilityStatus.getArray("messages").getString(0); final String message = playabilityStatus.getArray("messages").getString(0);
if (message != null && message.equals( if (message != null && message.contains("private")) {
"This is a private video. Please sign in to verify that you may see it.")) {
throw new PrivateContentException("This video is private."); throw new PrivateContentException("This video is private.");
} }
} else if (reason.equals("Sign in to confirm your age")) { } else if (reason.contains("age")) {
// No streams can be fetched, therefore throw an AgeRestrictedContentException // No streams can be fetched, therefore throw an AgeRestrictedContentException
// explicitly. // explicitly.
throw new AgeRestrictedContentException( throw new AgeRestrictedContentException(
@ -790,23 +784,22 @@ public class YoutubeStreamExtractor extends StreamExtractor {
} }
if (status.equalsIgnoreCase("unplayable")) { if (status.equalsIgnoreCase("unplayable")) {
if (reason != null) { if (reason != null) {
if (reason.equals("This video is only available to Music Premium members")) { if (reason.contains("Music Premium")) {
throw new YoutubeMusicPremiumContentException(); throw new YoutubeMusicPremiumContentException();
} }
if (reason.equals("This video requires payment to watch.")) { if (reason.contains("payment")) {
throw new PaidContentException("This video is a paid video"); throw new PaidContentException("This video is a paid video");
} }
if (reason.equals("Join this channel to get access to members-only content like this video, and other exclusive perks.") if (reason.contains("members-only")) {
|| reason.equals("Join this channel to get access to members-only content like this video and other exclusive perks.")) { throw new PaidContentException(
throw new PaidContentException("This video is only available for members of the channel of this video"); "This video is only available for members of the channel of this video");
} }
if (reason.equals("Video unavailable")) { if (reason.contains("unavailable")) {
final String detailedErrorMessage = getTextFromObject(playabilityStatus final String detailedErrorMessage = getTextFromObject(playabilityStatus
.getObject("errorScreen").getObject("playerErrorMessageRenderer") .getObject("errorScreen").getObject("playerErrorMessageRenderer")
.getObject("subreason")); .getObject("subreason"));
if (detailedErrorMessage != null) { if (detailedErrorMessage != null) {
if (detailedErrorMessage.equals( if (detailedErrorMessage.contains("country")) {
"The uploader has not made this video available in your country.")) {
throw new GeographicRestrictionException( throw new GeographicRestrictionException(
"This video is not available in user's country."); "This video is not available in user's country.");
} }
@ -827,8 +820,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
*/ */
private void fetchAndroidMobileJsonPlayer(final ContentCountry contentCountry, private void fetchAndroidMobileJsonPlayer(final ContentCountry contentCountry,
final Localization localization, final Localization localization,
final String videoId, final String videoId) throws ExtractionException,
final boolean stsKnown) throws ExtractionException,
IOException { IOException {
JsonObject mobilePlayerResponse = null; JsonObject mobilePlayerResponse = null;
final byte[] mobileBody = JsonWriter.string(prepareMobileJsonBuilder(localization, final byte[] mobileBody = JsonWriter.string(prepareMobileJsonBuilder(localization,
@ -851,7 +843,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
// The cipher signatures from the player endpoint without a timestamp are invalid so // The cipher signatures from the player endpoint without a timestamp are invalid so
// download it again only if we didn't have a signatureTimestamp before fetching the // download it again only if we didn't have a signatureTimestamp before fetching the
// data of this video (the sts string). // data of this video (the sts string).
if (!stsKnown && isCipherProtectedContent()) { if (sts == null && isCipherProtectedContent()) {
getStsFromPlayerJs(); getStsFromPlayerJs();
final JsonObject playerResponseWithSignatureTimestamp = getJsonPostResponse( final JsonObject playerResponseWithSignatureTimestamp = getJsonPostResponse(
"player", createPlayerBodyWithSts(localization, contentCountry, videoId), "player", createPlayerBodyWithSts(localization, contentCountry, videoId),
@ -865,9 +857,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
} }
private void fetchVideoInfoPage() throws ParsingException, ReCaptchaException, IOException { private void fetchVideoInfoPage() throws ParsingException, ReCaptchaException, IOException {
if (sts == null) { getStsFromPlayerJs();
getStsFromPlayerJs();
}
final String videoInfoUrl = getVideoInfoUrl(getId(), sts); final String videoInfoUrl = getVideoInfoUrl(getId(), sts);
final String infoPageResponse = NewPipe.getDownloader() final String infoPageResponse = NewPipe.getDownloader()
.get(videoInfoUrl, getExtractorLocalization()).responseBody(); .get(videoInfoUrl, getExtractorLocalization()).responseBody();