searchfilters: convert core components to new framework

evermind-zz · InfinityLoop1308 · commit 79e623d00e4c · 2022-09-15T13:27:12.000+08:00
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/ListInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/ListInfo.java
@@ -1,22 +1,24 @@
 package org.schabi.newpipe.extractor;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 
 import java.util.List;
 
 public abstract class ListInfo<T extends InfoItem> extends Info {
     private List<T> relatedItems;
     private Page nextPage = null;
-    private final List<String> contentFilters;
-    private final String sortFilter;
+    private final List<FilterItem> contentFilters;
+    private final List<FilterItem> sortFilter;
 
     public ListInfo(final int serviceId,
                     final String id,
                     final String url,
                     final String originalUrl,
                     final String name,
-                    final List<String> contentFilter,
-                    final String sortFilter) {
+                    final List<FilterItem> contentFilter,
+                    final List<FilterItem> sortFilter) {
         super(serviceId, id, url, originalUrl, name);
         this.contentFilters = contentFilter;
         this.sortFilter = sortFilter;
@@ -50,11 +52,11 @@ public void setNextPage(final Page page) {
         this.nextPage = page;
     }
 
-    public List<String> getContentFilters() {
+    public List<FilterItem> getContentFilters() {
         return contentFilters;
     }
 
-    public String getSortFilter() {
+    public List<FilterItem> getSortFilter() {
         return sortFilter;
     }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java b/extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 import org.schabi.newpipe.extractor.comments.CommentsExtractor;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
@@ -228,23 +230,24 @@ public abstract CommentsExtractor getCommentsExtractor(ListLinkHandler linkHandl
     //////////////////////////////////////////////////////////////////////////*/
 
     public SearchExtractor getSearchExtractor(final String query,
-                                              final List<String> contentFilter,
-                                              final String sortFilter) throws ExtractionException {
+                                              final List<FilterItem> contentFilter,
+                                              final List<FilterItem> sortFilter)
+            throws ExtractionException {
         return getSearchExtractor(getSearchQHFactory()
                 .fromQuery(query, contentFilter, sortFilter));
     }
 
     public ChannelExtractor getChannelExtractor(final String id,
-                                                final List<String> contentFilter,
-                                                final String sortFilter)
+                                                final List<FilterItem> contentFilter,
+                                                final List<FilterItem> sortFilter)
             throws ExtractionException {
         return getChannelExtractor(getChannelLHFactory()
                 .fromQuery(id, contentFilter, sortFilter));
     }
 
     public PlaylistExtractor getPlaylistExtractor(final String id,
-                                                  final List<String> contentFilter,
-                                                  final String sortFilter)
+                                                  final List<FilterItem> contentFilter,
+                                                  final List<FilterItem> sortFilter)
             throws ExtractionException {
         return getPlaylistExtractor(getPlaylistLHFactory()
                 .fromQuery(id, contentFilter, sortFilter));
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/feed/FeedInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/feed/FeedInfo.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor.feed;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage;
 import org.schabi.newpipe.extractor.ListInfo;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -8,6 +10,7 @@
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.utils.ExtractorHelper;
 
+
 import java.io.IOException;
 import java.util.List;
 
@@ -18,8 +21,8 @@ public FeedInfo(final int serviceId,
                     final String url,
                     final String originalUrl,
                     final String name,
-                    final List<String> contentFilter,
-                    final String sortFilter) {
+                    final List<FilterItem> contentFilter,
+                    final List<FilterItem> sortFilter) {
         super(serviceId, id, url, originalUrl, name, contentFilter, sortFilter);
     }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandler.java
@@ -1,22 +1,22 @@
 package org.schabi.newpipe.extractor.linkhandler;
 
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
 
 import java.util.Collections;
 import java.util.List;
 
 public class ListLinkHandler extends LinkHandler {
-    protected final List<String> contentFilters;
-    protected final String sortFilter;
+    protected final List<FilterItem> contentFilters;
+    protected final List<FilterItem> sortFilter;
 
     public ListLinkHandler(final String originalUrl,
                            final String url,
                            final String id,
-                           final List<String> contentFilters,
-                           final String sortFilter) {
+                           final List<FilterItem> selectedContentFilters,
+                           final List<FilterItem> selectedSortFilter) {
         super(originalUrl, url, id);
-        this.contentFilters = Collections.unmodifiableList(contentFilters);
-        this.sortFilter = sortFilter;
+        this.contentFilters = Collections.unmodifiableList(selectedContentFilters);
+        this.sortFilter = selectedSortFilter;
     }
 
     public ListLinkHandler(final ListLinkHandler handler) {
@@ -32,14 +32,14 @@ public ListLinkHandler(final LinkHandler handler) {
                 handler.url,
                 handler.id,
                 Collections.emptyList(),
-                EMPTY_STRING);
+                null);
     }
 
-    public List<String> getContentFilters() {
+    public List<FilterItem> getContentFilters() {
         return contentFilters;
     }
 
-    public String getSortFilter() {
+    public List<FilterItem> getSortFilter() {
         return sortFilter;
     }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java
@@ -1,5 +1,8 @@
 package org.schabi.newpipe.extractor.linkhandler;
 
+import org.schabi.newpipe.extractor.search.filter.Filter;
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.utils.Utils;
 
@@ -12,12 +15,12 @@ public abstract class ListLinkHandlerFactory extends LinkHandlerFactory {
     // To Override
     ///////////////////////////////////
 
-    public abstract String getUrl(String id, List<String> contentFilter, String sortFilter)
+    public abstract String getUrl(String id, List<FilterItem> contentFilter, List<FilterItem> sortFilter)
             throws ParsingException;
 
     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 getUrl(id, contentFilter, sortFilter);
     }
@@ -52,16 +55,16 @@ public ListLinkHandler fromId(final String id, final String baseUrl) throws Pars
         return new ListLinkHandler(super.fromId(id, baseUrl));
     }
 
-    public ListLinkHandler fromQuery(final String id,
-                                     final List<String> contentFilters,
-                                     final String sortFilter) throws ParsingException {
-        final String url = getUrl(id, contentFilters, sortFilter);
-        return new ListLinkHandler(url, url, id, contentFilters, sortFilter);
+    public ListLinkHandler fromQuery(final String query,
+                                     final List<FilterItem> contentFilter,
+                                     final List<FilterItem> sortFilter) throws ParsingException {
+        final String url = getUrl(query, contentFilter, sortFilter);
+        return new ListLinkHandler(url, url, query, contentFilter, sortFilter);
     }
 
     public ListLinkHandler fromQuery(final String id,
-                                     final List<String> contentFilters,
-                                     final String sortFilter,
+                                     final List<FilterItem> contentFilters,
+                                     final List<FilterItem> sortFilter,
                                      final String baseUrl) throws ParsingException {
         final String url = getUrl(id, contentFilters, sortFilter, baseUrl);
         return new ListLinkHandler(url, url, id, contentFilters, sortFilter);
@@ -75,12 +78,12 @@ public ListLinkHandler fromQuery(final String id,
      * @return the url corresponding to id without any filters applied
      */
     public String getUrl(final String id) throws ParsingException {
-        return getUrl(id, new ArrayList<>(0), "");
+        return getUrl(id, new ArrayList<>(0), null);
     }
 
     @Override
     public String getUrl(final String id, final String baseUrl) throws ParsingException {
-        return getUrl(id, new ArrayList<>(0), "", baseUrl);
+        return getUrl(id, new ArrayList<>(0), null, baseUrl);
     }
 
     /**
@@ -89,8 +92,8 @@ public String getUrl(final String id, final String baseUrl) throws ParsingExcept
      *
      * @return filter that can be applied when building a query for getting a list
      */
-    public String[] getAvailableContentFilter() {
-        return new String[0];
+    public Filter getAvailableContentFilter() {
+        return null;
     }
 
     /**
@@ -99,7 +102,15 @@ public String[] getAvailableContentFilter() {
      *
      * @return filter that can be applied when building a query for getting a list
      */
-    public String[] getAvailableSortFilter() {
-        return new String[0];
+    public Filter getAvailableSortFilter() {
+        return null;
+    }
+
+    public Filter getContentFilterSortFilterVariant(final int contentFilterId) {
+        return null;
+    }
+
+    public FilterItem getFilterItem(final int filterId) {
+        return null;
     }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandler.java
@@ -1,14 +1,16 @@
 package org.schabi.newpipe.extractor.linkhandler;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import java.util.List;
 
 public class SearchQueryHandler extends ListLinkHandler {
 
     public SearchQueryHandler(final String originalUrl,
                               final String url,
                               final String searchString,
-                              final List<String> contentFilters,
-                              final String sortFilter) {
+                              final List<FilterItem> contentFilters,
+                              final List<FilterItem> sortFilter) {
         super(originalUrl, url, searchString, contentFilters, sortFilter);
     }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandlerFactory.java
@@ -1,6 +1,6 @@
 package org.schabi.newpipe.extractor.linkhandler;
 
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
 
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
@@ -14,8 +14,8 @@ public abstract class SearchQueryHandlerFactory extends ListLinkHandlerFactory {
     ///////////////////////////////////
 
     @Override
-    public abstract String getUrl(String query, List<String> contentFilter, String sortFilter)
-            throws ParsingException;
+    public abstract String getUrl(String query, List<FilterItem> selectedContentFilter,
+                                  List<FilterItem> selectedSortFilter) throws ParsingException;
 
     @SuppressWarnings("unused")
     public String getSearchString(final String url) {
@@ -33,13 +33,13 @@ public String getId(final String url) {
 
     @Override
     public SearchQueryHandler fromQuery(final String query,
-                                        final List<String> contentFilter,
-                                        final String sortFilter) throws ParsingException {
+                                        final List<FilterItem> contentFilter,
+                                        final List<FilterItem> sortFilter) throws ParsingException {
         return new SearchQueryHandler(super.fromQuery(query, contentFilter, sortFilter));
     }
 
     public SearchQueryHandler fromQuery(final String query) throws ParsingException {
-        return fromQuery(query, Collections.emptyList(), EMPTY_STRING);
+        return fromQuery(query, Collections.emptyList(), null);
     }
 
     /**
