Extract some code to getValidResponseBody()

Author: wb9688

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeMusicSearchExtractor.java

@@ -9,8 +9,6 @@
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.downloader.Downloader;
-import org.schabi.newpipe.extractor.downloader.Response;
-import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
@@ -31,6 +29,7 @@
 import javax.annotation.Nonnull;
 
 import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeParsingHelper.fixThumbnailUrl;
+import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeParsingHelper.getValidResponseBody;
 import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeParsingHelper.getTextFromObject;
 import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeParsingHelper.getUrlFromNavigationEndpoint;
 import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_ALBUMS;
@@ -112,23 +111,7 @@ public void onFetchPage(@Nonnull final Downloader downloader) throws IOException
         headers.put("Referer", Collections.singletonList("music.youtube.com"));
         headers.put("Content-Type", Collections.singletonList("application/json"));
 
-        final Response response = getDownloader().post(url, headers, json);
-
-        if (response.responseCode() == 404) {
-            throw new ContentNotAvailableException("Not found" +
-                    " (\"" + response.responseCode() + " " + response.responseMessage() + "\")");
-        }
-
-        final String responseBody = response.responseBody();
-        if (responseBody.length() < 50) { // ensure to have a valid response
-            throw new ParsingException("JSON response is too short");
-        }
-
-        final String responseContentType = response.getHeader("Content-Type");
-        if (responseContentType != null && responseContentType.toLowerCase().contains("text/html")) {
-            throw new ParsingException("Got HTML document, expected JSON response" +
-                    " (latest url was: \"" + response.latestUrl() + "\")");
-        }
+        final String responseBody = getValidResponseBody(getDownloader().post(url, headers, json));
 
         try {
             initialData = JsonParser.object().from(responseBody);
@@ -232,23 +215,7 @@ public InfoItemsPage<InfoItem> getPage(final String pageUrl) throws IOException,
         headers.put("Referer", Collections.singletonList("music.youtube.com"));
         headers.put("Content-Type", Collections.singletonList("application/json"));
 
-        final Response response = getDownloader().post(pageUrl, headers, json);
-
-        if (response.responseCode() == 404) {
-            throw new ContentNotAvailableException("Not found" +
-                    " (\"" + response.responseCode() + " " + response.responseMessage() + "\")");
-        }
-
-        final String responseBody = response.responseBody();
-        if (responseBody.length() < 50) { // ensure to have a valid response
-            throw new ParsingException("JSON response is too short");
-        }
-
-        final String responseContentType = response.getHeader("Content-Type");
-        if (responseContentType != null && responseContentType.toLowerCase().contains("text/html")) {
-            throw new ParsingException("Got HTML document, expected JSON response" +
-                    " (latest url was: \"" + response.latestUrl() + "\")");
-        }
+        final String responseBody = getValidResponseBody(getDownloader().post(pageUrl, headers, json));
 
         final JsonObject ajaxJson;
         try {

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

@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.text.ParseException;
@@ -427,12 +428,8 @@ public static String fixThumbnailUrl(String thumbnailUrl) {
         return thumbnailUrl;
     }
 
-    public static JsonArray getJsonResponse(String url, Localization localization) throws IOException, ExtractionException {
-        Map<String, List<String>> headers = new HashMap<>();
-        headers.put("X-YouTube-Client-Name", Collections.singletonList("1"));
-        headers.put("X-YouTube-Client-Version", Collections.singletonList(getClientVersion()));
-        final Response response = getDownloader().get(url, headers, localization);
-
+    public static String getValidResponseBody(final Response response)
+            throws ParsingException, MalformedURLException {
         if (response.responseCode() == 404) {
             throw new ContentNotAvailableException("Not found" +
                     " (\"" + response.responseCode() + " " + response.responseMessage() + "\")");
@@ -453,11 +450,24 @@ public static JsonArray getJsonResponse(String url, Localization localization) t
         }
 
         final String responseContentType = response.getHeader("Content-Type");
-        if (responseContentType != null && responseContentType.toLowerCase().contains("text/html")) {
+        if (responseContentType != null
+                && responseContentType.toLowerCase().contains("text/html")) {
             throw new ParsingException("Got HTML document, expected JSON response" +
                     " (latest url was: \"" + response.latestUrl() + "\")");
         }
 
+        return responseBody;
+    }
+
+    public static JsonArray getJsonResponse(final String url, final Localization localization)
+            throws IOException, ExtractionException {
+        Map<String, List<String>> headers = new HashMap<>();
+        headers.put("X-YouTube-Client-Name", Collections.singletonList("1"));
+        headers.put("X-YouTube-Client-Version", Collections.singletonList(getClientVersion()));
+        final Response response = getDownloader().get(url, headers, localization);
+
+        final String responseBody = getValidResponseBody(response);
+
         try {
             return JsonParser.array().from(responseBody);
         } catch (JsonParserException e) {
@@ -469,6 +479,7 @@ public static JsonArray getJsonResponse(String url, Localization localization) t
      * Shared alert detection function, multiple endpoints return the error similarly structured.
      * <p>
      * Will check if the object has an alert of the type "ERROR".
+     * </p>
      *
      * @param initialData the object which will be checked if an alert is present
      * @throws ContentNotAvailableException if an alert is detected