Remove getNextPageUrl() function from ListExtractor

Author: wb9688

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

@@ -16,7 +16,6 @@
  * Base class to extractors that have a list (e.g. playlists, users).
  */
 public abstract class ListExtractor<R extends InfoItem> extends Extractor {
-
     /**
      * Constant that should be returned whenever
      * a list has an unknown number of items.
@@ -46,29 +45,15 @@ public ListExtractor(StreamingService service, ListLinkHandler linkHandler) {
     @Nonnull
     public abstract InfoItemsPage<R> getInitialPage() throws IOException, ExtractionException;
 
-    /**
-     * Returns an url that can be used to get the next page relative to the initial one.
-     * <p>Usually, these links will only work in the implementation itself.</p>
-     *
-     * @return an url pointing to the next page relative to the initial page
-     * @see #getPage(String)
-     */
-    public abstract String getNextPageUrl() throws IOException, ExtractionException;
-
     /**
      * Get a list of items corresponding to the specific requested page.
      *
      * @param pageUrl any page url got from the exclusive implementation of the list extractor
      * @return a {@link InfoItemsPage} corresponding to the requested page
-     * @see #getNextPageUrl()
      * @see InfoItemsPage#getNextPageUrl()
      */
     public abstract InfoItemsPage<R> getPage(final String pageUrl) throws IOException, ExtractionException;
 
-    public boolean hasNextPage() throws IOException, ExtractionException {
-        return !isNullOrEmpty(getNextPageUrl());
-    }
-
     @Override
     public ListLinkHandler getLinkHandler() {
         return (ListLinkHandler) super.getLinkHandler();
@@ -140,5 +125,4 @@ public List<Throwable> getErrors() {
             return errors;
         }
     }
-
 }

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java

@@ -78,11 +78,6 @@ public InfoItemsPage<StreamInfoItem> getInitialPage() {
         return new InfoItemsPage<>(collector, null);
     }
 
