fix broken search results

Author: theScrabi

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

@@ -53,14 +53,19 @@ public YoutubeSearchExtractor(StreamingService service,
     @Override
     public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
         final String site;
-        final String url = getUrl() + "?gl="+ getLocalization().getCountry();
+        final String url = getUrl();
         //String url = builder.build().toString();
         //if we've been passed a valid language code, append it to the URL
         site = downloader.download(url, getLocalization());
 
         doc = Jsoup.parse(site, url);
     }
 
+    @Override
+    public String getUrl() throws ParsingException {
+        return super.getUrl() + "&gl="+ getLocalization().getCountry();
+    }
+
     @Override
     public String getSearchSuggestion() {
         final Element el = doc.select("div[class*=\"spell-correction\"]").first();
@@ -79,7 +84,7 @@ public InfoItemsPage<InfoItem> getInitialPage() throws ExtractionException {
 
     @Override
     public String getNextPageUrl() throws ExtractionException {
-        return getUrl() + "&page=" + 2 + "&gl=" + getLocalization().getCountry();
+        return getUrl() + "&page=" + 2;
     }
 
     @Override

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

@@ -219,7 +219,7 @@ public void testUploaderUrl() throws Exception {
 
         @Test
         public void testUploaderName() throws Exception {
-            assertEquals("Tomas Nilsson", extractor.getUploaderName());
+            assertEquals("Tomas Nilsson TOMPA571", extractor.getUploaderName());
         }
 
         @Test

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

@@ -45,12 +45,12 @@ public void testGetSecondPage() throws Exception {
         }
         assertFalse("First and second page are equal", equals);
 
-        assertEquals("https://www.youtube.com/results?q=pewdiepie&sp=EgIQAlAU&page=3&gl=GB", secondPage.getNextPageUrl());
+        assertEquals("https://www.youtube.com/results?q=pewdiepie&sp=EgIQAlAU&gl=GB&page=3", secondPage.getNextPageUrl());
     }
 
     @Test
     public void testGetSecondPageUrl() throws Exception {
-        assertEquals("https://www.youtube.com/results?q=pewdiepie&sp=EgIQAlAU&page=2&gl=GB", extractor.getNextPageUrl());
+        assertEquals("https://www.youtube.com/results?q=pewdiepie&sp=EgIQAlAU&gl=GB&page=2", extractor.getNextPageUrl());
     }
 
     @Test

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

@@ -49,16 +49,20 @@ public static void setUpClass() throws Exception {
         itemsPage = extractor.getInitialPage();
     }
 
+    @Test
+    public void testGetUrl() throws Exception {
+        assertEquals("https://www.youtube.com/results?q=pewdiepie&gl=GB", extractor.getUrl());
+    }
 
 
     @Test
     public void testGetSecondPageUrl() throws Exception {
-        assertEquals("https://www.youtube.com/results?q=pewdiepie&page=2&gl=GB", extractor.getNextPageUrl());
+        assertEquals("https://www.youtube.com/results?q=pewdiepie&gl=GB&page=2", extractor.getNextPageUrl());
     }
 
     @Test
     public void testResultList_FirstElement() {
-        InfoItem firstInfoItem = itemsPage.getItems().get(1);
+        InfoItem firstInfoItem = itemsPage.getItems().get(0);
 
         // THe channel should be the first item
         assertTrue(firstInfoItem instanceof ChannelInfoItem);
@@ -96,7 +100,7 @@ public void testGetSecondPage() throws Exception {
         }
         assertFalse("First and second page are equal", equals);
 
-        assertEquals("https://www.youtube.com/results?q=pewdiepie&page=3&gl=GB", secondPage.getNextPageUrl());
+        assertEquals("https://www.youtube.com/results?q=pewdiepie&gl=GB&page=3", secondPage.getNextPageUrl());
     }
 
     @Test