searchfilters: Peertube: remove search option ID_CF_MAIN_ALL

'ALL' option not possible as Peertube uses different
endpoints for video/channels/playlist search

Author: evermind-zz

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/search/filter/PeertubeFilters.java

@@ -22,7 +22,9 @@
 public final class PeertubeFilters extends BaseSearchFilters {
 
     public static final int ID_CF_MAIN_GRP = 0;
-    public static final int ID_CF_MAIN_ALL = 1;
+    /* 'ALL' option not possible as Peertube uses different endpoints for
+       video/channels/playlist search:
+    public static final int ID_CF_MAIN_ALL = 1; */
     public static final int ID_CF_MAIN_VIDEOS = 2;
     public static final int ID_CF_MAIN_CHANNELS = 3;
     public static final int ID_CF_MAIN_PLAYLISTS = 4;
@@ -225,11 +227,6 @@ protected void init() {
 
 
         /* content filters */
-        groupsFactory.addFilterItem(new PeertubeContentFilterItem(
-                ID_CF_MAIN_ALL,
-                LibraryStringIds.SEARCH_FILTERS_ALL, "",
-                // for 'ALL' we default to videos as all (videos/channels/playlist) is not possible
-                PeertubeSearchQueryHandlerFactory.SEARCH_ENDPOINT_VIDEOS));
         groupsFactory.addFilterItem(new PeertubeContentFilterItem(
                 ID_CF_MAIN_VIDEOS,
                 LibraryStringIds.SEARCH_FILTERS_VIDEOS, "resultType=videos",
@@ -246,8 +243,7 @@ protected void init() {
 
         /* content filter groups */
         addContentFilterGroup(groupsFactory.createFilterGroup(ID_CF_MAIN_GRP, null, true,
-                ID_CF_MAIN_ALL, new FilterItem[]{
-                        groupsFactory.getFilterForId(ID_CF_MAIN_ALL),
+                ID_CF_MAIN_VIDEOS, new FilterItem[]{
                         groupsFactory.getFilterForId(ID_CF_MAIN_VIDEOS),
                         groupsFactory.getFilterForId(ID_CF_MAIN_CHANNELS),
                         groupsFactory.getFilterForId(ID_CF_MAIN_PLAYLISTS),
@@ -261,7 +257,6 @@ protected void init() {
                 ITEM_IDENTIFIER_UNKNOWN, new FilterItem[]{
                         groupsFactory.getFilterForId(ID_CF_SEPIA_SEPIASEARCH)}, null));
 
-        addContentFilterSortVariant(ID_CF_MAIN_ALL, allSortFilters);
         addContentFilterSortVariant(ID_CF_MAIN_VIDEOS, allSortFilters);
     }
 

extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/search/filter/PeertubeFiltersTest.java

@@ -43,15 +43,6 @@ protected String emptyContentFilterTestSetup(final BaseSearchFilters base) {
     protected void validContentFilterWithAllSortFiltersTestSetup(
             final List<InputAndExpectedResultData> validContentFiltersWithExpectedResult) {
 
-        validContentFiltersWithExpectedResult.add(new InputAndExpectedResultData(
-                null,
-                singletonList(PeertubeFilters.ID_CF_MAIN_ALL),
-                getAllSortFiltersIdsList(),
-                "&sort=match&sort=name&sort=duration&sort=publishedAt&sort=createdAt&sort=views&sort=likes&isLive=true&isLive=false&nsfw=true&nsfw=false&startDate=X&startDate=X&startDate=X&startDate=X&durationMax=240&durationMin=240&durationMax=600&durationMin=600",
-                null,
-                null,
-                fixResults
-        ));
         validContentFiltersWithExpectedResult.add(new InputAndExpectedResultData(
                 null,
                 singletonList(PeertubeFilters.ID_CF_MAIN_VIDEOS),
@@ -84,15 +75,6 @@ protected void validContentFilterWithAllSortFiltersTestSetup(
     @Override
     protected void validContentFilterSetup(
             final List<InputAndExpectedResultData> validContentFiltersAndExpectedResults) {
-        validContentFiltersAndExpectedResults.add(new InputAndExpectedResultData(
-                null,
-                singletonList(PeertubeFilters.ID_CF_MAIN_ALL),
-                null,
-                "",
-                null,
-                null,
-                null
-        ));
         validContentFiltersAndExpectedResults.add(new InputAndExpectedResultData(
                 null,
                 singletonList(PeertubeFilters.ID_CF_MAIN_VIDEOS),
@@ -538,7 +520,6 @@ protected void validContentFilterAllSortFiltersTestSetup(
     protected void contentFiltersThatHaveCorrespondingSortFiltersTestSetup(
             final List<Integer> contentFiltersThatHaveCorrespondingSortFilters) {
 
-        contentFiltersThatHaveCorrespondingSortFilters.add(PeertubeFilters.ID_CF_MAIN_ALL);
         contentFiltersThatHaveCorrespondingSortFilters.add(PeertubeFilters.ID_CF_MAIN_VIDEOS);
     }