remove soundcloud and make first search test work

Author: theScrabi

extractor/src/main/java/org/schabi/newpipe/extractor/Extractor.java

@@ -95,4 +95,8 @@ public StreamingService getService() {
     public int getServiceId() {
         return service.getServiceId();
     }
+
+    public Downloader getDownloader() {
+        return downloader;
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/ListExtractor.java

@@ -37,12 +37,12 @@ public ListExtractor(StreamingService service, ListUrlIdHandler urlIdHandler) {
     /**
      * Get a list of items corresponding to the specific requested page.
      *
-     * @param nextPageUrl any next page url got from the exclusive implementation of the list extractor
+     * @param pageUrl any page url got from the exclusive implementation of the list extractor
      * @return a {@link InfoItemsPage} corresponding to the requested page
      * @see #getNextPageUrl()
      * @see InfoItemsPage#getNextPageUrl()
      */
-    public abstract InfoItemsPage<R> getPage(final String nextPageUrl) throws IOException, ExtractionException;
+    public abstract InfoItemsPage<R> getPage(final String pageUrl) throws IOException, ExtractionException;
 
     public boolean hasNextPage() throws IOException, ExtractionException {
         final String nextPageUrl = getNextPageUrl();

extractor/src/main/java/org/schabi/newpipe/extractor/ListInfo.java

@@ -1,21 +1,23 @@
 package org.schabi.newpipe.extractor;
 
+import com.sun.org.apache.xerces.internal.xs.StringList;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public abstract class ListInfo<T extends InfoItem> extends Info {
     private List<T> relatedItems;
     private String nextPageUrl = null;
-    private String[] contentFilter = {};
+    private List<String> contentFilter = new ArrayList<>();
     private String sortFilter = "";
 
     public ListInfo(int serviceId,
                     String id,
                     String url,
                     String originalUrl,
                     String name,
-                    String[] contentFilter,
+                    List<String> contentFilter,
                     String sortFilter) {
         super(serviceId, id, url, originalUrl, name);
         this.contentFilter = contentFilter;
@@ -48,7 +50,7 @@ public void setNextPageUrl(String pageUrl) {
         this.nextPageUrl = pageUrl;
     }
 
-    public String[] getContentFilter() {
+    public List<String> getContentFilter() {
         return contentFilter;
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/ListUrlIdHandler.java

@@ -2,18 +2,29 @@
 
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public abstract class ListUrlIdHandler extends UrlIdHandler {
 
-    protected String[] contentFilter;
-    protected String sortFilter;
+    protected List<String> contentFilter = new ArrayList<>(0);
+    protected String sortFilter = "";
 
-    public ListUrlIdHandler setQuery(String id, String[] contentFilter, String softFilter) throws ParsingException {
+    public ListUrlIdHandler setQuery(String id,
+                                     List<String> contentFilter,
+                                     String softFilter) throws ParsingException {
         setId(id);
         this.contentFilter = contentFilter;
         this.sortFilter = softFilter;
         return this;
     }
 
+
+    public ListUrlIdHandler setQuery(String id) throws ParsingException {
+        setQuery(id, new ArrayList<String>(), "");
+        return this;
+    }
+
     public ListUrlIdHandler setUrl(String url) throws ParsingException {
         return (ListUrlIdHandler) super.setUrl(url);
     }
@@ -41,7 +52,7 @@ public String[] getAvailableSortFilter() {
     }
 
 
-    public String[] getContentFilter() {
+    public List<String> getContentFilter() {
         return contentFilter;
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/ServiceList.java

@@ -1,6 +1,5 @@
 package org.schabi.newpipe.extractor;
 
-import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudService;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
 
 import java.util.List;
@@ -16,14 +15,10 @@ private ServiceList() {
         //no instance
     }
 
-    public static final YoutubeService YouTube;
-    public static final SoundcloudService SoundCloud;
+    public static final YoutubeService YouTube = new YoutubeService(0);
 
-    private static final List<StreamingService> SERVICES = unmodifiableList(asList(
-            YouTube = new YoutubeService(0),
-            SoundCloud = new SoundcloudService(1)
-            // DailyMotion = new DailyMotionService(2);
-    ));
+    private static final List<StreamingService> SERVICES = unmodifiableList(
+            asList((StreamingService) YouTube));
 
     /**
      * Get all the supported services.

extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java

@@ -1,12 +1,14 @@
 package org.schabi.newpipe.extractor;
 
+import com.sun.org.apache.xerces.internal.xs.StringList;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.kiosk.KioskList;
 import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
 import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
+import org.schabi.newpipe.extractor.search.SearchQueryUrlHandler;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 
@@ -70,13 +72,14 @@ public String toString() {
     public abstract UrlIdHandler getStreamUrlIdHandler();
     public abstract ListUrlIdHandler getChannelUrlIdHandler();
     public abstract ListUrlIdHandler getPlaylistUrlIdHandler();
+    public abstract SearchQueryUrlHandler getSearchQueryHandler();
 
 
     ////////////////////////////////////////////
     // Extractor
     ////////////////////////////////////////////
     public abstract SearchEngine getSearchEngine();
-    public abstract SearchExtractor getSearchExtractor();
+    public abstract SearchExtractor getSearchExtractor(SearchQueryUrlHandler queryHandler, String contentCountry);
     public abstract SuggestionExtractor getSuggestionExtractor();
     public abstract SubscriptionExtractor getSubscriptionExtractor();
     public abstract KioskList getKioskList() throws ExtractionException;
@@ -85,14 +88,22 @@ public String toString() {
     public abstract PlaylistExtractor getPlaylistExtractor(ListUrlIdHandler urlIdHandler) throws ExtractionException;
     public abstract StreamExtractor getStreamExtractor(UrlIdHandler urlIdHandler) throws ExtractionException;
 
-    public ChannelExtractor getChannelExtractor(String id, String[] contentFilter, String sortFilter) throws ExtractionException {
+    public SearchExtractor getSearchExtractor(String query, List<String> contentFilter, String softFilter, String contentCountry) throws ExtractionException {
+        return getSearchExtractor(getSearchQueryHandler().setQuery(query, contentFilter, softFilter), contentCountry);
+    }
+
+    public ChannelExtractor getChannelExtractor(String id, List<String> contentFilter, String sortFilter) throws ExtractionException {
         return getChannelExtractor(getChannelUrlIdHandler().setQuery(id, contentFilter, sortFilter));
     }
 
-    public PlaylistExtractor getPlaylistExtractor(String id, String[] contentFilter, String sortFilter) throws ExtractionException {
+    public PlaylistExtractor getPlaylistExtractor(String id, List<String> contentFilter, String sortFilter) throws ExtractionException {
         return getPlaylistExtractor(getPlaylistUrlIdHandler().setQuery(id, contentFilter, sortFilter));
     }
 
+    public SearchExtractor getSearchExtractor(String query, String contentCountry) throws ExtractionException {
+        return getSearchExtractor(getSearchQueryHandler().setQuery(query), contentCountry);
+    }
+
     public ChannelExtractor getChannelExtractor(String url) throws ExtractionException {
         return getChannelExtractor(getChannelUrlIdHandler().setUrl(url));
     }

extractor/src/main/java/org/schabi/newpipe/extractor/search/InfoItemsSearchCollector.java

@@ -45,7 +45,6 @@
  * other extractor type will raise an exception.
  */
 public class InfoItemsSearchCollector extends InfoItemsCollector<InfoItem, InfoItemExtractor> {
-    private String suggestion = "";
     private final StreamInfoItemsCollector streamCollector;
     private final ChannelInfoItemsCollector userCollector;
     private final PlaylistInfoItemsCollector playlistCollector;
@@ -57,14 +56,6 @@ public class InfoItemsSearchCollector extends InfoItemsCollector<InfoItem, InfoI
         playlistCollector = new PlaylistInfoItemsCollector(serviceId);
     }
 
-    public void setSuggestion(String suggestion) {
-        this.suggestion = suggestion;
-    }
-
-    public SearchResult getSearchResult() {
-        return new SearchResult(getServiceId(), suggestion, getItems(), getErrors());
-    }
-
     @Override
     public InfoItem extract(InfoItemExtractor extractor) throws ParsingException {
         // Use the corresponding collector for each item extractor type

extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchExtractor.java

@@ -15,24 +15,35 @@ public NothingFoundException(String message) {
     }
 
     private final InfoItemsSearchCollector collector;
+    private final String contentCountry;
 
-    public SearchExtractor(StreamingService service, SearchQuerryUrlHandler urlIdHandler) {
+    public SearchExtractor(StreamingService service, SearchQueryUrlHandler urlIdHandler, String contentCountry) {
         super(service, urlIdHandler);
         collector = new InfoItemsSearchCollector(service.getServiceId());
+        this.contentCountry = contentCountry;
     }
 
-    public String getSearchQuerry() {
-        return getUrlIdHandler().getSearchQuerry();
+    public String getSearchString() {
+        return getUrlIdHandler().getSearchString();
     }
 
     public abstract String getSearchSuggestion() throws ParsingException;
+
     protected InfoItemsSearchCollector getInfoItemSearchCollector() {
         return collector;
     }
 
     @Override
-    public SearchQuerryUrlHandler getUrlIdHandler() {
-        return (SearchQuerryUrlHandler) super.getUrlIdHandler();
+    public SearchQueryUrlHandler getUrlIdHandler() {
+        return (SearchQueryUrlHandler) super.getUrlIdHandler();
     }
 
+    @Override
+    public String getName() {
+        return getUrlIdHandler().getSearchString();
+    }
+
+    protected String getContentCountry() {
+        return contentCountry;
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchInfo.java

@@ -8,23 +8,23 @@
 
 public class SearchInfo extends ListInfo<InfoItem> {
 
-    private String searchQuerry = "";
+    private String searchString = "";
     private String searchSuggestion = "";
 
 
     public SearchInfo(int serviceId,
                       ListUrlIdHandler urlIdHandler,
-                      String searchQuerry) throws ParsingException {
+                      String searchString) throws ParsingException {
         super(serviceId, urlIdHandler, "Search");
-        this.searchQuerry = searchQuerry;
+        this.searchString = searchString;
     }
 
 
     public static SearchInfo getInfo(SearchExtractor extractor) throws ExtractionException {
         final SearchInfo info = new SearchInfo(
                 extractor.getServiceId(),
                 extractor.getUrlIdHandler(),
-                extractor.getSearchQuerry());
+                extractor.getSearchString());
 
         try {
             info.searchSuggestion = extractor.getSearchSuggestion();
@@ -36,8 +36,8 @@ public static SearchInfo getInfo(SearchExtractor extractor) throws ExtractionExc
     }
 
     // Getter
-    public String getSearchQuerry() {
-        return searchQuerry;
+    public String getSearchString() {
+        return searchString;
     }
 
     public String getSearchSuggestion() {