-    @Override
-    public String getNextPageUrl() {
-        return null;
-    }
-
     @Override
     public InfoItemsPage<StreamInfoItem> getPage(final String pageUrl) {
         return null;

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceKiosk.java

@@ -40,11 +40,6 @@ public InfoItemsPage<ChannelInfoItem> getInitialPage() {
         return new InfoItemsPage<>(collector, "");
     }
 
-    @Override
-    public String getNextPageUrl() {
-        return "";
-    }
-
     @Override
     public InfoItemsPage<ChannelInfoItem> getPage(final String pageUrl) {
         return InfoItemsPage.emptyPage();

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCSearchExtractor.java

@@ -79,11 +79,6 @@ public InfoItemsPage<InfoItem> getInitialPage() {
         return new InfoItemsPage<>(searchItems, null);
     }
 
-    @Override
-    public String getNextPageUrl() {
-        return "";
-    }
-
     @Override
     public InfoItemsPage<InfoItem> getPage(final String pageUrl) {
         return InfoItemsPage.emptyPage();

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java

@@ -20,23 +20,21 @@
 
 import java.io.IOException;
 
-import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.*;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.COUNT_KEY;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.ITEMS_PER_PAGE;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.START_KEY;
 
 public class PeertubeAccountExtractor extends ChannelExtractor {
-
-    private InfoItemsPage<StreamInfoItem> initPage;
-    private long total;
-
     private JsonObject json;
     private final String baseUrl;
 
-    public PeertubeAccountExtractor(StreamingService service, ListLinkHandler linkHandler) throws ParsingException {
+    public PeertubeAccountExtractor(final StreamingService service, final ListLinkHandler linkHandler) throws ParsingException {
         super(service, linkHandler);
         this.baseUrl = getBaseUrl();
     }
 
     @Override
-    public String getAvatarUrl() throws ParsingException {
+    public String getAvatarUrl() {
         String value;
         try {
             value = JsonUtils.getString(json, "avatar.path");
@@ -47,7 +45,7 @@ public String getAvatarUrl() throws ParsingException {
     }
 
     @Override
-    public String getBannerUrl() throws ParsingException {
+    public String getBannerUrl() {
         return null;
     }
 
@@ -58,12 +56,12 @@ public String getFeedUrl() throws ParsingException {
 
     @Override
     public long getSubscriberCount() throws ParsingException {
-        Number number = JsonUtils.getNumber(json, "followersCount");
+        final Number number = JsonUtils.getNumber(json, "followersCount");
         return number.longValue();
     }
 
     @Override
-    public String getDescription() throws ParsingException {
+    public String getDescription() {
         try {
             return JsonUtils.getString(json, "description");
         } catch (ParsingException e) {
@@ -72,53 +70,46 @@ public String getDescription() throws ParsingException {
     }
 
     @Override
-    public String getParentChannelName() throws ParsingException {
+    public String getParentChannelName() {
         return "";
     }
 
     @Override
-    public String getParentChannelUrl() throws ParsingException {
+    public String getParentChannelUrl() {
         return "";
     }
 
     @Override
-    public String getParentChannelAvatarUrl() throws ParsingException {
+    public String getParentChannelAvatarUrl() {
         return "";
     }
 
     @Override
     public InfoItemsPage<StreamInfoItem> getInitialPage() throws IOException, ExtractionException {
-        super.fetchPage();
-        return initPage;
+        final String pageUrl = getUrl() + "/videos?" + START_KEY + "=0&" + COUNT_KEY + "=" + ITEMS_PER_PAGE;
+        return getPage(pageUrl);
     }
 
-    private void collectStreamsFrom(StreamInfoItemsCollector collector, JsonObject json, String pageUrl) throws ParsingException {
-        JsonArray contents;
+    private void collectStreamsFrom(StreamInfoItemsCollector collector, JsonObject json) throws ParsingException {
+        final JsonArray contents;
         try {
             contents = (JsonArray) JsonUtils.getValue(json, "data");
         } catch (Exception e) {
             throw new ParsingException("unable to extract channel streams", e);
         }
 
-        for (Object c : contents) {
+        for (final Object c : contents) {
             if (c instanceof JsonObject) {
                 final JsonObject item = (JsonObject) c;
-                PeertubeStreamInfoItemExtractor extractor = new PeertubeStreamInfoItemExtractor(item, baseUrl);
+                final PeertubeStreamInfoItemExtractor extractor = new PeertubeStreamInfoItemExtractor(item, baseUrl);
                 collector.commit(extractor);
             }
         }
-
-    }
-
-    @Override
-    public String getNextPageUrl() throws IOException, ExtractionException {
-        super.fetchPage();
-        return initPage.getNextPageUrl();
     }
 
     @Override
-    public InfoItemsPage<StreamInfoItem> getPage(String pageUrl) throws IOException, ExtractionException {
-        Response response = getDownloader().get(pageUrl);
+    public InfoItemsPage<StreamInfoItem> getPage(final String pageUrl) throws IOException, ExtractionException {
+        final Response response = getDownloader().get(pageUrl);
         JsonObject json = null;
         if (response != null && !Utils.isBlank(response.responseBody())) {
             try {
@@ -128,31 +119,29 @@ public InfoItemsPage<StreamInfoItem> getPage(String pageUrl) throws IOException,
             }
         }
 
-        StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
+        final StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
+        final long total;
         if (json != null) {
             PeertubeParsingHelper.validate(json);
             total = JsonUtils.getNumber(json, "total").longValue();
-            collectStreamsFrom(collector, json, pageUrl);
+            collectStreamsFrom(collector, json);
         } else {
             throw new ExtractionException("Unable to get PeerTube kiosk info");
         }
         return new InfoItemsPage<>(collector, PeertubeParsingHelper.getNextPageUrl(pageUrl, total));
     }
 
     @Override
-    public void onFetchPage(Downloader downloader) throws IOException, ExtractionException {
-        Response response = downloader.get(getUrl());
-        if (null != response && null != response.responseBody()) {
+    public void onFetchPage(final Downloader downloader) throws IOException, ExtractionException {
+        final Response response = downloader.get(getUrl());
+        if (response != null && response.responseBody() != null) {
             setInitialData(response.responseBody());
         } else {
             throw new ExtractionException("Unable to extract PeerTube channel data");
         }
-
-        String pageUrl = getUrl() + "/videos?" + START_KEY + "=0&" + COUNT_KEY + "=" + ITEMS_PER_PAGE;
-        this.initPage = getPage(pageUrl);
     }
 
-    private void setInitialData(String responseBody) throws ExtractionException {
+    private void setInitialData(final String responseBody) throws ExtractionException {
         try {
             json = JsonParser.object().from(responseBody);
         } catch (JsonParserException e) {
@@ -170,5 +159,4 @@ public String getName() throws ParsingException {
     public String getOriginalUrl() throws ParsingException {
         return baseUrl + "/" + getId();
     }
-
 }