rename search filters

theScrabi · theScrabi · commit 558a973e4393 · 2018-07-19T16:06:44.000+02:00
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchQueryHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchQueryHandlerFactory.java
@@ -15,7 +15,7 @@ public class SoundcloudSearchQueryHandlerFactory extends SearchQueryHandlerFacto
     public static final String TRACKS = "tracks";
     public static final String USERS = "users";
     public static final String PLAYLIST = "playlist";
-    public static final String ANY = "any";
+    public static final String ALL = "all";
 
     public static final int ITEMS_PER_PAGE = 10;
 
@@ -35,7 +35,7 @@ public String getUrl(String id, List<String> contentFilter, String sortFilter) t
                     case PLAYLIST:
                         url += "/playlists";
                         break;
-                    case ANY:
+                    case ALL:
                     default:
                         break;
                 }
@@ -58,7 +58,7 @@ public String getUrl(String id, List<String> contentFilter, String sortFilter) t
     @Override
     public String[] getAvailableContentFilter() {
         return new String[] {
-                ANY,
+                ALL,
                 TRACKS,
                 USERS,
                 PLAYLIST};
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeSearchQueryHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubeSearchQueryHandlerFactory.java
@@ -11,10 +11,10 @@ public class YoutubeSearchQueryHandlerFactory extends SearchQueryHandlerFactory
 
     public static final String CHARSET_UTF_8 = "UTF-8";
 
-    public static final String STREAM = "stream";
-    public static final String CHANNEL = "channel";
-    public static final String PLAYLIST = "playlist";
-    public static final String ANY = "any";
+    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 YoutubeSearchQueryHandlerFactory getInstance() {
         return new YoutubeSearchQueryHandlerFactory();
@@ -28,10 +28,10 @@ public String getUrl(String searchString, List<String> contentFilters, String so
 
             if(contentFilters.size() > 0) {
                 switch (contentFilters.get(0)) {
-                    case STREAM: return url + "&sp=EgIQAVAU";
-                    case CHANNEL: return url + "&sp=EgIQAlAU";
-                    case PLAYLIST: return url + "&sp=EgIQA1AU";
-                    case ANY:
+                    case VIDEOS: return url + "&sp=EgIQAVAU";
+                    case CHANNELS: return url + "&sp=EgIQAlAU";
+                    case PLAYLISTS: return url + "&sp=EgIQA1AU";
+                    case ALL:
                     default:
                 }
             }
@@ -45,9 +45,9 @@ public String getUrl(String searchString, List<String> contentFilters, String so
     @Override
     public String[] getAvailableContentFilter() {
         return new String[] {
-                ANY,
-                STREAM,
-                CHANNEL,
-                PLAYLIST};
+                ALL,
+                VIDEOS,
+                CHANNELS,
+                PLAYLISTS};
     }
 }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/search/SoundcloudSearchExtractorChannelOnlyTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/search/SoundcloudSearchExtractorChannelOnlyTest.java
@@ -8,6 +8,7 @@
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudSearchExtractor;
+import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudSearchQueryHandlerFactory;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.*;
@@ -19,15 +20,15 @@ public class SoundcloudSearchExtractorChannelOnlyTest extends SoundcloudSearchEx
     public static void setUpClass() throws Exception {
         NewPipe.init(Downloader.getInstance());
         extractor = (SoundcloudSearchExtractor) SoundCloud.getSearchExtractor("lill uzi vert",
-                asList(new String[]{"users"}), null, "de");
+                asList(SoundcloudSearchQueryHandlerFactory.USERS), null, "de");
         extractor.fetchPage();
         itemsPage = extractor.getInitialPage();
     }
 
     @Test
     public void testGetSecondPage() throws Exception {
         SoundcloudSearchExtractor secondExtractor = (SoundcloudSearchExtractor) SoundCloud.getSearchExtractor("lill uzi vert",
-                asList(new String[]{"users"}), null, "de");
+                asList(SoundcloudSearchQueryHandlerFactory.USERS), null, "de");
         ListExtractor.InfoItemsPage<InfoItem> secondPage = secondExtractor.getPage(itemsPage.getNextPageUrl());
         assertTrue(Integer.toString(secondPage.getItems().size()),
                 secondPage.getItems().size() >= 3);
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDonationTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDonationTest.java
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java
@@ -43,7 +43,7 @@ public static void setUp()
             throws Exception {
         NewPipe.init(Downloader.getInstance());
         StreamingService service = YouTube;
-        LinkHandlerFactory LinkHandlerFactory = service.getKioskList().getUIHFactoryByType("Trending");
+        LinkHandlerFactory LinkHandlerFactory = service.getKioskList().getListLinkHandlerFactoryByType("Trending");
 
         kioskInfo = KioskInfo.getInfo(YouTube, LinkHandlerFactory.fromId("Trending").getUrl(), null);
     }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingLinkHandlerFactoryTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingLinkHandlerFactoryTest.java
@@ -41,7 +41,7 @@ public class YoutubeTrendingLinkHandlerFactoryTest {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        LinkHandlerFactory = YouTube.getKioskList().getUIHFactoryByType("Trending");
+        LinkHandlerFactory = YouTube.getKioskList().getListLinkHandlerFactoryByType("Trending");
         NewPipe.init(Downloader.getInstance());
     }
 
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorChannelOnlyTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/search/YoutubeSearchExtractorChannelOnlyTest.java
@@ -8,6 +8,7 @@
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeSearchExtractor;
+import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeSearchQueryHandlerFactory;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.*;
@@ -19,15 +20,15 @@ public class YoutubeSearchExtractorChannelOnlyTest extends YoutubeSearchExtracto
     public static void setUpClass() throws Exception {
         NewPipe.init(Downloader.getInstance());
         extractor = (YoutubeSearchExtractor) YouTube.getSearchExtractor("pewdiepie",
-                asList(new String[]{"channel"}), null, "de");
+                asList(YoutubeSearchQueryHandlerFactory.CHANNELS), null, "de");
         extractor.fetchPage();
         itemsPage = extractor.getInitialPage();
     }
 
     @Test
     public void testGetSecondPage() throws Exception {
         YoutubeSearchExtractor secondExtractor = (YoutubeSearchExtractor) YouTube.getSearchExtractor("pewdiepie",
-                asList(new String[]{"channel"}), null, "de");
+                asList(YoutubeSearchQueryHandlerFactory.CHANNELS), null, "de");
         ListExtractor.InfoItemsPage<InfoItem> secondPage = secondExtractor.getPage(itemsPage.getNextPageUrl());
         assertTrue(Integer.toString(secondPage.getItems().size()),
                 secondPage.getItems().size() > 10);

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static void setUp()`
`43`	`43`	`throws Exception {`
`44`	`44`	`NewPipe.init(Downloader.getInstance());`
`45`	`45`	`StreamingService service = YouTube;`
`46`		`- LinkHandlerFactory LinkHandlerFactory = service.getKioskList().getUIHFactoryByType("Trending");`
	`46`	`+ LinkHandlerFactory LinkHandlerFactory = service.getKioskList().getListLinkHandlerFactoryByType("Trending");`
`47`	`47`
`48`	`48`	`kioskInfo = KioskInfo.getInfo(YouTube, LinkHandlerFactory.fromId("Trending").getUrl(), null);`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class YoutubeTrendingLinkHandlerFactoryTest {`
`41`	`41`
`42`	`42`	`@BeforeClass`
`43`	`43`	`public static void setUp() throws Exception {`
`44`		`- LinkHandlerFactory = YouTube.getKioskList().getUIHFactoryByType("Trending");`
	`44`	`+ LinkHandlerFactory = YouTube.getKioskList().getListLinkHandlerFactoryByType("Trending");`
`45`	`45`	`NewPipe.init(Downloader.getInstance());`
`46`	`46`	`}`
`47`	`47`