Adress requested changes in YoutubeParsingHelper

Author: AudricV

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

@@ -75,7 +75,7 @@ private YoutubeParsingHelper() {
 
     private static final String[] HARDCODED_YOUTUBE_MUSIC_KEY =
             {"AIzaSyC9XL3ZjWddXya6X74dJoCTL-WEYFDNX30", "67", "0.1"};
-    private static String[] youtubeMusicKeys;
+    private static String[] youtubeMusicKey;
 
     private static boolean keyAndVersionExtracted = false;
     private static Boolean areHardcodedClientVersionAndKeyValidValue = null;
@@ -341,7 +341,7 @@ public static boolean areHardcodedClientVersionAndKeyValid() throws IOException,
 
     private static void extractClientVersionAndKey() throws IOException, ExtractionException {
         // Don't extract the client version and the innertube key if it has been already extracted
-        if (!keyAndVersionExtracted) return;
+        if (keyAndVersionExtracted) return;
         // Don't provide a search term in order to have a smaller response
         final String url = "https://www.youtube.com/results?search_query=";
         final Map<String, List<String>> headers = new HashMap<>();
@@ -405,7 +405,6 @@ private static void extractClientVersionAndKey() throws IOException, ExtractionE
             try {
                 key = Parser.matchGroup1("innertubeApiKey\":\"([0-9a-zA-Z_-]+?)\"", html);
             } catch (final Parser.RegexException e2) {
-                keyAndVersionExtracted = false;
                 throw new ParsingException("Could not extract client version and key");
             }
         }
@@ -421,7 +420,7 @@ public static String getClientVersion() throws IOException, ExtractionException
             return clientVersion = HARDCODED_CLIENT_VERSION;
         }
 
-        if (!keyAndVersionExtracted) extractClientVersionAndKey();
+        extractClientVersionAndKey();
         return clientVersion;
     }
 
@@ -430,9 +429,11 @@ public static String getClientVersion() throws IOException, ExtractionException
      */
     public static String getKey() throws IOException, ExtractionException {
         if (!isNullOrEmpty(key)) return key;
-        if (areHardcodedClientVersionAndKeyValid()) return key = HARDCODED_KEY;
+        if (areHardcodedClientVersionAndKeyValid()) {
+            return key = HARDCODED_KEY;
+        }
 
-        if (!keyAndVersionExtracted) extractClientVersionAndKey();
+        extractClientVersionAndKey();
         return key;
     }
 
@@ -465,7 +466,7 @@ public static void setNumberGenerator(Random random) {
         numberGenerator = random;
     }
 
-    public static boolean areHardcodedYoutubeMusicKeysValid() throws IOException,
+    public static boolean isHardcodedYoutubeMusicKeyValid() throws IOException,
             ReCaptchaException {
         final String url =
                 "https://music.youtube.com/youtubei/v1/music/get_search_suggestions?alt=json&key="
@@ -510,17 +511,15 @@ public static boolean areHardcodedYoutubeMusicKeysValid() throws IOException,
         headers.put("Content-Type", Collections.singletonList("application/json"));
 
         final Response response = getDownloader().post(url, headers, json);
-        final String responseBody = response.responseBody();
-        final int responseCode = response.responseCode();
         // Ensure to have a valid response
-        return responseBody.length() > 500 && responseCode == 200;
+        return response.responseBody().length() > 500 && response.responseCode() == 200;
     }
 
-    public static String[] getYoutubeMusicKeys() throws IOException, ReCaptchaException,
+    public static String[] getYoutubeMusicKey() throws IOException, ReCaptchaException,
             Parser.RegexException {
-        if (youtubeMusicKeys != null && youtubeMusicKeys.length == 3) return youtubeMusicKeys;
-        if (areHardcodedYoutubeMusicKeysValid()) {
-            return youtubeMusicKeys = HARDCODED_YOUTUBE_MUSIC_KEY;
+        if (youtubeMusicKey != null && youtubeMusicKey.length == 3) return youtubeMusicKey;
+        if (isHardcodedYoutubeMusicKeyValid()) {
+            return youtubeMusicKey = HARDCODED_YOUTUBE_MUSIC_KEY;
         }
 
         final String url = "https://music.youtube.com/";
@@ -552,7 +551,7 @@ public static String[] getYoutubeMusicKeys() throws IOException, ReCaptchaExcept
             }
         }
 
-        return youtubeMusicKeys = new String[]{key, clientName, clientVersion};
+        return youtubeMusicKey = new String[]{key, clientName, clientVersion};
     }
 
     @Nullable

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

@@ -40,7 +40,7 @@ public YoutubeMusicSearchExtractor(final StreamingService service, final SearchQ
     @Override
     public void onFetchPage(@Nonnull final Downloader downloader) throws IOException,
             ExtractionException {
-        final String[] youtubeMusicKeys = YoutubeParsingHelper.getYoutubeMusicKeys();
+        final String[] youtubeMusicKeys = YoutubeParsingHelper.getYoutubeMusicKey();
 
         final String url = "https://music.youtube.com/youtubei/v1/search?alt=json&key=" + youtubeMusicKeys[0];
 
@@ -184,15 +184,15 @@ public InfoItemsPage<InfoItem> getInitialPage() throws ExtractionException, IOEx
     }
 
     @Override
-    public InfoItemsPage<InfoItem> getPage(final Page page) throws IOException,
-            ExtractionException {
+    public InfoItemsPage<InfoItem> getPage(final Page page)
+            throws IOException, ExtractionException {
         if (page == null || isNullOrEmpty(page.getUrl())) {
             throw new IllegalArgumentException("Page doesn't contain an URL");
         }
 
         final InfoItemsSearchCollector collector = new InfoItemsSearchCollector(getServiceId());
 
-        final String[] youtubeMusicKeys = YoutubeParsingHelper.getYoutubeMusicKeys();
+        final String[] youtubeMusicKeys = YoutubeParsingHelper.getYoutubeMusicKey();
 
         // @formatter:off
         byte[] json = JsonWriter.string()
@@ -540,6 +540,6 @@ private Page getNextPageFrom(final JsonArray continuations) throws ParsingExcept
 
         return new Page("https://music.youtube.com/youtubei/v1/search?ctoken=" + continuation
                 + "&continuation=" + continuation + "&itct=" + clickTrackingParams + "&alt=json"
-                + "&key=" + YoutubeParsingHelper.getYoutubeMusicKeys()[0]);
+                + "&key=" + YoutubeParsingHelper.getYoutubeMusicKey()[0]);
     }
 }

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

@@ -33,7 +33,7 @@ public void testAreHardcodedClientVersionAndKeyValid() throws IOException, Extra
     @Test
     public void testAreHardcodedYoutubeMusicKeysValid() throws IOException, ExtractionException {
         assertTrue("Hardcoded YouTube Music keys are not valid anymore",
-                YoutubeParsingHelper.areHardcodedYoutubeMusicKeysValid());
+                YoutubeParsingHelper.isHardcodedYoutubeMusicKeyValid());
     }
 
     @Test