Add support for YouTube Music search

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

@@ -2,23 +2,43 @@ package org.schabi.newpipe.extractor.services.youtube.extractors;
 
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
+import com.grack.nanojson.JsonParser;
+import com.grack.nanojson.JsonParserException;
+import com.grack.nanojson.JsonWriter;
 
 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;
 import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandler;
+import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.localization.TimeAgoParser;
 import org.schabi.newpipe.extractor.search.InfoItemsSearchCollector;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
+import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeParsingHelper;
+import org.schabi.newpipe.extractor.utils.Utils;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 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.getJsonResponse;
 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;
+import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_ARTISTS;
+import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_PLAYLISTS;
+import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_SONGS;
+import static org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory.MUSIC_VIDEOS;
 
 /*
  * Created by Christian Schabesberger on 22.07.2018
@@ -49,21 +69,110 @@ public class YoutubeSearchExtractor extends SearchExtractor {
 
     @Override
     public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
+        if (isMusicSearch()) {
+            final String[] youtubeMusicKeys = YoutubeParsingHelper.getYoutubeMusicKeys();
+
+            final String url = "https://music.youtube.com/youtubei/v1/search?alt=json&key=" + youtubeMusicKeys[0];
+
+            String params = null;
+
+            switch (getLinkHandler().getContentFilters().get(0)) {
+                case MUSIC_SONGS:
+                    params = "Eg-KAQwIARAAGAAgACgAMABqChAEEAUQAxAKEAk%3D";
+                    break;
+                case MUSIC_VIDEOS:
+                    params = "Eg-KAQwIABABGAAgACgAMABqChAEEAUQAxAKEAk%3D";
+                    break;
+                case MUSIC_ALBUMS:
+                    params = "Eg-KAQwIABAAGAEgACgAMABqChAEEAUQAxAKEAk%3D";
+                    break;
+                case MUSIC_PLAYLISTS:
+                    params = "Eg-KAQwIABAAGAAgACgBMABqChAEEAUQAxAKEAk%3D";
+                    break;
+                case MUSIC_ARTISTS:
+                    params = "Eg-KAQwIABAAGAAgASgAMABqChAEEAUQAxAKEAk%3D";
+                    break;
+            }
+
+            // @formatter:off
+            byte[] json = JsonWriter.string()
+                .object()
+                    .object("context")
+                        .object("client")
+                            .value("clientName", "WEB_REMIX")
+                            .value("clientVersion", youtubeMusicKeys[2])
+                            .value("hl", "en")
+                            .value("gl", getExtractorContentCountry().getCountryCode())
+                            .array("experimentIds").end()
+                            .value("experimentsToken", "")
+                            .value("utcOffsetMinutes", 0)
+                            .object("locationInfo").end()
+                            .object("musicAppInfo").end()
+                        .end()
+                        .object("capabilities").end()
+                        .object("request")
+                            .array("internalExperimentFlags").end()
+                            .object("sessionIndex").end()
+                        .end()
+                        .object("activePlayers").end()
+                        .object("user")
+                            .value("enableSafetyMode", false)
+                        .end()
+                    .end()
+                    .value("query", getSearchString())
+                    .value("params", params)
+                .end().done().getBytes("UTF-8");
+            // @formatter:on
+
+            Map<String, List<String>> headers = new HashMap<>();
+            headers.put("X-YouTube-Client-Name", Collections.singletonList(youtubeMusicKeys[1]));
+            headers.put("X-YouTube-Client-Version", Collections.singletonList(youtubeMusicKeys[2]));
+            headers.put("Origin", Collections.singletonList("https://music.youtube.com"));
+            headers.put("Content-Type", Collections.singletonList("application/json"));
+
+            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() + "\")");
+            }
+
+            try {
+                initialData = JsonParser.object().from(responseBody);
+            } catch (JsonParserException e) {
+                throw new ParsingException("Could not parse JSON", e);
+            }
+        } else {
             final String url = getUrl() + "&pbj=1";
 
             final JsonArray ajaxJson = getJsonResponse(url, getExtractorLocalization());
 
             initialData = ajaxJson.getObject(1).getObject("response");
         }
+    }
 
     @Nonnull
     @Override
     public String getUrl() throws ParsingException {
+        if (isMusicSearch()) return super.getUrl();
         return super.getUrl() + "&gl=" + getExtractorContentCountry().getCountryCode();
     }
 
     @Override
     public String getSearchSuggestion() throws ParsingException {
+        if (isMusicSearch()) return "";
+
         JsonObject showingResultsForRenderer = initialData.getObject("contents")
                 .getObject("twoColumnSearchResultsRenderer").getObject("primaryContents")
                 .getObject("sectionListRenderer").getArray("contents").getObject(0)
@@ -78,24 +187,37 @@ public class YoutubeSearchExtractor extends SearchExtractor {
 
     @Nonnull
     @Override
-    public InfoItemsPage<InfoItem> getInitialPage() throws ExtractionException {
+    public InfoItemsPage<InfoItem> getInitialPage() throws ExtractionException, IOException {
         final InfoItemsSearchCollector collector = new InfoItemsSearchCollector(getServiceId());
+
+        if (isMusicSearch()) {
+            JsonArray sections = initialData.getObject("contents").getObject("sectionListRenderer")
+                    .getArray("contents").getObject(0).getObject("musicShelfRenderer").getArray("contents");
+
+            collectMusicStreamsFrom(collector, sections);
+        } else {
             JsonArray sections = initialData.getObject("contents").getObject("twoColumnSearchResultsRenderer")
                     .getObject("primaryContents").getObject("sectionListRenderer").getArray("contents");
 
             for (Object section : sections) {
                 collectStreamsFrom(collector, ((JsonObject) section).getObject("itemSectionRenderer").getArray("contents"));
             }
+        }
 
         return new InfoItemsPage<>(collector, getNextPageUrl());
     }
 
     @Override
-    public String getNextPageUrl() throws ExtractionException {
+    public String getNextPageUrl() throws ExtractionException, IOException {
+        if (isMusicSearch()) {
+            return getNextPageUrlFrom(initialData.getObject("contents").getObject("sectionListRenderer")
+                    .getArray("contents").getObject(0).getObject("musicShelfRenderer").getArray("continuations"));
+        } else {
             return getNextPageUrlFrom(initialData.getObject("contents").getObject("twoColumnSearchResultsRenderer")
                     .getObject("primaryContents").getObject("sectionListRenderer").getArray("contents")
                     .getObject(0).getObject("itemSectionRenderer").getArray("continuations"));
         }
+    }
 
     @Override
     public InfoItemsPage<InfoItem> getPage(String pageUrl) throws IOException, ExtractionException {
@@ -104,19 +226,97 @@ public class YoutubeSearchExtractor extends SearchExtractor {
         }
 
         final InfoItemsSearchCollector collector = new InfoItemsSearchCollector(getServiceId());
+
+        JsonArray continuations;
+
+        if (isMusicSearch()) {
+            final String[] youtubeMusicKeys = YoutubeParsingHelper.getYoutubeMusicKeys();
+
+            // @formatter:off
+            byte[] json = JsonWriter.string()
+                .object()
+                    .object("context")
+                        .object("client")
+                            .value("clientName", "WEB_REMIX")
+                            .value("clientVersion", youtubeMusicKeys[2])
+                            .value("hl", "en")
+                            .value("gl", getExtractorContentCountry().getCountryCode())
+                            .array("experimentIds").end()
+                            .value("experimentsToken", "")
+                            .value("utcOffsetMinutes", 0)
+                            .object("locationInfo").end()
+                            .object("musicAppInfo").end()
+                        .end()
+                        .object("capabilities").end()
+                        .object("request")
+                            .array("internalExperimentFlags").end()
+                            .object("sessionIndex").end()
+                        .end()
+                        .object("activePlayers").end()
+                        .object("user")
+                            .value("enableSafetyMode", false)
+                        .end()
+                    .end()
+                .end().done().getBytes("UTF-8");
+            // @formatter:on
+
+            Map<String, List<String>> headers = new HashMap<>();
+            headers.put("X-YouTube-Client-Name", Collections.singletonList(youtubeMusicKeys[1]));
+            headers.put("X-YouTube-Client-Version", Collections.singletonList(youtubeMusicKeys[2]));
+            headers.put("Origin", Collections.singletonList("https://music.youtube.com"));
+            headers.put("Content-Type", Collections.singletonList("application/json"));
+
+            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 JsonObject ajaxJson;
+            try {
+                ajaxJson = JsonParser.object().from(responseBody);
+            } catch (JsonParserException e) {
+                throw new ParsingException("Could not parse JSON", e);
+            }
+
+            if (ajaxJson.getObject("continuationContents") == null) return new InfoItemsPage<>(collector, null);
+
+            JsonObject musicShelfContinuation = ajaxJson.getObject("continuationContents").getObject("musicShelfContinuation");
+
+            collectMusicStreamsFrom(collector, musicShelfContinuation.getArray("contents"));
+            continuations = musicShelfContinuation.getArray("continuations");
+        } else {
             final JsonArray ajaxJson = getJsonResponse(pageUrl, getExtractorLocalization());
 
             JsonObject itemSectionRenderer = ajaxJson.getObject(1).getObject("response")
                     .getObject("continuationContents").getObject("itemSectionContinuation");
 
             collectStreamsFrom(collector, itemSectionRenderer.getArray("contents"));
+            continuations = itemSectionRenderer.getArray("continuations");
+        }
 
-        return new InfoItemsPage<>(collector, getNextPageUrlFrom(itemSectionRenderer.getArray("continuations")));
+        return new InfoItemsPage<>(collector, getNextPageUrlFrom(continuations));
+    }
+
+    private boolean isMusicSearch() {
+        final List<String> contentFilters = getLinkHandler().getContentFilters();
+        if (contentFilters.size() > 0 && contentFilters.get(0).startsWith("music_")) return true;
+        return false;
     }
 
     private void collectStreamsFrom(InfoItemsSearchCollector collector, JsonArray videos) throws NothingFoundException, ParsingException {
-        collector.reset();
-
         final TimeAgoParser timeAgoParser = getTimeAgoParser();
 
         for (Object item : videos) {
@@ -133,7 +333,180 @@ public class YoutubeSearchExtractor extends SearchExtractor {
         }
     }
 
-    private String getNextPageUrlFrom(JsonArray continuations) throws ParsingException {
+    private void collectMusicStreamsFrom(InfoItemsSearchCollector collector, JsonArray videos) {
+        final TimeAgoParser timeAgoParser = getTimeAgoParser();
+
+        for (Object item : videos) {
+            final JsonObject info = ((JsonObject) item).getObject("musicResponsiveListItemRenderer");
+            if (info != null) {
+                final String searchType = getLinkHandler().getContentFilters().get(0);
+                if (searchType.equals(MUSIC_SONGS) || searchType.equals(MUSIC_VIDEOS)) {
+                    collector.commit(new YoutubeStreamInfoItemExtractor(info, timeAgoParser) {
+                        @Override
+                        public String getUrl() throws ParsingException {
+                            String url = getUrlFromNavigationEndpoint(info.getObject("doubleTapCommand"));
+                            if (url != null && !url.isEmpty()) return url;
+                            throw new ParsingException("Could not get url");
+                        }
+
+                        @Override
+                        public String getName() throws ParsingException {
+                            String name = getTextFromObject(info.getArray("flexColumns").getObject(0)
+                                    .getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
+                            if (name != null && !name.isEmpty()) return name;
+                            throw new ParsingException("Could not get name");
+                        }
+
+                        @Override
+                        public long getDuration() throws ParsingException {
+                            String duration = getTextFromObject(info.getArray("flexColumns").getObject(3)
+                                    .getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
+                            if (duration != null && !duration.isEmpty())
+                                return YoutubeParsingHelper.parseDurationString(duration);
+                            throw new ParsingException("Could not get duration");
+                        }
+
+                        @Override
+                        public String getUploaderName() throws ParsingException {
+                            String name = getTextFromObject(info.getArray("flexColumns").getObject(1)
+                                    .getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
+                            if (name != null && !name.isEmpty()) return name;
+                            throw new ParsingException("Could not get uploader name");
+                        }
+
+                        @Override
+                        public String getTextualUploadDate() {
+                            return null;
+                        }
+
+                        @Override
+                        public DateWrapper getUploadDate() {
+                            return null;
+                        }
+
+                        @Override
+                        public long getViewCount() throws ParsingException {
+                            if (searchType.equals(MUSIC_SONGS)) return -1;
+                            String viewCount = getTextFromObject(info.getArray("flexColumns").getObject(2)
+                                    .getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
+                            if (viewCount != null && !viewCount.isEmpty()) return Utils.mixedNumberWordToLong(viewCount);
+                            throw new ParsingException("Could not get view count");
+                        }
+
+                        @Override
+                        public String getThumbnailUrl() throws ParsingException {
+                            try {
+                                // TODO: Don't simply get the first item, but look at all thumbnails and their resolution
+                                return fixThumbnailUrl(info.getObject("thumbnail").getObject("musicThumbnailRenderer")
+                                        .getObject("thumbnail").getArray("thumbnails").getObject(0).getString("url"));
+                            } catch (Exception e) {
+                                throw new ParsingException("Could not get thumbnail url", e);
+                            }
+                        }
+                    });
+                } else if (searchType.equals(MUSIC_ARTISTS)) {
+                    collector.commit(new YoutubeChannelInfoItemExtractor(info) {
+                        @Override
+                        public String getThumbnailUrl() throws ParsingException {
+                            try {
+                                // TODO: Don't simply get the first item, but look at all thumbnails and their resolution
+                                return fixThumbnailUrl(info.getObject("thumbnail").getObject("musicThumbnailRenderer")
+                                        .getObject("thumbnail").getArray("thumbnails").getObject(0).getString("url"));
+                            } catch (Exception e) {
+                                throw new ParsingException("Could not get thumbnail url", e);
+                            }
+                        }
+
+                        @Override
+                        public String getName() throws ParsingException {
+                            String name = getTextFromObject(info.getArray("flexColumns").getObject(0)
+                                    .getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
+                            if (name != null && !name.isEmpty()) return name;
+                            throw new ParsingException("Could not get name");
+                        }
+
+                        @Override
+                        public String getUrl() throws ParsingException {
+                            String url = getUrlFromNavigationEndpoint(info.getObject("navigationEndpoint"));
+                            if (url != null && !url.isEmpty()) return url;
+                            throw new ParsingException("Could not get url");
+                        }
+
+                        @Override
+                        public long getSubscriberCount() throws ParsingException {
+                            String viewCount = getTextFromObject(info.getArray("flexColumns").getObject(2)
+                                    .getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
+                            if (viewCount != null && !viewCount.isEmpty()) return Utils.mixedNumberWordToLong(viewCount);
+                            throw new ParsingException("Could not get subscriber count");
+                        }
+
+                        @Override
+                        public long getStreamCount() {
+                            return -1;
+                        }
+
+                        @Override
+                        public String getDescription() {
+                            return null;
+                        }
+                    });
+                } else if (searchType.equals(MUSIC_ALBUMS) || searchType.equals(MUSIC_PLAYLISTS)) {
+                    collector.commit(new YoutubePlaylistInfoItemExtractor(info) {
+                        @Override
+                        public String getThumbnailUrl() throws ParsingException {
+                            try {
+                                // TODO: Don't simply get the first item, but look at all thumbnails and their resolution
+                                return fixThumbnailUrl(info.getObject("thumbnail").getObject("musicThumbnailRenderer")
+                                        .getObject("thumbnail").getArray("thumbnails").getObject(0).getString("url"));
+                            } catch (Exception e) {
+                                throw new ParsingException("Could not get thumbnail url", e);
+                            }
+                        }
+
+                        @Override
+                        public String getName() throws ParsingException {
+                            String name = getTextFromObject(info.getArray("flexColumns").getObject(0)
+                                    .getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
+                            if (name != null && !name.isEmpty()) return name;
+                            throw new ParsingException("Could not get name");
+                        }
+
+                        @Override
+                        public String getUrl() throws ParsingException {
+                            String url = getUrlFromNavigationEndpoint(info.getObject("doubleTapCommand"));
+                            if (url != null && !url.isEmpty()) return url;
+                            throw new ParsingException("Could not get url");
+                        }
+
+                        @Override
+                        public String getUploaderName() throws ParsingException {
+                            String name;
+                            if (searchType.equals(MUSIC_ALBUMS)) {
+                                name = getTextFromObject(info.getArray("flexColumns").getObject(2)
+                                        .getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
+                            } else {
+                                name = getTextFromObject(info.getArray("flexColumns").getObject(1)
+                                        .getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
+                            }
+                            if (name != null && !name.isEmpty()) return name;
+                            throw new ParsingException("Could not get uploader name");
+                        }
+
+                        @Override
+                        public long getStreamCount() throws ParsingException {
+                            if (searchType.equals(MUSIC_ALBUMS)) return -1;
+                            String count = getTextFromObject(info.getArray("flexColumns").getObject(2)
+                                    .getObject("musicResponsiveListItemFlexColumnRenderer").getObject("text"));
+                            if (count != null && !count.isEmpty()) return Long.parseLong(Utils.removeNonDigitCharacters(count));
+                            throw new ParsingException("Could not get count");
+                        }
+                    });
+                }
+            }
+        }
+    }
+
+    private String getNextPageUrlFrom(JsonArray continuations) throws ParsingException, IOException, ReCaptchaException {
         if (continuations == null) {
             return "";
         }
@@ -141,7 +514,13 @@ public class YoutubeSearchExtractor extends SearchExtractor {
         JsonObject nextContinuationData = continuations.getObject(0).getObject("nextContinuationData");
         String continuation = nextContinuationData.getString("continuation");
         String clickTrackingParams = nextContinuationData.getString("clickTrackingParams");
+
+        if (isMusicSearch()) {
+            return "https://music.youtube.com/youtubei/v1/search?ctoken=" + continuation + "&continuation=" + continuation
+                    + "&itct=" + clickTrackingParams + "&alt=json&key=" + YoutubeParsingHelper.getYoutubeMusicKeys()[0];
+        } else {
             return getUrl() + "&pbj=1&ctoken=" + continuation + "&continuation=" + continuation
                     + "&itct=" + clickTrackingParams;
         }
     }
+}

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

@@ -62,6 +62,8 @@ public class YoutubeParsingHelper {
     private static final String HARDCODED_CLIENT_VERSION = "2.20200214.04.00";
     private static String clientVersion;
 
+    private static String[] youtubeMusicKeys;
+
     private static final String FEED_BASE_CHANNEL_ID = "https://www.youtube.com/feeds/videos.xml?channel_id=";
     private static final String FEED_BASE_USER = "https://www.youtube.com/feeds/videos.xml?user=";
 
@@ -259,6 +261,19 @@ public class YoutubeParsingHelper {
         throw new ParsingException("Could not get client version");
     }
 
+    public static String[] getYoutubeMusicKeys() throws IOException, ReCaptchaException, Parser.RegexException {
+        if (youtubeMusicKeys != null && youtubeMusicKeys.length == 3) return youtubeMusicKeys;
+
+        final String url = "https://music.youtube.com/";
+        final String html = getDownloader().get(url).responseBody();
+
+        final String key = Parser.matchGroup1("INNERTUBE_API_KEY\":\"([0-9a-zA-Z_-]+?)\"", html);
+        final String clientName = Parser.matchGroup1("INNERTUBE_CONTEXT_CLIENT_NAME\":([0-9]+?),", html);
+        final String clientVersion = Parser.matchGroup1("INNERTUBE_CLIENT_VERSION\":\"([0-9\\.]+?)\"", html);
+
+        return youtubeMusicKeys = new String[]{key, clientName, clientVersion};
+    }
+
     public static String getUrlFromNavigationEndpoint(JsonObject navigationEndpoint) throws ParsingException {
         if (navigationEndpoint.getObject("urlEndpoint") != null) {
             String internUrl = navigationEndpoint.getObject("urlEndpoint").getString("url");
@@ -303,6 +318,9 @@ public class YoutubeParsingHelper {
             if (navigationEndpoint.getObject("watchEndpoint").has("startTimeSeconds"))
                 url.append("&t=").append(navigationEndpoint.getObject("watchEndpoint").getInt("startTimeSeconds"));
             return url.toString();
+        } else if (navigationEndpoint.getObject("watchPlaylistEndpoint") != null) {
+            return "https://www.youtube.com/playlist?list=" +
+                    navigationEndpoint.getObject("watchPlaylistEndpoint").getString("playlistId");
         }
         return null;
     }

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

@@ -8,13 +8,21 @@ import java.net.URLEncoder;
 import java.util.List;
 
 public class YoutubeSearchQueryHandlerFactory extends SearchQueryHandlerFactory {
-
     public static final String CHARSET_UTF_8 = "UTF-8";
 
+    public static final String ALL = "all";
     public static final String VIDEOS = "videos";
     public static final String CHANNELS = "channels";
     public static final String PLAYLISTS = "playlists";
-    public static final String ALL = "all";
+
+    public static final String MUSIC_SONGS = "music_songs";
+    public static final String MUSIC_VIDEOS = "music_videos";
+    public static final String MUSIC_ALBUMS = "music_albums";
+    public static final String MUSIC_PLAYLISTS = "music_playlists";
+    public static final String MUSIC_ARTISTS = "music_artists";
+
+    private static final String SEARCH_URL = "https://www.youtube.com/results?search_query=";
+    private static final String MUSIC_SEARCH_URL = "https://music.youtube.com/search?q=";
 
     public static YoutubeSearchQueryHandlerFactory getInstance() {
         return new YoutubeSearchQueryHandlerFactory();
@@ -23,20 +31,27 @@ public class YoutubeSearchQueryHandlerFactory extends SearchQueryHandlerFactory
     @Override
     public String getUrl(String searchString, List<String> contentFilters, String sortFilter) throws ParsingException {
         try {
-            final String url = "https://www.youtube.com/results"
-                    + "?search_query=" + URLEncoder.encode(searchString, CHARSET_UTF_8);
-
             if (contentFilters.size() > 0) {
                 switch (contentFilters.get(0)) {
-                    case VIDEOS: return url + "&sp=EgIQAQ%253D%253D";
-                    case CHANNELS: return url + "&sp=EgIQAg%253D%253D";
-                    case PLAYLISTS: return url + "&sp=EgIQAw%253D%253D";
                     case ALL:
                     default:
+                        break;
+                    case VIDEOS:
+                        return SEARCH_URL + URLEncoder.encode(searchString, CHARSET_UTF_8) + "&sp=EgIQAQ%253D%253D";
+                    case CHANNELS:
+                        return SEARCH_URL + URLEncoder.encode(searchString, CHARSET_UTF_8) + "&sp=EgIQAg%253D%253D";
+                    case PLAYLISTS:
+                        return SEARCH_URL + URLEncoder.encode(searchString, CHARSET_UTF_8) + "&sp=EgIQAw%253D%253D";
+                    case MUSIC_SONGS:
+                    case MUSIC_VIDEOS:
+                    case MUSIC_ALBUMS:
+                    case MUSIC_PLAYLISTS:
+                    case MUSIC_ARTISTS:
+                        return MUSIC_SEARCH_URL + URLEncoder.encode(searchString, CHARSET_UTF_8);
                 }
             }
 
-            return url;
+            return SEARCH_URL + URLEncoder.encode(searchString, CHARSET_UTF_8);
         } catch (UnsupportedEncodingException e) {
             throw new ParsingException("Could not encode query", e);
         }
@@ -48,6 +63,12 @@ public class YoutubeSearchQueryHandlerFactory extends SearchQueryHandlerFactory
                 ALL,
                 VIDEOS,
                 CHANNELS,
-                PLAYLISTS};
+                PLAYLISTS,
+                MUSIC_SONGS,
+                MUSIC_VIDEOS,
+                MUSIC_ALBUMS,
+                MUSIC_PLAYLISTS,
+                MUSIC_ARTISTS
+        };
     }
 }