Extract to two methods.

TeamNewPipe · Aug 3, 2021 · 8d2fccb · 8d2fccb
1 parent 9ef2207
commit 8d2fccb
Showing 1 changed file with 32 additions and 25 deletions.
diff --git a/...c/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeJavaScriptExtractor.java b/...c/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeJavaScriptExtractor.java
@@ -39,8 +39,13 @@ private YoutubeJavaScriptExtractor() {
     @Nonnull
     public static String extractJavaScriptCode(final String videoId) throws ParsingException {
         if (cachedJavaScriptCode == null) {
-            final String playerJsUrl = YoutubeJavaScriptExtractor.cleanJavaScriptUrl(
-                    YoutubeJavaScriptExtractor.extractJavaScriptUrl(videoId));
+            String url;
+            try {
+                url = YoutubeJavaScriptExtractor.extractJavaScriptUrl();
+            } catch (final Exception i) {
+                url = YoutubeJavaScriptExtractor.extractJavaScriptUrl(videoId);
+            }
+            final String playerJsUrl = YoutubeJavaScriptExtractor.cleanJavaScriptUrl(url);
             cachedJavaScriptCode = YoutubeJavaScriptExtractor.downloadJavaScriptCode(playerJsUrl);
         }
 
@@ -60,7 +65,7 @@ public static String extractJavaScriptCode() throws ParsingException {
         return extractJavaScriptCode("d4IGg5dqeO8");
     }
 
-    private static String extractJavaScriptUrl(final String videoId) throws ParsingException {
+    private static String extractJavaScriptUrl() throws ParsingException {
         try {
             final String iframeUrl = "https://www.youtube.com/iframe_api";
             final String iframeContent = NewPipe.getDownloader()
@@ -70,32 +75,34 @@ private static String extractJavaScriptUrl(final String videoId) throws ParsingE
 
             return String.format("https://www.youtube.com/s/player/%s/player_ias.vflset/en_US/base.js", hash);
 
-        } catch (Exception i) {
+        } catch (final Exception i) { }
+
+        throw new ParsingException("Iframe API did not provide YouTube player js url");
+    }
+
+    private static String extractJavaScriptUrl(final String videoId) throws ParsingException {
+        try {
+            final String embedUrl = "https://www.youtube.com/embed/" + videoId;
+            final String embedPageContent = NewPipe.getDownloader()
+                    .get(embedUrl, Localization.DEFAULT).responseBody();
+
             try {
-                final String embedUrl = "https://www.youtube.com/embed/" + videoId;
-                final String embedPageContent = NewPipe.getDownloader()
-                        .get(embedUrl, Localization.DEFAULT).responseBody();
-
-                try {
-                    final String assetsPattern = "\"assets\":.+?\"js\":\\s*(\"[^\"]+\")";
-                    return Parser.matchGroup1(assetsPattern, embedPageContent)
-                            .replace("\\", "").replace("\"", "");
-                } catch (final Parser.RegexException ex) {
-                    // playerJsUrl is still available in the file, just somewhere else TODO
-                    // it is ok not to find it, see how that's handled in getDeobfuscationCode()
-                    final Document doc = Jsoup.parse(embedPageContent);
-                    final Elements elems = doc.select("script").attr("name", "player_ias/base");
-                    for (final Element elem : elems) {
-                        if (elem.attr("src").contains("base.js")) {
-                            return elem.attr("src");
-                        }
+                final String assetsPattern = "\"assets\":.+?\"js\":\\s*(\"[^\"]+\")";
+                return Parser.matchGroup1(assetsPattern, embedPageContent)
+                        .replace("\\", "").replace("\"", "");
+            } catch (final Parser.RegexException ex) {
+                // playerJsUrl is still available in the file, just somewhere else TODO
+                // it is ok not to find it, see how that's handled in getDeobfuscationCode()
+                final Document doc = Jsoup.parse(embedPageContent);
+                final Elements elems = doc.select("script").attr("name", "player_ias/base");
+                for (final Element elem : elems) {
+                    if (elem.attr("src").contains("base.js")) {
+                        return elem.attr("src");
                     }
                 }
-
-            } catch (final Exception i1) {
-                throw new ParsingException("Embedded info did not provide YouTube player js url");
             }
-        }
+
+        } catch (final Exception i) { }
 
         throw new ParsingException("Embedded info did not provide YouTube player js url");
     }