changed getId() to remove duplicate code

Author: B0pol

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

@@ -3,12 +3,7 @@
 import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
-import org.schabi.newpipe.extractor.utils.Utils;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.List;
 
 public class YoutubeCommentsLinkHandlerFactory extends ListLinkHandlerFactory {
@@ -19,160 +14,14 @@ public static YoutubeCommentsLinkHandlerFactory getInstance() {
         return instance;
     }
 
-    private static String assertIsID(String id) throws ParsingException {
-        if (id == null || !id.matches("[a-zA-Z0-9_-]{11}")) {
-            throw new ParsingException("The given string is not a Youtube-Video-ID");
-        }
-
-        return id;
-    }
-
     @Override
     public String getUrl(String id) {
         return "https://m.youtube.com/watch?v=" + id;
     }
 
     @Override
     public String getId(String urlString) throws ParsingException, IllegalArgumentException {
-        try {
-            URI uri = new URI(urlString);
-            String scheme = uri.getScheme();
-
-            if (scheme != null && (scheme.equals("vnd.youtube") || scheme.equals("vnd.youtube.launch"))) {
-                String schemeSpecificPart = uri.getSchemeSpecificPart();
-                if (schemeSpecificPart.startsWith("//")) {
-                    urlString = "https:" + schemeSpecificPart;
-                } else {
-                    return assertIsID(schemeSpecificPart);
-                }
-            }
-        } catch (URISyntaxException ignored) {
-        }
-
-        URL url;
-        try {
-            url = Utils.stringToURL(urlString);
-        } catch (MalformedURLException e) {
-            throw new IllegalArgumentException("The given URL is not valid");
-        }
-
-        String host = url.getHost();
-        String path = url.getPath();
-        // remove leading "/" of URL-path if URL-path is given
-        if (!path.isEmpty()) {
-            path = path.substring(1);
-        }
-
-        if (!Utils.isHTTP(url) || !(YoutubeParsingHelper.isYoutubeURL(url) ||
-                YoutubeParsingHelper.isYoutubeServiceURL(url) || YoutubeParsingHelper.isHooktubeURL(url) ||
-                YoutubeParsingHelper.isInvidioURL(url))) {
-            if (host.equalsIgnoreCase("googleads.g.doubleclick.net")) {
-                throw new FoundAdException("Error found ad: " + urlString);
-            }
-
-            throw new ParsingException("The url is not a Youtube-URL");
-        }
-
-        if (YoutubePlaylistLinkHandlerFactory.getInstance().acceptUrl(urlString)) {
-            throw new ParsingException("Error no suitable url: " + urlString);
-        }
-
-        // using uppercase instead of lowercase, because toLowercase replaces some unicode characters
-        // with their lowercase ASCII equivalent. Using toLowercase could result in faultily matching unicode urls.
-        switch (host.toUpperCase()) {
-            case "WWW.YOUTUBE-NOCOOKIE.COM": {
-                if (path.startsWith("embed/")) {
-                    String id = path.split("/")[1];
-
-                    return assertIsID(id);
-                }
-
-                break;
-            }
-
-            case "YOUTUBE.COM":
-            case "WWW.YOUTUBE.COM":
-            case "M.YOUTUBE.COM":
-            case "MUSIC.YOUTUBE.COM": {
-                if (path.equals("attribution_link")) {
-                    String uQueryValue = Utils.getQueryValue(url, "u");
-
-                    URL decodedURL;
-                    try {
-                        decodedURL = Utils.stringToURL("http://www.youtube.com" + uQueryValue);
-                    } catch (MalformedURLException e) {
-                        throw new ParsingException("Error no suitable url: " + urlString);
-                    }
-
-                    String viewQueryValue = Utils.getQueryValue(decodedURL, "v");
-                    return assertIsID(viewQueryValue);
-                }
-
-                if (path.startsWith("embed/")) {
-                    String id = path.split("/")[1];
-
-                    return assertIsID(id);
-                }
-
-                String viewQueryValue = Utils.getQueryValue(url, "v");
-                return assertIsID(viewQueryValue);
-            }
-
-            case "YOUTU.BE": {
-                String viewQueryValue = Utils.getQueryValue(url, "v");
-                if (viewQueryValue != null) {
-                    return assertIsID(viewQueryValue);
-                }
-
-                return assertIsID(path);
-            }
-
-            case "HOOKTUBE.COM": {
-                if (path.startsWith("v/")) {
-                    String id = path.substring("v/".length());
-
-                    return assertIsID(id);
-                }
-                if (path.startsWith("watch/")) {
-                    String id = path.substring("watch/".length());
-
-                    return assertIsID(id);
-                }
-                // there is no break-statement here on purpose so the next code-block gets also run for hooktube
-            }
-
-            case "WWW.INVIDIO.US":
-            case "DEV.INVIDIO.US":
-            case "INVIDIO.US":
-            case "INVIDIOUS.SNOPYTA.ORG":
-            case "DE.INVIDIOUS.SNOPYTA.ORG":
-            case "FI.INVIDIOUS.SNOPYTA.ORG":
-            case "VID.WXZM.SX":
-            case "INVIDIOUS.KABI.TK":
-            case "INVIDIOU.SH":
-            case "WWW.INVIDIOU.SH":
-            case "NO.INVIDIOU.SH":
-            case "INVIDIOUS.ENKIRTON.NET":
-            case "TUBE.POAL.CO":
-            case "INVIDIOUS.13AD.DE":
-            case "YT.ELUKERIO.ORG": { // code-block for hooktube.com and Invidious instances
-                if (path.equals("watch")) {
-                    String viewQueryValue = Utils.getQueryValue(url, "v");
-                    if (viewQueryValue != null) {
-                        return assertIsID(viewQueryValue);
-                    }
-                }
-                if (path.startsWith("embed/")) {
-                    String id = path.substring("embed/".length());
-
-                    return assertIsID(id);
-                }
-
-                break;
-            }
-        }
-
-        throw new ParsingException("Error no suitable url: " + urlString);
+        return YoutubeStreamLinkHandlerFactory.getInstance().getId(urlString); //we need the same id, avoids duplicate code
     }
 
     @Override