[YouTube] Avoid crashing by letting exceptions bubble up

Author: mauriciocolli

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeParsingHelper.java

@@ -5,7 +5,6 @@
 import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonParser;
 import com.grack.nanojson.JsonParserException;
-
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.schabi.newpipe.extractor.downloader.Response;
@@ -22,12 +21,7 @@
 import java.net.URLDecoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.schabi.newpipe.extractor.NewPipe.getDownloader;
 import static org.schabi.newpipe.extractor.utils.Utils.HTTP;
@@ -177,92 +171,84 @@ public static JsonObject getInitialData(String html) throws ParsingException {
         }
     }
 
-    public static boolean isHardcodedClientVersionValid() throws IOException {
-        try {
-            final String url = "https://www.youtube.com/results?search_query=test&pbj=1";
-
-            Map<String, List<String>> headers = new HashMap<>();
-            headers.put("X-YouTube-Client-Name", Collections.singletonList("1"));
-            headers.put("X-YouTube-Client-Version",
-                    Collections.singletonList(HARDCODED_CLIENT_VERSION));
-            final String response = getDownloader().get(url, headers).responseBody();
-            if (response.length() > 50) { // ensure to have a valid response
-                return true;
-            }
-        } catch (ReCaptchaException ignored) {}
+    public static boolean isHardcodedClientVersionValid() throws IOException, ExtractionException {
+        final String url = "https://www.youtube.com/results?search_query=test&pbj=1";
 
-        return false;
+        Map<String, List<String>> headers = new HashMap<>();
+        headers.put("X-YouTube-Client-Name", Collections.singletonList("1"));
+        headers.put("X-YouTube-Client-Version",
+                Collections.singletonList(HARDCODED_CLIENT_VERSION));
+        final String response = getDownloader().get(url, headers).responseBody();
+
+        return response.length() > 50; // ensure to have a valid response
     }
 
     /**
      * Get the client version from a page
      * @return
      * @throws ParsingException
      */
-    public static String getClientVersion() throws ParsingException, IOException {
+    public static String getClientVersion() throws IOException, ExtractionException {
         if (clientVersion != null && !clientVersion.isEmpty()) return clientVersion;
 
         if (isHardcodedClientVersionValid()) {
             clientVersion = HARDCODED_CLIENT_VERSION;
             return clientVersion;
         }
 
-        // Try extracting it from YouTube's website otherwise
-        try {
-            final String url = "https://www.youtube.com/results?search_query=test";
-            final String html = getDownloader().get(url).responseBody();
-            JsonObject initialData = getInitialData(html);
-            JsonArray serviceTrackingParams = initialData.getObject("responseContext").getArray("serviceTrackingParams");
-            String shortClientVersion = null;
-
-            // try to get version from initial data first
-            for (Object service : serviceTrackingParams) {
-                JsonObject s = (JsonObject) service;
-                if (s.getString("service").equals("CSI")) {
-                    JsonArray params = s.getArray("params");
-                    for (Object param : params) {
-                        JsonObject p = (JsonObject) param;
-                        String key = p.getString("key");
-                        if (key != null && key.equals("cver")) {
-                            clientVersion = p.getString("value");
-                            return clientVersion;
-                        }
+        final String url = "https://www.youtube.com/results?search_query=test";
+        final String html = getDownloader().get(url).responseBody();
+        JsonObject initialData = getInitialData(html);
+        JsonArray serviceTrackingParams = initialData.getObject("responseContext").getArray("serviceTrackingParams");
+        String shortClientVersion = null;
+
+        // try to get version from initial data first
+        for (Object service : serviceTrackingParams) {
+            JsonObject s = (JsonObject) service;
+            if (s.getString("service").equals("CSI")) {
+                JsonArray params = s.getArray("params");
+                for (Object param : params) {
+                    JsonObject p = (JsonObject) param;
+                    String key = p.getString("key");
+                    if (key != null && key.equals("cver")) {
+                        clientVersion = p.getString("value");
+                        return clientVersion;
                     }
-                } else if (s.getString("service").equals("ECATCHER")) {
-                    // fallback to get a shortened client version which does not contain the last two digits
-                    JsonArray params = s.getArray("params");
-                    for (Object param : params) {
-                        JsonObject p = (JsonObject) param;
-                        String key = p.getString("key");
-                        if (key != null && key.equals("client.version")) {
-                            shortClientVersion = p.getString("value");
-                        }
+                }
+            } else if (s.getString("service").equals("ECATCHER")) {
+                // fallback to get a shortened client version which does not contain the last two digits
+                JsonArray params = s.getArray("params");
+                for (Object param : params) {
+                    JsonObject p = (JsonObject) param;
+                    String key = p.getString("key");
+                    if (key != null && key.equals("client.version")) {
+                        shortClientVersion = p.getString("value");
                     }
                 }
             }
+        }
 
-            String contextClientVersion;
-            String[] patterns = {
-                    "INNERTUBE_CONTEXT_CLIENT_VERSION\":\"([0-9\\.]+?)\"",
-                    "innertube_context_client_version\":\"([0-9\\.]+?)\"",
-                    "client.version=([0-9\\.]+)"
-            };
-            for (String pattern : patterns) {
-                try {
-                    contextClientVersion = Parser.matchGroup1(pattern, html);
-                    if (contextClientVersion != null && !contextClientVersion.isEmpty()) {
-                        clientVersion = contextClientVersion;
-                        return clientVersion;
-                    }
-                } catch (Exception ignored) {
+        String contextClientVersion;
+        String[] patterns = {
+                "INNERTUBE_CONTEXT_CLIENT_VERSION\":\"([0-9\\.]+?)\"",
+                "innertube_context_client_version\":\"([0-9\\.]+?)\"",
+                "client.version=([0-9\\.]+)"
+        };
+        for (String pattern : patterns) {
+            try {
+                contextClientVersion = Parser.matchGroup1(pattern, html);
+                if (contextClientVersion != null && !contextClientVersion.isEmpty()) {
+                    clientVersion = contextClientVersion;
+                    return clientVersion;
                 }
+            } catch (Exception ignored) {
             }
+        }
 
-            if (shortClientVersion != null) {
-                clientVersion = shortClientVersion;
-                return clientVersion;
-            }
-        } catch (Exception ignored) {}
+        if (shortClientVersion != null) {
+            clientVersion = shortClientVersion;
+            return clientVersion;
+        }
 
         throw new ParsingException("Could not get client version");
     }

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelperTest.java

@@ -4,6 +4,7 @@
 import org.junit.Test;
 import org.schabi.newpipe.DownloaderTestImpl;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeParsingHelper;
 
 import java.io.IOException;
@@ -17,7 +18,7 @@ public static void setUp() {
     }
 
     @Test
-    public void testIsHardcodedClientVersionValid() throws IOException {
+    public void testIsHardcodedClientVersionValid() throws IOException, ExtractionException {
         assertTrue("Hardcoded client version is not valid anymore",
                 YoutubeParsingHelper.isHardcodedClientVersionValid());
     }