Consider protocol as base url when it is a custom one (e.g. vnd.youtube)

Author: Stypox

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

@@ -55,12 +55,6 @@ public class YoutubeParsingHelper {
     private YoutubeParsingHelper() {
     }
 
-    /**
-     * The official youtube app supports intents in this format, where after the ':' is the videoId.
-     * Accordingly there are other apps sharing streams in this format.
-     */
-    public final static String BASE_YOUTUBE_INTENT_URL = "vnd.youtube";
-
     private static final String HARDCODED_CLIENT_VERSION = "2.20200214.04.00";
     private static String clientVersion;
 

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

@@ -1,10 +1,7 @@
 package org.schabi.newpipe.extractor.services.youtube.linkHandler;
 
-import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.BASE_YOUTUBE_INTENT_URL;
-
 import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 
 import java.util.List;
@@ -17,15 +14,6 @@ public static YoutubeCommentsLinkHandlerFactory getInstance() {
         return instance;
     }
 
-    @Override
-    public ListLinkHandler fromUrl(String url) throws ParsingException {
-        if (url.startsWith(BASE_YOUTUBE_INTENT_URL)){
-            return super.fromUrl(url, BASE_YOUTUBE_INTENT_URL);
-        } else {
-            return super.fromUrl(url);
-        }
-    }
-
     @Override
     public String getUrl(String id) {
         return "https://m.youtube.com/watch?v=" + id;

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

@@ -2,7 +2,6 @@
 
 import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
 import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper;
 import org.schabi.newpipe.extractor.utils.Utils;
@@ -15,8 +14,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper.BASE_YOUTUBE_INTENT_URL;
-
 /*
  * Created by Christian Schabesberger on 02.02.16.
  *
@@ -67,15 +64,6 @@ private static String assertIsId(@Nullable final String id) throws ParsingExcept
         }
     }
 
-    @Override
-    public LinkHandler fromUrl(String url) throws ParsingException {
-        if (url.startsWith(BASE_YOUTUBE_INTENT_URL)) {
-            return super.fromUrl(url, BASE_YOUTUBE_INTENT_URL);
-        } else {
-            return super.fromUrl(url);
-        }
-    }
-
     @Override
     public String getUrl(String id) {
         return "https://www.youtube.com/watch?v=" + id;

extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java

@@ -182,13 +182,18 @@ public static String removeUTF8BOM(String s) {
     }
 
     public static String getBaseUrl(String url) throws ParsingException {
-        URL uri;
         try {
-            uri = stringToURL(url);
+            final URL uri = stringToURL(url);
+            return uri.getProtocol() + "://" + uri.getAuthority();
         } catch (MalformedURLException e) {
+            final String message = e.getMessage();
+            if (message.startsWith("unknown protocol: ")) {
+                System.out.println(message.substring(18));
+                return message.substring(18); // return just the protocol (e.g. vnd.youtube)
+            }
+
             throw new ParsingException("Malformed url: " + url, e);
         }
-        return uri.getProtocol() + "://" + uri.getAuthority();
     }
 
     public static boolean isNullOrEmpty(final String str) {

extractor/src/test/java/org/schabi/newpipe/extractor/utils/UtilsTest.java

@@ -21,4 +21,13 @@ public void testMixedNumberWordToLong() throws ParsingException {
     public void testJoin() {
         assertEquals("some,random,stuff", Utils.join(",", Arrays.asList("some", "random", "stuff")));
     }
+
+    @Test
+    public void testGetBaseUrl() throws ParsingException {
+        assertEquals("https://www.youtube.com", Utils.getBaseUrl("https://www.youtube.com/watch?v=Hu80uDzh8RY"));
+        assertEquals("vnd.youtube", Utils.getBaseUrl("vnd.youtube://www.youtube.com/watch?v=jZViOEv90dI"));
+        assertEquals("vnd.youtube", Utils.getBaseUrl("vnd.youtube:jZViOEv90dI"));
+        assertEquals("vnd.youtube", Utils.getBaseUrl("vnd.youtube://n8X9_MgEdCg"));
+        assertEquals("https://music.youtube.com", Utils.getBaseUrl("https://music.youtube.com/watch?v=O0EDx9WAelc"));
+    }
 }