diff --git a/build.gradle b/build.gradle index f9d80df10..4701f58e7 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ allprojects { sourceCompatibility = 1.7 targetCompatibility = 1.7 - version 'v0.20.1' + version 'v0.20.2' group 'com.github.TeamNewPipe' repositories { diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java index 8b60a41ef..0b7e8f866 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java @@ -3,6 +3,10 @@ package org.schabi.newpipe.extractor.services.youtube.extractors; import com.grack.nanojson.JsonArray; import com.grack.nanojson.JsonObject; import com.grack.nanojson.JsonParser; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; import org.mozilla.javascript.Context; import org.mozilla.javascript.Function; import org.mozilla.javascript.ScriptableObject; @@ -100,6 +104,7 @@ public class YoutubeStreamExtractor extends StreamExtractor { private JsonObject videoPrimaryInfoRenderer; private JsonObject videoSecondaryInfoRenderer; private int ageLimit; + private boolean newJsonScheme; @Nonnull private List subtitlesInfos = new ArrayList<>(); @@ -664,27 +669,23 @@ public class YoutubeStreamExtractor extends StreamExtractor { } else { ageLimit = NO_AGE_LIMIT; JsonObject playerConfig; - - // sometimes at random YouTube does not provide the player config, - // so just retry the same request three times - int attempts = 2; - while (true) { - playerConfig = initialAjaxJson.getObject(2).getObject("player", null); - if (playerConfig != null) { - break; - } - - if (attempts <= 0) { - throw new ParsingException( - "YouTube did not provide player config even after three attempts"); - } - initialAjaxJson = getJsonResponse(url, getExtractorLocalization()); - --attempts; - } initialData = initialAjaxJson.getObject(3).getObject("response"); - playerArgs = getPlayerArgs(playerConfig); - playerUrl = getPlayerUrl(playerConfig); + // sometimes at random YouTube does not provide the player config + playerConfig = initialAjaxJson.getObject(2).getObject("player", null); + + if (playerConfig == null) { + newJsonScheme = true; + final EmbeddedInfo info = getEmbeddedInfo(); + final String videoInfoUrl = getVideoInfoUrl(getId(), info.sts); + final String infoPageResponse = downloader.get(videoInfoUrl, getExtractorLocalization()).responseBody(); + videoInfoPage.putAll(Parser.compatParseMap(infoPageResponse)); + playerUrl = info.url; + } else { + playerArgs = getPlayerArgs(playerConfig); + playerUrl = getPlayerUrl(playerConfig); + } + } playerResponse = getPlayerResponse(); @@ -732,6 +733,10 @@ public class YoutubeStreamExtractor extends StreamExtractor { private JsonObject getPlayerResponse() throws ParsingException { try { String playerResponseStr; + if (newJsonScheme) { + return initialAjaxJson.getObject(2).getObject("playerResponse"); + } + if (playerArgs != null) { playerResponseStr = playerArgs.getString("player_response"); } else { @@ -751,11 +756,30 @@ public class YoutubeStreamExtractor extends StreamExtractor { final String embedPageContent = downloader.get(embedUrl, getExtractorLocalization()).responseBody(); // Get player url - final String assetsPattern = "\"assets\":.+?\"js\":\\s*(\"[^\"]+\")"; - String playerUrl = Parser.matchGroup1(assetsPattern, embedPageContent) - .replace("\\", "").replace("\"", ""); + String playerUrl = null; + try { + final String assetsPattern = "\"assets\":.+?\"js\":\\s*(\"[^\"]+\")"; + playerUrl = Parser.matchGroup1(assetsPattern, embedPageContent) + .replace("\\", "").replace("\"", ""); + } catch (Parser.RegexException ex) { + // playerUrl is still available in the file, just somewhere else + final Document doc = Jsoup.parse(embedPageContent); + final Elements elems = doc.select("script").attr("name", "player_ias/base"); + for (Element elem : elems) { + if (elem.attr("src").contains("base.js")) { + playerUrl = elem.attr("src"); + } + } + + if (playerUrl == null) { + throw new ParsingException("Could not get playerUrl"); + } + } + if (playerUrl.startsWith("//")) { playerUrl = HTTPS + playerUrl; + } else if (playerUrl.startsWith("/")) { + playerUrl = HTTPS + "//youtube.com" + playerUrl; } try {