searchfilters: convert Peertube to new framework

evermind-zz · InfinityLoop1308 · commit c9d94f4efc8a · 2022-09-15T13:27:12.000+08:00
Available content filters:
- All
- Videos
- Channels
- Playlists

Available sort filters:
- 'Sort by'
- stream kind
- sensitive
- 'Date'
- 'Duration'
- SepiaSearch
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeHelpers.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeHelpers.java
@@ -0,0 +1,26 @@
+package org.schabi.newpipe.extractor.services.peertube;
+
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+import org.schabi.newpipe.extractor.services.peertube.search.filter.PeertubeFilters;
+
+import java.util.List;
+import java.util.Optional;
+
+public final class PeertubeHelpers {
+    private PeertubeHelpers() { }
+    public static Optional<FilterItem> getSepiaFilter(final List<FilterItem> selectedFilters) {
+        final Optional<FilterItem> sepiaFilter = selectedFilters.stream()
+                .filter(filterItem -> filterItem instanceof PeertubeFilters.PeertubeSepiaFilterItem)
+                .findFirst();
+
+        return sepiaFilter;
+    }
+
+    public static Optional<FilterItem> getSpecificFilter(final List<FilterItem> selectedFilters, final Class clazz) {
+        final Optional<FilterItem> sepiaFilter = selectedFilters.stream()
+                .filter(filterItem -> filterItem.getClass().isInstance(clazz))
+                .findFirst();
+
+        return sepiaFilter;
+    }
+}
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeService.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeService.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor.services.peertube;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
 import static java.util.Arrays.asList;
@@ -36,6 +38,7 @@
 import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
 
 import java.util.List;
