searchfilters: convert Peertube to new framework

evermind-zz · Stypox · commit 9e75344611ca · 2023-12-30T09:07:35.000+01:00
Available content filters:
- All
- Videos
- Channels
- Playlists
Sepia
- SepiaSearch

Available sort filters:
- 'Sort by'
- stream kind
- sensitive
- 'Date'
- 'Duration'
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,20 @@
+// Created by evermind-zz 2022, licensed GNU GPL version 3 or later
+
+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) {
+        return selectedFilters.stream()
+                .filter(PeertubeFilters.PeertubeSepiaFilterItem.class::isInstance)
+                .findFirst();
+    }
+}
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;
@@ -39,6 +41,7 @@
 import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
 
 import java.util.List;
+import java.util.Optional;
 
 public class PeertubeService extends StreamingService {
 
@@ -85,9 +88,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> contentFilters = queryHandler.getContentFilters();
+
+        final Optional<FilterItem> sepiaFilter = PeertubeHelpers.getSepiaFilter(contentFilters);
+        return new PeertubeSearchExtractor(this, queryHandler, sepiaFilter.isPresent());
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java
@@ -319,7 +319,7 @@ public String getSupportInfo() {
     @Nonnull
     private String getRelatedItemsUrl(@Nonnull final List<String> tags)
             throws UnsupportedEncodingException {
-        final String url = baseUrl + PeertubeSearchQueryHandlerFactory.SEARCH_ENDPOINT_VIDEOS;
+        final String url = baseUrl + PeertubeSearchQueryHandlerFactory.SEARCH_ENDPOINT;
         final StringBuilder params = new StringBuilder();
         params.append("start=0&count=8&sort=-createdAt");
         for (final String tag : tags) {
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;
@@ -30,16 +32,16 @@ public String getId(final String url) throws ParsingException, UnsupportedOperat
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilters,
-                         final String searchFilter)
+                         final List<FilterItem> contentFilters,
+                         final List<FilterItem> searchFilter)
             throws ParsingException, UnsupportedOperationException {
         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, UnsupportedOperationException {
         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;
@@ -39,16 +41,16 @@ public boolean onAcceptUrl(final String url) throws FoundAdException {
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilter,
-                         final String sortFilter)
+                         final List<FilterItem> contentFilter,
+                         final List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException {
         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, UnsupportedOperationException {
         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;
@@ -26,16 +28,16 @@ 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)
             throws ParsingException, UnsupportedOperationException {
         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)
             throws ParsingException, UnsupportedOperationException {
         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
@@ -4,25 +4,26 @@
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory;
 import org.schabi.newpipe.extractor.utils.Utils;
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+import org.schabi.newpipe.extractor.services.peertube.PeertubeHelpers;
+import org.schabi.newpipe.extractor.services.peertube.search.filter.PeertubeFilters;
 
 import java.io.UnsupportedEncodingException;
 import java.util.List;
+import java.util.Optional;
 
 public final class PeertubeSearchQueryHandlerFactory extends SearchQueryHandlerFactory {
 
     private static final PeertubeSearchQueryHandlerFactory INSTANCE =
             new PeertubeSearchQueryHandlerFactory();
 
     public static final String VIDEOS = "videos";
-    public static final String SEPIA_VIDEOS = "sepia_videos"; // sepia is the global index
-    public static final String PLAYLISTS = "playlists";
-    public static final String CHANNELS = "channels";
+    // sepia is the global index
     public static final String SEPIA_BASE_URL = "https://sepiasearch.org";
-    public static final String SEARCH_ENDPOINT_PLAYLISTS = "/api/v1/search/video-playlists";
-    public static final String SEARCH_ENDPOINT_VIDEOS = "/api/v1/search/videos";
-    public static final String SEARCH_ENDPOINT_CHANNELS = "/api/v1/search/video-channels";
+    public static final String SEARCH_ENDPOINT = "/api/v1/search/videos";
 
     private PeertubeSearchQueryHandlerFactory() {
+        super(new PeertubeFilters());
     }
 
     public static PeertubeSearchQueryHandlerFactory getInstance() {
@@ -31,48 +32,37 @@ public static PeertubeSearchQueryHandlerFactory getInstance() {
 
     @Override
     public String getUrl(final String searchString,
-                         final List<String> contentFilters,
-                         final String sortFilter)
+                         final List<FilterItem> selectedContentFilter,
+                         final List<FilterItem> selectedSortFilters)
             throws ParsingException, UnsupportedOperationException {
         final String baseUrl;
-        if (!contentFilters.isEmpty() && contentFilters.get(0).startsWith("sepia_")) {
+        final Optional<FilterItem> sepiaFilter =
+                PeertubeHelpers.getSepiaFilter(selectedContentFilter);
+        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, UnsupportedOperationException {
         try {
-            final String endpoint;
-            if (contentFilters.isEmpty()
-                    || contentFilters.get(0).equals(VIDEOS)
-                    || contentFilters.get(0).equals(SEPIA_VIDEOS)) {
-                endpoint = SEARCH_ENDPOINT_VIDEOS;
-            } else if (contentFilters.get(0).equals(CHANNELS)) {
-                endpoint = SEARCH_ENDPOINT_CHANNELS;
-            } else {
-                endpoint = SEARCH_ENDPOINT_PLAYLISTS;
-            }
-            return baseUrl + endpoint + "?search=" + Utils.encodeUrlUtf8(searchString);
+            searchFilters.setSelectedSortFilter(selectedSortFilter);
+            searchFilters.setSelectedContentFilter(selectedContentFilter);
+
+            final String filterQuery = searchFilters.evaluateSelectedFilters(null);
+
+            return baseUrl + SEARCH_ENDPOINT + "?search=" + Utils.encodeUrlUtf8(searchString)
+                    + filterQuery;
         } catch (final UnsupportedEncodingException e) {
             throw new ParsingException("Could not encode query", e);
         }
     }
-
-    @Override
-    public String[] getAvailableContentFilter() {
-        return new String[]{
-                VIDEOS,
-                PLAYLISTS,
-                CHANNELS,
-                SEPIA_VIDEOS,
-        };
-    }
 }
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;
@@ -34,16 +36,16 @@ 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)
             throws ParsingException, UnsupportedOperationException {
         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)
             throws ParsingException, UnsupportedOperationException {
         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
