Merge pull request #415 from wb9688/fix-ytinitialdata

Fix parsing new ytInitialData
TeamNewPipe · Oct 16, 2020 · f82eda9 · f82eda9
2 parents 1a9bc8c + be9a6f9
commit f82eda9
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...tor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/...tor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
@@ -197,8 +197,13 @@ public static Calendar parseDateFrom(String textualUploadDate) throws ParsingExc
 
     public static JsonObject getInitialData(String html) throws ParsingException {
         try {
-            String initialData = Parser.matchGroup1("window\\[\"ytInitialData\"\\]\\s*=\\s*(\\{.*?\\});", html);
-            return JsonParser.object().from(initialData);
+            try {
+                final String initialData = Parser.matchGroup1("window\\[\"ytInitialData\"\\]\\s*=\\s*(\\{.*?\\});", html);
+                return JsonParser.object().from(initialData);
+            } catch (Parser.RegexException e) {
+                final String initialData = Parser.matchGroup1("var\\s*ytInitialData\\s*=\\s*(\\{.*?\\});", html);
+                return JsonParser.object().from(initialData);
+            }
         } catch (JsonParserException | Parser.RegexException e) {
             throw new ParsingException("Could not get ytInitialData", e);
         }