+import java.util.Optional;
 
 public class PeertubeService extends StreamingService {
 
@@ -77,9 +80,10 @@ public ListLinkHandlerFactory getCommentsLHFactory() {
 
     @Override
     public SearchExtractor getSearchExtractor(final SearchQueryHandler queryHandler) {
-        final List<String> contentFilters = queryHandler.getContentFilters();
-        return new PeertubeSearchExtractor(this, queryHandler,
-                !contentFilters.isEmpty() && contentFilters.get(0).startsWith("sepia_"));
+        final List<FilterItem> selectedSortFilter = queryHandler.getSortFilter();
+
+        final Optional<FilterItem> sepiaFilter = PeertubeHelpers.getSepiaFilter(selectedSortFilter);
+        return new PeertubeSearchExtractor(this, queryHandler, sepiaFilter.isPresent());
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeChannelLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeChannelLinkHandlerFactory.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor.services.peertube.linkHandler;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
@@ -28,15 +30,15 @@ public String getId(final String url) throws ParsingException {
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilters,
-                         final String searchFilter) throws ParsingException {
+                         final List<FilterItem> contentFilters,
+                         final List<FilterItem> searchFilter) throws ParsingException {
         return getUrl(id, contentFilters, searchFilter, ServiceList.PeerTube.getBaseUrl());
     }
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilter,
-                         final String sortFilter,
+                         final List<FilterItem> contentFilter,
+                         final List<FilterItem> sortFilter,
                          final String baseUrl)
             throws ParsingException {
         if (id.matches(ID_PATTERN)) {
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeCommentsLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeCommentsLinkHandlerFactory.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor.services.peertube.linkHandler;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.exceptions.FoundAdException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -32,15 +34,15 @@ public boolean onAcceptUrl(final String url) throws FoundAdException {
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilter,
-                         final String sortFilter) throws ParsingException {
+                         final List<FilterItem> contentFilter,
+                         final List<FilterItem> sortFilter) throws ParsingException {
         return getUrl(id, contentFilter, sortFilter, ServiceList.PeerTube.getBaseUrl());
     }
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilter,
-                         final String sortFilter,
+                         final List<FilterItem> contentFilter,
+                         final List<FilterItem> sortFilter,
                          final String baseUrl) throws ParsingException {
         return baseUrl + String.format(COMMENTS_ENDPOINT, id);
     }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubePlaylistLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubePlaylistLinkHandlerFactory.java
@@ -1,6 +1,8 @@
 package org.schabi.newpipe.extractor.services.peertube.linkHandler;
 
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
@@ -23,15 +25,15 @@ public static PeertubePlaylistLinkHandlerFactory getInstance() {
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilters,
-                         final String sortFilter) {
+                         final List<FilterItem> contentFilters,
+                         final List<FilterItem> sortFilter) {
         return getUrl(id, contentFilters, sortFilter, ServiceList.PeerTube.getBaseUrl());
     }
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilters,
-                         final String sortFilter,
+                         final List<FilterItem> contentFilters,
+                         final List<FilterItem> sortFilter,
                          final String baseUrl) {
         return baseUrl + "/api/v1/video-playlists/" + id;
     }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeSearchQueryHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeSearchQueryHandlerFactory.java
@@ -1,12 +1,18 @@
 package org.schabi.newpipe.extractor.services.peertube.linkHandler;
 
+import org.schabi.newpipe.extractor.search.filter.Filter;
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+import org.schabi.newpipe.extractor.services.peertube.search.filter.PeertubeFilters;
+
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory;
+import org.schabi.newpipe.extractor.services.peertube.PeertubeHelpers;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.List;
+import java.util.Optional;
 
 import static org.schabi.newpipe.extractor.utils.Utils.UTF_8;
 
@@ -26,34 +32,56 @@ public static PeertubeSearchQueryHandlerFactory getInstance() {
 
     @Override
     public String getUrl(final String searchString,
-                         final List<String> contentFilters,
-                         final String sortFilter) throws ParsingException {
+                         final List<FilterItem> selectedContentFilter,
+                         final List<FilterItem> selectedSortFilters) throws ParsingException {
+
         final String baseUrl;
-        if (!contentFilters.isEmpty() && contentFilters.get(0).startsWith("sepia_")) {
+        final Optional<FilterItem> sepiaFilter =
+                PeertubeHelpers.getSepiaFilter(selectedSortFilters);
+        if (sepiaFilter.isPresent()) {
             baseUrl = SEPIA_BASE_URL;
         } else {
             baseUrl = ServiceList.PeerTube.getBaseUrl();
         }
-        return getUrl(searchString, contentFilters, sortFilter, baseUrl);
+
+        return getUrl(searchString, selectedContentFilter, selectedSortFilters, baseUrl);
     }
 
     @Override
     public String getUrl(final String searchString,
-                         final List<String> contentFilters,
-                         final String sortFilter,
+                         final List<FilterItem> selectedContentFilter,
+                         final List<FilterItem> selectedSortFilter,
                          final String baseUrl) throws ParsingException {
         try {
-            return baseUrl + SEARCH_ENDPOINT + "?search=" + URLEncoder.encode(searchString, UTF_8);
+            searchFilters.setSelectedSortFilter(selectedSortFilter);
+            searchFilters.setSelectedContentFilter(selectedContentFilter);
+
+            final String filterQuery = searchFilters.evaluateSelectedFilters(null);
+
+            return baseUrl + SEARCH_ENDPOINT + "?search=" + URLEncoder.encode(searchString, UTF_8)
+                    + filterQuery;
         } catch (final UnsupportedEncodingException e) {
             throw new ParsingException("Could not encode query", e);
         }
     }
 
     @Override
-    public String[] getAvailableContentFilter() {
-        return new String[]{
-                VIDEOS,
-                SEPIA_VIDEOS
-        };
+    public Filter getAvailableContentFilter() {
+        return searchFilters.getContentFilters();
+    }
+
+    @Override
+    public Filter getAvailableSortFilter() {
+        return searchFilters.getSortFilters();
+    }
+
+    @Override
+    public Filter getContentFilterSortFilterVariant(final int contentFilterId) {
+        return searchFilters.getContentFilterSortFilterVariant(contentFilterId);
+    }
+
+    @Override
+    public FilterItem getFilterItem(final int filterId) {
+        return searchFilters.getFilterItem(filterId);
     }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeTrendingLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeTrendingLinkHandlerFactory.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor.services.peertube.linkHandler;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
@@ -42,15 +44,15 @@ public static PeertubeTrendingLinkHandlerFactory getInstance() {
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilters,
-                         final String sortFilter) {
+                         final List<FilterItem> contentFilters,
+                         final List<FilterItem> sortFilter) {
         return getUrl(id, contentFilters, sortFilter, ServiceList.PeerTube.getBaseUrl());
     }
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilters,
-                         final String sortFilter,
+                         final List<FilterItem> contentFilters,
+                         final List<FilterItem> sortFilter,
                          final String baseUrl) {
         return String.format(KIOSK_MAP.get(id), baseUrl);
     }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/search/filter/PeertubeFilters.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/search/filter/PeertubeFilters.java
