made getPage() function be stand alone

Author: theScrabi

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

@@ -10,32 +10,26 @@
  * Base class to extractors that have a list (e.g. playlists, users).
  */
 public abstract class ListExtractor extends Extractor {
-    protected String nextPageUrl;
 
     /**
      * Get a new ListExtractor with the given nextPageUrl set.
      */
-    public ListExtractor(StreamingService service, String url, String nextPageUrl) throws ExtractionException {
+    public ListExtractor(StreamingService service, String url) throws ExtractionException {
         super(service, url);
-        setNextPageUrl(nextPageUrl);
     }
 
     @Nonnull
     public abstract InfoItemsCollector getInfoItems() throws IOException, ExtractionException;
 
-    public abstract InfoItemPage getInfoItemPage() throws IOException, ExtractionException;
+    public abstract String getNextPageUrl() throws IOException, ExtractionException;
 
-    public boolean hasNextPage() {
-        return nextPageUrl != null && !nextPageUrl.isEmpty();
-    }
+    public abstract InfoItemPage getPage(final String nextPageUrl) throws IOException, ExtractionException;
 
-    public String getNextPageUrl() {
-        return nextPageUrl;
+    public boolean hasNextPage() throws IOException, ExtractionException {
+        return getNextPageUrl() != null && !getNextPageUrl().isEmpty();
     }
 
-    public void setNextPageUrl(String nextPageUrl) {
-        this.nextPageUrl = nextPageUrl;
-    }
+
 
     /*//////////////////////////////////////////////////////////////////////////
     // Inner

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

@@ -68,20 +68,12 @@ public String toString() {
     public abstract UrlIdHandler getPlaylistUrlIdHandler();
     public abstract SearchEngine getSearchEngine();
     public abstract SuggestionExtractor getSuggestionExtractor();
-    public abstract StreamExtractor getStreamExtractor(String url) throws IOException, ExtractionException;
-    public abstract ChannelExtractor getChannelExtractor(String url, String nextPageUrl) throws IOException, ExtractionException;
-    public abstract PlaylistExtractor getPlaylistExtractor(String url, String nextPageUrl) throws IOException, ExtractionException;
+    public abstract StreamExtractor getStreamExtractor(String url) throws ExtractionException;
     public abstract KioskList getKioskList() throws ExtractionException;
+    public abstract ChannelExtractor getChannelExtractor(String url) throws ExtractionException;
+    public abstract PlaylistExtractor getPlaylistExtractor(String url) throws ExtractionException;
     public abstract SubscriptionExtractor getSubscriptionExtractor();
 
-    public ChannelExtractor getChannelExtractor(String url) throws IOException, ExtractionException {
-        return getChannelExtractor(url, null);
-    }
-
-    public PlaylistExtractor getPlaylistExtractor(String url) throws IOException, ExtractionException {
-        return getPlaylistExtractor(url, null);
-    }
-
     /**
      * figure out where the link is pointing to (a channel, video, playlist, etc.)
      */

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

@@ -31,9 +31,9 @@
 
 public abstract class ChannelExtractor extends ListExtractor {
 
-    public ChannelExtractor(StreamingService service, String url, String nextPageUrl)
+    public ChannelExtractor(StreamingService service, String url)
             throws ExtractionException {
-        super(service, url, nextPageUrl);
+        super(service, url);
     }
 
     @Nonnull
@@ -55,5 +55,4 @@ public InfoItemsCollector getInfoItems()
     public abstract String getFeedUrl() throws ParsingException;
     public abstract long getSubscriberCount() throws ParsingException;
     public abstract String getDescription() throws ParsingException;
-
 }

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

@@ -37,9 +37,9 @@ public ChannelInfo(int serviceId, String url, String id, String name) {
     }
 
 
-    public static InfoItemPage getMoreItems(StreamingService service, String url, String nextPageUrl)
+    public static InfoItemPage getMoreItems(StreamingService service, String url, String pageUrl)
             throws IOException, ExtractionException {
-        return service.getChannelExtractor(url, nextPageUrl).getInfoItemPage();
+        return service.getChannelExtractor(url).getPage(pageUrl);
     }
 
     public static ChannelInfo getInfo(String url) throws IOException, ExtractionException {
@@ -52,7 +52,7 @@ public static ChannelInfo getInfo(StreamingService service, String url) throws I
         return getInfo(extractor);
     }
 
-    public static ChannelInfo getInfo(ChannelExtractor extractor) throws ParsingException {
+    public static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException, ExtractionException {
 
         // important data
         int serviceId = extractor.getServiceId();

src/main/java/org/schabi/newpipe/extractor/kiosk/KioskExtractor.java

@@ -34,10 +34,9 @@ public abstract class KioskExtractor extends ListExtractor {
 
     public KioskExtractor(StreamingService streamingService,
                           String url,
-                          String nextPageUrl,
                           String kioskId)
         throws ExtractionException {
-        super(streamingService, url, nextPageUrl);
+        super(streamingService, url);
         this.id = kioskId;
     }
 

src/main/java/org/schabi/newpipe/extractor/kiosk/KioskInfo.java

@@ -37,12 +37,12 @@ private KioskInfo(int serviceId, String id, String url, String name) {
 
     public static ListExtractor.InfoItemPage getMoreItems(StreamingService service,
                                                              String url,
-                                                             String nextPageUrl,
+                                                             String pageUrl,
                                                              String contentCountry) throws IOException, ExtractionException {
         KioskList kl = service.getKioskList();
-        KioskExtractor extractor = kl.getExtractorByUrl(url, nextPageUrl);
+        KioskExtractor extractor = kl.getExtractorByUrl(url, pageUrl);
         extractor.setContentCountry(contentCountry);
-        return extractor.getInfoItemPage();
+        return extractor.getPage(pageUrl);
     }
 
     public static KioskInfo getInfo(String url,

src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java

@@ -14,7 +14,6 @@ public  class KioskList {
     public interface KioskExtractorFactory {
         KioskExtractor createNewKiosk(final StreamingService streamingService,
                                              final String url,
-                                             final String nextPageUrl,
                                              final String kioskId)
             throws ExtractionException, IOException;
     }
@@ -74,8 +73,7 @@ public KioskExtractor getExtractorById(String kioskId, String nextPageUrl)
             throw new ExtractionException("No kiosk found with the type: " + kioskId);
         } else {
             return ke.extractorFactory.createNewKiosk(NewPipe.getService(service_id),
-                    ke.handler.getUrl(kioskId),
-                    nextPageUrl, kioskId);
+                    ke.handler.getUrl(kioskId), kioskId);
         }
     }
 

src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistExtractor.java

@@ -14,8 +14,8 @@
 
 public abstract class PlaylistExtractor extends ListExtractor {
 
-    public PlaylistExtractor(StreamingService service, String url, String nextPageUrl) throws IOException, ExtractionException {
-        super(service, url, nextPageUrl);
+    public PlaylistExtractor(StreamingService service, String url) throws ExtractionException {
+        super(service, url);
     }
 
     @Nonnull

src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java

@@ -5,7 +5,6 @@
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
 import java.io.IOException;
 
@@ -17,8 +16,8 @@ public PlaylistInfo(int serviceId, String id, String url, String name) {
         super(serviceId, id, url, name);
     }
 
-    public static InfoItemPage getMoreItems(StreamingService service, String url, String nextPageUrl) throws IOException, ExtractionException {
-        return service.getPlaylistExtractor(url, nextPageUrl).getInfoItemPage();
+    public static InfoItemPage getMoreItems(StreamingService service, String url, String pageUrl) throws IOException, ExtractionException {
+        return service.getPlaylistExtractor(url).getPage(pageUrl);
     }
 
     public static PlaylistInfo getInfo(String url) throws IOException, ExtractionException {
@@ -36,7 +35,7 @@ public static PlaylistInfo getInfo(StreamingService service, String url) throws
      *
      * @param extractor an extractor where fetchPage() was already got called on.
      */
-    public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws ParsingException {
+    public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws IOException, ExtractionException {
 
         int serviceId = extractor.getServiceId();
         String url = extractor.getCleanUrl();

src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java

@@ -18,8 +18,11 @@ public class SoundcloudChannelExtractor extends ChannelExtractor {
     private String userId;
     private JsonObject user;
 
-    public SoundcloudChannelExtractor(StreamingService service, String url, String nextPageUrl) throws IOException, ExtractionException {
-        super(service, url, nextPageUrl);
+    private StreamInfoItemsCollector streamInfoItemsCollector = null;
+    private String nextPageUrl = null;
+
+    public SoundcloudChannelExtractor(StreamingService service, String url) throws ExtractionException {
+        super(service, url);
     }
 
     @Override
@@ -80,32 +83,50 @@ public long getSubscriberCount() {
     }
 
     @Override
-    public String getDescription() throws ParsingException {
+    public String getDescription() {
         return user.getString("description", "");
     }
 
     @Nonnull
     @Override
-    public StreamInfoItemsCollector getStreams() throws IOException, ExtractionException {
-        StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
+    public StreamInfoItemsCollector getStreams() throws ExtractionException {
+        if(streamInfoItemsCollector == null) {
+            computeNextPageAndGetStreams();
+        }
+        return streamInfoItemsCollector;
+    }
 
-        String apiUrl = "https://api-v2.soundcloud.com/users/" + getId() + "/tracks"
-                + "?client_id=" + SoundcloudParsingHelper.clientId()
-                + "&limit=20"
-                + "&linked_partitioning=1";
+    @Override
+    public String getNextPageUrl() throws ExtractionException {
+        if(nextPageUrl == null) {
+            computeNextPageAndGetStreams();
+        }
+        return nextPageUrl;
+    }
+
+    private void computeNextPageAndGetStreams() throws ExtractionException {
+        try {
+            streamInfoItemsCollector = new StreamInfoItemsCollector(getServiceId());
 
-        nextPageUrl = SoundcloudParsingHelper.getStreamsFromApiMinItems(15, collector, apiUrl);
-        return collector;
+            String apiUrl = "https://api-v2.soundcloud.com/users/" + getId() + "/tracks"
+                    + "?client_id=" + SoundcloudParsingHelper.clientId()
+                    + "&limit=20"
+                    + "&linked_partitioning=1";
+
+            nextPageUrl = SoundcloudParsingHelper.getStreamsFromApiMinItems(15, streamInfoItemsCollector, apiUrl);
+        } catch (Exception e) {
+            throw new ExtractionException("Could not get next page", e);
+        }
     }
 
     @Override
-    public InfoItemPage getInfoItemPage() throws IOException, ExtractionException {
+    public InfoItemPage getPage(final String pageUrl) throws IOException, ExtractionException {
         if (!hasNextPage()) {
             throw new ExtractionException("Channel doesn't have more streams");
         }
 
         StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
-        nextPageUrl = SoundcloudParsingHelper.getStreamsFromApiMinItems(15, collector, nextPageUrl);
+        String nextPageUrl = SoundcloudParsingHelper.getStreamsFromApiMinItems(15, collector, pageUrl);
 
         return new InfoItemPage(collector, nextPageUrl);
     }