[Bandcamp]

Author: Stypox

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampChannelTabExtractor.java

@@ -12,6 +12,7 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
 import org.schabi.newpipe.extractor.services.bandcamp.extractors.streaminfoitem.BandcampDiscographStreamInfoItemExtractor;
 
 import javax.annotation.Nonnull;
@@ -25,16 +26,13 @@ public BandcampChannelTabExtractor(final StreamingService service,
                                        final ListLinkHandler linkHandler) {
         super(service, linkHandler);
 
-        final String tab = linkHandler.getContentFilters().get(0);
-        switch (tab) {
-            case ChannelTabs.TRACKS:
-                filter = "track";
-                break;
-            case ChannelTabs.ALBUMS:
-                filter = "album";
-                break;
-            default:
-                throw new IllegalArgumentException("Unsupported channel tab: " + tab);
+        final FilterItem type = getChannelTabType();
+        if (type.equals(ChannelTabs.TRACKS)) {
+            filter = "track";
+        } else if (type.equals(ChannelTabs.ALBUMS)) {
+            filter = "album";
+        } else {
+            throw new IllegalArgumentException("Unsupported channel tab: " + type);
         }
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/linkHandler/BandcampChannelTabLinkHandlerFactory.java

@@ -5,8 +5,11 @@
 import org.schabi.newpipe.extractor.channel.tabs.ChannelTabs;
 import org.schabi.newpipe.extractor.exceptions.UnsupportedTabException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
+import org.schabi.newpipe.extractor.search.filter.FilterItem;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import java.util.List;
 
 public final class BandcampChannelTabLinkHandlerFactory extends ListLinkHandlerFactory {
@@ -35,12 +38,12 @@ public static BandcampChannelTabLinkHandlerFactory getInstance() {
      * @throws UnsupportedTabException if the tab is not supported
      */
     @Nonnull
-    public static String getUrlSuffix(@Nonnull final String tab) throws UnsupportedTabException {
-        switch (tab) {
-            case ChannelTabs.TRACKS:
-                return "/track";
-            case ChannelTabs.ALBUMS:
-                return "/album";
+    public static String getUrlSuffix(@Nonnull final FilterItem tab)
+            throws UnsupportedTabException {
+        if (tab.equals(ChannelTabs.TRACKS)) {
+            return "/track";
+        } else if (tab.equals(ChannelTabs.ALBUMS)) {
+            return "/album";
         }
         throw new UnsupportedTabException(tab);
     }
@@ -51,7 +54,9 @@ public String getId(final String url) throws ParsingException, UnsupportedOperat
     }
 
     @Override
-    public String getUrl(final String id, final List<String> contentFilter, final String sortFilter)
+    public String getUrl(final String id,
+                         @Nonnull final List<FilterItem> contentFilter,
+                         @Nullable final List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException {
         return BandcampChannelLinkHandlerFactory.getInstance().getUrl(id)
                 + getUrlSuffix(contentFilter.get(0));
@@ -61,12 +66,4 @@ public String getUrl(final String id, final List<String> contentFilter, final St
     public boolean onAcceptUrl(final String url) throws ParsingException {
         return BandcampChannelLinkHandlerFactory.getInstance().onAcceptUrl(url);
     }
-
-    @Override
-    public String[] getAvailableContentFilter() {
-        return new String[]{
-                ChannelTabs.TRACKS,
-                ChannelTabs.ALBUMS,
-        };
-    }
 }