searchfilters: convert media_ccc to new framework

evermind-zz · InfinityLoop1308 · commit 6769c829ed98 · 2022-09-15T13:27:13.000+08:00
Available content filters:
- All
- Conferences
- Events
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCSearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCSearchExtractor.java
@@ -1,9 +1,6 @@
 package org.schabi.newpipe.extractor.services.media_ccc.extractors;
 
-import static org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCSearchQueryHandlerFactory.ALL;
-import static org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCSearchQueryHandlerFactory.CONFERENCES;
-import static org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCSearchQueryHandlerFactory.EVENTS;
-
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonParser;
@@ -29,6 +26,10 @@
 
 import javax.annotation.Nonnull;
 
+import static org.schabi.newpipe.extractor.services.media_ccc.search.filter.MediaCCCFilters.ALL;
+import static org.schabi.newpipe.extractor.services.media_ccc.search.filter.MediaCCCFilters.CONFERENCES;
+import static org.schabi.newpipe.extractor.services.media_ccc.search.filter.MediaCCCFilters.EVENTS;
+
 public class MediaCCCSearchExtractor extends SearchExtractor {
     private JsonObject doc;
     private MediaCCCConferenceKiosk conferenceKiosk;
@@ -62,22 +63,27 @@ public List<MetaInfo> getMetaInfo() {
         return Collections.emptyList();
     }
 
+    private FilterItem getContentFilter() {
+        // TODO check if getLinkHandler().getContentFilters() not empty
+        final FilterItem filterItem = getLinkHandler().getContentFilters().get(0);
+
+        return filterItem;
+    }
     @Nonnull
     @Override
     public InfoItemsPage<InfoItem> getInitialPage() {
         final MultiInfoItemsCollector searchItems = new MultiInfoItemsCollector(getServiceId());
 
-        if (getLinkHandler().getContentFilters().contains(CONFERENCES)
-                || getLinkHandler().getContentFilters().contains(ALL)
-                || getLinkHandler().getContentFilters().isEmpty()) {
+
+        final FilterItem filterItem = getContentFilter();
+
+        if (filterItem.getName().contains(CONFERENCES) || filterItem.getName().equals(ALL)) {
             searchConferences(getSearchString(),
                     conferenceKiosk.getInitialPage().getItems(),
                     searchItems);
         }
 
-        if (getLinkHandler().getContentFilters().contains(EVENTS)
-                || getLinkHandler().getContentFilters().contains(ALL)
-                || getLinkHandler().getContentFilters().isEmpty()) {
+        if (filterItem.getName().equals(EVENTS) || filterItem.getName().equals(ALL)) {
             final JsonArray events = doc.getArray("events");
             for (int i = 0; i < events.size(); i++) {
                 // Ensure only uploaded talks are shown in the search results.
@@ -100,9 +106,10 @@ public InfoItemsPage<InfoItem> getPage(final Page page) {
     @Override
     public void onFetchPage(@Nonnull final Downloader downloader)
             throws IOException, ExtractionException {
-        if (getLinkHandler().getContentFilters().contains(EVENTS)
-                || getLinkHandler().getContentFilters().contains(ALL)
-                || getLinkHandler().getContentFilters().isEmpty()) {
+
+        final FilterItem filterItem = getContentFilter();
+
+        if (filterItem.getName().contains(EVENTS) || filterItem.getName().equals(ALL)) {
             final String site;
             final String url = getUrl();
             site = downloader.get(url, getExtractorLocalization()).responseBody();
@@ -112,9 +119,8 @@ public void onFetchPage(@Nonnull final Downloader downloader)
                 throw new ExtractionException("Could not parse JSON.", jpe);
             }
         }
-        if (getLinkHandler().getContentFilters().contains(CONFERENCES)
-                || getLinkHandler().getContentFilters().contains(ALL)
-                || getLinkHandler().getContentFilters().isEmpty()) {
+
+        if (filterItem.getName().contains(CONFERENCES) || filterItem.getName().equals(ALL)) {
             conferenceKiosk.fetchPage();
         }
     }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCConferenceLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCConferenceLinkHandlerFactory.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor.services.media_ccc.linkHandler;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 import org.schabi.newpipe.extractor.utils.Parser;
@@ -16,8 +18,8 @@ public class MediaCCCConferenceLinkHandlerFactory extends ListLinkHandlerFactory
 
     @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 CONFERENCE_PATH + id;
     }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCConferencesListLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCConferencesListLinkHandlerFactory.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor.services.media_ccc.linkHandler;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 
@@ -12,8 +14,8 @@ public String getId(final String url) throws ParsingException {
     }
 
     @Override
-    public String getUrl(final String id, final List<String> contentFilter,
-                         final String sortFilter) throws ParsingException {
+    public String getUrl(final String id, final List<FilterItem> contentFilter,
+                         final List<FilterItem> sortFilter) throws ParsingException {
         return "https://media.ccc.de/public/conferences";
     }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCLiveListLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCLiveListLinkHandlerFactory.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor.services.media_ccc.linkHandler;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 
@@ -21,8 +23,8 @@ public boolean onAcceptUrl(final String url) throws ParsingException {
 
     @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 {
         // FIXME: wrong URL; should be https://streaming.media.ccc.de/{conference_slug}/{room_slug}
         return "https://media.ccc.de/live";
     }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCRecentListLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCRecentListLinkHandlerFactory.java
@@ -1,5 +1,7 @@
 package org.schabi.newpipe.extractor.services.media_ccc.linkHandler;
 
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
 
 import java.util.List;
@@ -20,8 +22,8 @@ public boolean onAcceptUrl(final String url) {
 
     @Override
     public String getUrl(final String id,
-                         final List<String> contentFilter,
-                         final String sortFilter) {
+                         final List<FilterItem> contentFilter,
+                         final List<FilterItem> sortFilter) {
         return "https://media.ccc.de/recent";
     }
 }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCSearchQueryHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCSearchQueryHandlerFactory.java
@@ -1,7 +1,11 @@
 package org.schabi.newpipe.extractor.services.media_ccc.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.linkhandler.SearchQueryHandlerFactory;
+import org.schabi.newpipe.extractor.services.media_ccc.search.filter.MediaCCCFilters;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -10,27 +14,22 @@
 import static org.schabi.newpipe.extractor.utils.Utils.UTF_8;
 
 public class MediaCCCSearchQueryHandlerFactory extends SearchQueryHandlerFactory {
-    public static final String ALL = "all";
-    public static final String CONFERENCES = "conferences";
-    public static final String EVENTS = "events";
+
+    public final MediaCCCFilters searchFilters = new MediaCCCFilters();
 
     @Override
-    public String[] getAvailableContentFilter() {
-        return new String[]{
-                ALL,
-                CONFERENCES,
-                EVENTS
-        };
+    public Filter getAvailableContentFilter() {
+        return searchFilters.getContentFilters();
     }
 
     @Override
-    public String[] getAvailableSortFilter() {
-        return new String[0];
+    public FilterItem getFilterItem(final int filterId) {
+        return searchFilters.getFilterItem(filterId);
     }
 
     @Override
-    public String getUrl(final String query, final List<String> contentFilter,
-                         final String sortFilter) throws ParsingException {
+    public String getUrl(final String query, final List<FilterItem> contentFilter,
+                         final List<FilterItem> sortFilter) throws ParsingException {
         try {
             return "https://media.ccc.de/public/events/search?q="
                     + URLEncoder.encode(query, UTF_8);
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/search/filter/MediaCCCFilters.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/search/filter/MediaCCCFilters.java
@@ -0,0 +1,43 @@
+package org.schabi.newpipe.extractor.services.media_ccc.search.filter;
+
+import org.schabi.newpipe.extractor.search.filter.Filter;
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
+import org.schabi.newpipe.extractor.search.filter.SearchFiltersBase;
+
+public final class MediaCCCFilters extends SearchFiltersBase {
+
+    public static final String ALL = "all";
+    public static final String CONFERENCES = "conferences";
+    public static final String EVENTS = "events";
+
+    public MediaCCCFilters() {
+        init();
+        build();
+    }
+
+    @Override
+    public String evaluateSelectedFilters(final String searchString) {
+        return null;
+    }
+
+    @Override
+    protected void init() {
+        /* content filters */
+        final int contentFilterAll = builder.addFilterItem(
+                new FilterItem(Filter.ITEM_IDENTIFIER_UNKNOWN, ALL));
+        final int contentFilterConferences = builder.addFilterItem(
+                new FilterItem(Filter.ITEM_IDENTIFIER_UNKNOWN, CONFERENCES));
+        final int contentFilterEvents = builder.addFilterItem(
+                new FilterItem(Filter.ITEM_IDENTIFIER_UNKNOWN, EVENTS));
+
+        // 'ALL' this is the default search content filter.
+        this.defaultContentFilterId = contentFilterAll;
+
+        /* content filters with sort filters */
+        addContentFilter(builder.createSortGroup(null, true, new FilterItem[]{
+                builder.getFilterForId(contentFilterAll),
+                builder.getFilterForId(contentFilterConferences),
+                builder.getFilterForId(contentFilterEvents),
+        }));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package org.schabi.newpipe.extractor.services.media_ccc.linkHandler;`
`2`	`2`
	`3`	`+import org.schabi.newpipe.extractor.search.filter.FilterItem;`
	`4`	`+`
`3`	`5`	`import org.schabi.newpipe.extractor.exceptions.ParsingException;`
`4`	`6`	`import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;`
`5`	`7`
`@@ -12,8 +14,8 @@ public String getId(final String url) throws ParsingException {`
`12`	`14`	`}`
`13`	`15`
`14`	`16`	`@Override`
`15`		`- public String getUrl(final String id, final List<String> contentFilter,`
`16`		`- final String sortFilter) throws ParsingException {`
	`17`	`+ public String getUrl(final String id, final List<FilterItem> contentFilter,`
	`18`	`+ final List<FilterItem> sortFilter) throws ParsingException {`
`17`	`19`	`return "https://media.ccc.de/public/conferences";`
`18`	`20`	`}`
`19`	`21`