Add support for channel tabs

extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.extractor;
 
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
+import org.schabi.newpipe.extractor.channel.ChannelTabExtractor;
 import org.schabi.newpipe.extractor.comments.CommentsExtractor;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -57,7 +58,8 @@ public static class ServiceInfo {
 
         /**
          * Creates a new instance of a ServiceInfo
-         * @param name the name of the service
+         *
+         * @param name              the name of the service
          * @param mediaCapabilities the type of media this service can handle
          */
         public ServiceInfo(final String name, final List<MediaCapability> mediaCapabilities) {
@@ -97,8 +99,9 @@ public enum LinkType {
      * If you Implement one do not set id within your implementation of this extractor, instead
      * set the id when you put the extractor into {@link ServiceList}
      * All other parameters can be set directly from the overriding constructor.
-     * @param id the number of the service to identify him within the NewPipe frontend
-     * @param name the name of the service
+     *
+     * @param id           the number of the service to identify him within the NewPipe frontend
+     * @param name         the name of the service
      * @param capabilities the type of media this service can handle
      */
     public StreamingService(final int id,
@@ -129,29 +132,42 @@ public String toString() {
 
     /**
      * Must return a new instance of an implementation of LinkHandlerFactory for streams.
+     *
      * @return an instance of a LinkHandlerFactory for streams
      */
     public abstract LinkHandlerFactory getStreamLHFactory();
 
     /**
      * Must return a new instance of an implementation of ListLinkHandlerFactory for channels.
      * If support for channels is not given null must be returned.
+     *
      * @return an instance of a ListLinkHandlerFactory for channels or null
      */
     public abstract ListLinkHandlerFactory getChannelLHFactory();
 
+    /**
+     * Must return a new instance of an implementation of ListLinkHandlerFactory for channel tabs.
+     * If support for channel tabs is not given null must be returned.
+     *
+     * @return an instance of a ListLinkHandlerFactory for channels or null
+     */
+    public abstract ListLinkHandlerFactory getChannelTabLHFactory();
+
     /**
      * Must return a new instance of an implementation of ListLinkHandlerFactory for playlists.
      * If support for playlists is not given null must be returned.
+     *
      * @return an instance of a ListLinkHandlerFactory for playlists or null
      */
     public abstract ListLinkHandlerFactory getPlaylistLHFactory();
 
     /**
      * Must return an instance of an implementation of SearchQueryHandlerFactory.
+     *
      * @return an instance of a SearchQueryHandlerFactory
      */
     public abstract SearchQueryHandlerFactory getSearchQHFactory();
+
     public abstract ListLinkHandlerFactory getCommentsLHFactory();
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -160,19 +176,22 @@ public String toString() {
 
     /**
      * Must create a new instance of a SearchExtractor implementation.
+     *
      * @param queryHandler specifies the keyword lock for, and the filters which should be applied.
      * @return a new SearchExtractor instance
      */
     public abstract SearchExtractor getSearchExtractor(SearchQueryHandler queryHandler);
 
     /**
      * Must create a new instance of a SuggestionExtractor implementation.
+     *
      * @return a new SuggestionExtractor instance
      */
     public abstract SuggestionExtractor getSuggestionExtractor();
 
     /**
      * Outdated or obsolete. null can be returned.
+     *
      * @return just null
      */
     public abstract SubscriptionExtractor getSubscriptionExtractor();
@@ -192,20 +211,32 @@ public FeedExtractor getFeedExtractor(final String url) throws ExtractionExcepti
 
     /**
      * Must create a new instance of a KioskList implementation.
+     *
      * @return a new KioskList instance
      */
     public abstract KioskList getKioskList() throws ExtractionException;
 
     /**
      * Must create a new instance of a ChannelExtractor implementation.
+     *
      * @param linkHandler is pointing to the channel which should be handled by this new instance.
      * @return a new ChannelExtractor
      */
     public abstract ChannelExtractor getChannelExtractor(ListLinkHandler linkHandler)
             throws ExtractionException;
 
+    /**
+     * Must create a new instance of a ChannelTabExtractor implementation.
+     *
+     * @param linkHandler is pointing to the channel which should be handled by this new instance.
+     * @return a new ChannelTabExtractor
+     */
+    public abstract ChannelTabExtractor getChannelTabExtractor(ListLinkHandler linkHandler)
+            throws ExtractionException;
+
     /**
      * Must crete a new instance of a PlaylistExtractor implementation.
+     *
      * @param linkHandler is pointing to the playlist which should be handled by this new instance.
      * @return a new PlaylistExtractor
      */
@@ -214,6 +245,7 @@ public abstract PlaylistExtractor getPlaylistExtractor(ListLinkHandler linkHandl
 
     /**
      * Must create a new instance of a StreamExtractor implementation.
+     *
      * @param linkHandler is pointing to the stream which should be handled by this new instance.
      * @return a new StreamExtractor
      */
@@ -242,6 +274,19 @@ public ChannelExtractor getChannelExtractor(final String id,
                 .fromQuery(id, contentFilter, sortFilter));
     }
 
+    public ChannelTabExtractor getChannelTabExtractorFromId(final String id, final String tab)
+            throws ExtractionException {
+        return getChannelTabExtractor(getChannelTabLHFactory().fromQuery(
+                id, Collections.singletonList(tab), ""));
+    }
+
+    public ChannelTabExtractor getChannelTabExtractorFromId(final String id, final String tab,
+                                                            final String baseUrl)
+            throws ExtractionException {
+        return getChannelTabExtractor(getChannelTabLHFactory().fromQuery(
+                id, Collections.singletonList(tab), "", baseUrl));
+    }
+
     public PlaylistExtractor getPlaylistExtractor(final String id,
                                                   final List<String> contentFilter,
                                                   final String sortFilter)
@@ -284,6 +329,7 @@ public CommentsExtractor getCommentsExtractor(final String url) throws Extractio
 
     /**
      * Figures out where the link is pointing to (a channel, a video, a playlist, etc.)
+     *
      * @param url the url on which it should be decided of which link type it is
      * @return the link type of url
      */

extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java

@@ -1,10 +1,14 @@
 package org.schabi.newpipe.extractor.channel;
 
-import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.Extractor;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.Nonnull;
 
 /*
  * Created by Christian Schabesberger on 25.07.16.
@@ -26,7 +30,7 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public abstract class ChannelExtractor extends ListExtractor<StreamInfoItem> {
+public abstract class ChannelExtractor extends Extractor {
 
     public static final long UNKNOWN_SUBSCRIBER_COUNT = -1;
 
@@ -43,5 +47,10 @@ public ChannelExtractor(final StreamingService service, final ListLinkHandler li
     public abstract String getParentChannelUrl() throws ParsingException;
     public abstract String getParentChannelAvatarUrl() throws ParsingException;
     public abstract boolean isVerified() throws ParsingException;
-
+    @Nonnull
+    public abstract List<ListLinkHandler> getTabs() throws ParsingException;
+    @Nonnull
+    public List<String> getTags() throws ParsingException {
+        return Collections.emptyList();
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java

@@ -1,16 +1,16 @@
 package org.schabi.newpipe.extractor.channel;
 
-import org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage;
-import org.schabi.newpipe.extractor.ListInfo;
+import org.schabi.newpipe.extractor.Info;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.extractor.utils.ExtractorHelper;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.Nonnull;
 
 /*
  * Created by Christian Schabesberger on 31.07.16.
@@ -32,16 +32,14 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class ChannelInfo extends ListInfo<StreamInfoItem> {
+public class ChannelInfo extends Info {
 
     public ChannelInfo(final int serviceId,
                        final String id,
                        final String url,
                        final String originalUrl,
-                       final String name,
-                       final ListLinkHandler listLinkHandler) {
-        super(serviceId, id, url, originalUrl, name, listLinkHandler.getContentFilters(),
-                listLinkHandler.getSortFilter());
+                       final String name) {
+        super(serviceId, id, url, originalUrl, name);
     }
 
     public static ChannelInfo getInfo(final String url) throws IOException, ExtractionException {
@@ -55,13 +53,6 @@ public static ChannelInfo getInfo(final StreamingService service, final String u
         return getInfo(extractor);
     }
 
-    public static InfoItemsPage<StreamInfoItem> getMoreItems(final StreamingService service,
-                                                             final String url,
-                                                             final Page page)
-            throws IOException, ExtractionException {
-        return service.getChannelExtractor(url).getPage(page);
-    }
-
     public static ChannelInfo getInfo(final ChannelExtractor extractor)
             throws IOException, ExtractionException {
 
@@ -71,8 +62,7 @@ public static ChannelInfo getInfo(final ChannelExtractor extractor)
         final String originalUrl = extractor.getOriginalUrl();
         final String name = extractor.getName();
 
-        final ChannelInfo info =
-                new ChannelInfo(serviceId, id, url, originalUrl, name, extractor.getLinkHandler());
+        final ChannelInfo info = new ChannelInfo(serviceId, id, url, originalUrl, name);
 
         try {
             info.setAvatarUrl(extractor.getAvatarUrl());
@@ -90,11 +80,6 @@ public static ChannelInfo getInfo(final ChannelExtractor extractor)
             info.addError(e);
         }
 
-        final InfoItemsPage<StreamInfoItem> itemsPage =
-                ExtractorHelper.getItemsPageOrLogError(info, extractor);
-        info.setRelatedItems(itemsPage.getItems());
-        info.setNextPage(itemsPage.getNextPage());
-
         try {
             info.setSubscriberCount(extractor.getSubscriberCount());
         } catch (final Exception e) {
@@ -130,6 +115,17 @@ public static ChannelInfo getInfo(final ChannelExtractor extractor)
             info.addError(e);
         }
 
+        try {
+            info.setTabs(extractor.getTabs());
+        } catch (final Exception e) {
+            info.addError(e);
+        }
+        try {
+            info.setTags(extractor.getTags());
+        } catch (final Exception e) {
+            info.addError(e);
+        }
+
         return info;
     }
 
@@ -144,6 +140,10 @@ public static ChannelInfo getInfo(final ChannelExtractor extractor)
     private String[] donationLinks;
     private boolean verified;
 
+    private List<ListLinkHandler> tabs = Collections.emptyList();
+
+    private List<String> tags = Collections.emptyList();
+
     public String getParentChannelName() {
         return parentChannelName;
     }
@@ -223,4 +223,22 @@ public boolean isVerified() {
     public void setVerified(final boolean verified) {
         this.verified = verified;
     }
+
+    @Nonnull
+    public List<ListLinkHandler> getTabs() {
+        return tabs;
+    }
+
+    public void setTabs(@Nonnull final List<ListLinkHandler> tabs) {
+        this.tabs = tabs;
+    }
+
+    @Nonnull
+    public List<String> getTags() {
+        return tags;
+    }
+
+    public void setTags(@Nonnull final List<String> tags) {
+        this.tags = tags;
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelTabExtractor.java

@@ -0,0 +1,28 @@
+package org.schabi.newpipe.extractor.channel;
+
+import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.ListExtractor;
+import org.schabi.newpipe.extractor.StreamingService;
+import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
+
+import javax.annotation.Nonnull;
+
+public abstract class ChannelTabExtractor extends ListExtractor<InfoItem> {
+
+    public ChannelTabExtractor(final StreamingService service,
+                               final ListLinkHandler linkHandler) {
+        super(service, linkHandler);
+    }
+
+    @Nonnull
+    public String getTab() {
+        return getLinkHandler().getContentFilters().get(0);
+    }
+
+    @Nonnull
+    @Override
+    public String getName() throws ParsingException {
+        return getTab();
+    }
+}