Merge pull request #604 from TiA4f8R/youtubei-api

[YouTube] Use the new internal API in NewPipe Extractor

Author: Stypox

extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsExtractor.java

@@ -2,6 +2,7 @@
 
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 
@@ -17,7 +18,7 @@ public CommentsExtractor(final StreamingService service, final ListLinkHandler u
      * @apiNote Warning: This method is experimental and may get removed in a future release.
      * @return <code>true</code> if the comments are disabled otherwise <code>false</code> (default)
      */
-    public boolean isCommentsDisabled() {
+    public boolean isCommentsDisabled() throws ExtractionException {
         return false;
     }
 

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

@@ -46,13 +46,12 @@ public class ItagItem {
             /// VIDEO ONLY ////////////////////////////////////////////
             //           ID      Type     Format  Resolution  FPS  ///
             /////////////////////////////////////////////////////////
-            // Don't add VideoOnly streams that have normal variants
             new ItagItem(160, VIDEO_ONLY, MPEG_4, "144p"),
             new ItagItem(133, VIDEO_ONLY, MPEG_4, "240p"),
-//          new ItagItem(134, VIDEO_ONLY, MPEG_4, "360p"),
+            new ItagItem(134, VIDEO_ONLY, MPEG_4, "360p"),
             new ItagItem(135, VIDEO_ONLY, MPEG_4, "480p"),
             new ItagItem(212, VIDEO_ONLY, MPEG_4, "480p"),
-//          new ItagItem(136, VIDEO_ONLY, MPEG_4, "720p"),
+            new ItagItem(136, VIDEO_ONLY, MPEG_4, "720p"),
             new ItagItem(298, VIDEO_ONLY, MPEG_4, "720p60", 60),
             new ItagItem(137, VIDEO_ONLY, MPEG_4, "1080p"),
             new ItagItem(299, VIDEO_ONLY, MPEG_4, "1080p60", 60),
@@ -75,6 +74,7 @@ public class ItagItem {
             new ItagItem(313, VIDEO_ONLY, WEBM, "2160p"),
             new ItagItem(315, VIDEO_ONLY, WEBM, "2160p60", 60)
     };
+
     /*//////////////////////////////////////////////////////////////////////////
     // Utils
     //////////////////////////////////////////////////////////////////////////*/

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

@@ -60,6 +60,14 @@ public static String extractJavaScriptCode() throws ParsingException {
         return extractJavaScriptCode("d4IGg5dqeO8");
     }
 
+    /**
+     * Reset the JavaScript code. It will be fetched again the next time
+     * {@link #extractJavaScriptCode()} or {@link #extractJavaScriptCode(String)} is called.
+     */
+    public static void resetJavaScriptCode() {
+        cachedJavaScriptCode = null;
+    }
+
     private static String extractJavaScriptUrl(final String videoId) throws ParsingException {
         try {
             final String embedUrl = "https://www.youtube.com/embed/" + videoId;

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

@@ -79,11 +79,13 @@ private String parseDecodeFunction(final String playerJsCode, final String funct
         }
     }
 
+    @Nonnull
     private String parseWithParenthesisMatching(final String playerJsCode, final String functionName) {
         final String functionBase = functionName + "=function";
         return functionBase + StringUtils.matchToClosingParenthesis(playerJsCode, functionBase) + ";";
     }
 
+    @Nonnull
     private String parseWithRegex(final String playerJsCode, final String functionName) throws Parser.RegexException {
         Pattern functionPattern = Pattern.compile(functionName + "=function(.*?}};)\n",
                 Pattern.DOTALL);