[YouTube] Fix bug when url isn't present in the browseEndpoint object

Author: mauriciocolli

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

@@ -63,7 +63,7 @@ public String getUrl() throws ParsingException {
     }
 
     @Override
-    public String getSearchSuggestion() {
+    public String getSearchSuggestion() throws ParsingException {
         JsonObject showingResultsForRenderer = initialData.getObject("contents")
                 .getObject("twoColumnSearchResultsRenderer").getObject("primaryContents")
                 .getObject("sectionListRenderer").getArray("contents").getObject(0)
@@ -114,7 +114,7 @@ public InfoItemsPage<InfoItem> getPage(String pageUrl) throws IOException, Extra
         return new InfoItemsPage<>(collector, getNextPageUrlFrom(itemSectionRenderer.getArray("continuations")));
     }
 
-    private void collectStreamsFrom(InfoItemsSearchCollector collector, JsonArray videos) throws NothingFoundException {
+    private void collectStreamsFrom(InfoItemsSearchCollector collector, JsonArray videos) throws NothingFoundException, ParsingException {
         collector.reset();
 
         final TimeAgoParser timeAgoParser = getTimeAgoParser();

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

@@ -564,8 +564,12 @@ public StreamInfoItemsCollector getRelatedStreams() throws ExtractionException {
      */
     @Override
     public String getErrorMessage() {
-        return getTextFromObject(initialAjaxJson.getObject(2).getObject("playerResponse").getObject("playabilityStatus")
-                .getObject("errorScreen").getObject("playerErrorMessageRenderer").getObject("reason"));
+        try {
+            return getTextFromObject(initialAjaxJson.getObject(2).getObject("playerResponse").getObject("playabilityStatus")
+                    .getObject("errorScreen").getObject("playerErrorMessageRenderer").getObject("reason"));
+        } catch (ParsingException e) {
+            return null;
+        }
     }
 
     /*//////////////////////////////////////////////////////////////////////////

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

@@ -253,7 +253,7 @@ public static String getClientVersion() throws IOException, ExtractionException
         throw new ParsingException("Could not get client version");
     }
 
-    public static String getUrlFromNavigationEndpoint(JsonObject navigationEndpoint) {
+    public static String getUrlFromNavigationEndpoint(JsonObject navigationEndpoint) throws ParsingException {
         if (navigationEndpoint.getObject("urlEndpoint") != null) {
             String internUrl = navigationEndpoint.getObject("urlEndpoint").getString("url");
             if (internUrl.startsWith("/redirect?")) {
@@ -275,7 +275,20 @@ public static String getUrlFromNavigationEndpoint(JsonObject navigationEndpoint)
                 return internUrl;
             }
         } else if (navigationEndpoint.getObject("browseEndpoint") != null) {
-            return "https://www.youtube.com" + navigationEndpoint.getObject("browseEndpoint").getString("canonicalBaseUrl");
+            final JsonObject browseEndpoint = navigationEndpoint.getObject("browseEndpoint");
+            final String canonicalBaseUrl = browseEndpoint.getString("canonicalBaseUrl");
+            final String browseId = browseEndpoint.getString("browseId");
+
+            // All channel ids are prefixed with UC
+            if (browseId != null && browseId.startsWith("UC")) {
+                return "https://www.youtube.com/channel/" + browseId;
+            }
+
+            if (canonicalBaseUrl != null && !canonicalBaseUrl.isEmpty()) {
+                return "https://www.youtube.com" + canonicalBaseUrl;
+            }
+
+            throw new ParsingException("canonicalBaseUrl is null and browseId is not a channel (\"" + browseEndpoint + "\")");
         } else if (navigationEndpoint.getObject("watchEndpoint") != null) {
             StringBuilder url = new StringBuilder();
             url.append("https://www.youtube.com/watch?v=").append(navigationEndpoint.getObject("watchEndpoint").getString("videoId"));
@@ -288,7 +301,7 @@ public static String getUrlFromNavigationEndpoint(JsonObject navigationEndpoint)
         return null;
     }
 
-    public static String getTextFromObject(JsonObject textObject, boolean html) {
+    public static String getTextFromObject(JsonObject textObject, boolean html) throws ParsingException {
         if (textObject.has("simpleText")) return textObject.getString("simpleText");
 
         StringBuilder textBuilder = new StringBuilder();
@@ -314,7 +327,7 @@ public static String getTextFromObject(JsonObject textObject, boolean html) {
         return text;
     }
 
-    public static String getTextFromObject(JsonObject textObject) {
+    public static String getTextFromObject(JsonObject textObject) throws ParsingException {
         return getTextFromObject(textObject, false);
     }
 

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

@@ -99,7 +99,7 @@ public void testBannerUrl() throws Exception {
 
         @Test
         public void testUploaderUrl() throws Exception {
-            assertEquals("https://www.youtube.com/user/andre0y0you", extractor.getUploaderUrl());
+            assertEquals("https://www.youtube.com/channel/UCs72iRpTEuwV3y6pdWYLgiw", extractor.getUploaderUrl());
         }
 
         @Test

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorDefaultTest.java

@@ -124,7 +124,7 @@ public void testGetSecondPage() throws Exception {
     }
 
     @Test
-    public void testSuggestionNotNull() {
+    public void testSuggestionNotNull() throws Exception {
         //todo write a real test
         assertNotNull(extractor.getSearchSuggestion());
     }