[Soundcloud] Charts: Fetch correctly so that tests work

Author: litetex

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChartsExtractor.java

@@ -1,5 +1,9 @@
 package org.schabi.newpipe.extractor.services.soundcloud.extractors;
 
+import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
+import static org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper.SOUNDCLOUD_API_V2_URL;
+import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
+
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.downloader.Downloader;
@@ -11,51 +15,33 @@
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
-import static org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper.SOUNDCLOUD_API_V2_URL;
-import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
+import javax.annotation.Nonnull;
 
 public class SoundcloudChartsExtractor extends KioskExtractor<StreamInfoItem> {
+
+    private String initialFetchNextPageUrl;
+    private StreamInfoItemsCollector initialFetchCollector;
+
     public SoundcloudChartsExtractor(final StreamingService service,
                                      final ListLinkHandler linkHandler,
                                      final String kioskId) {
         super(service, linkHandler, kioskId);
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader) {
-    }
-
-    @Nonnull
-    @Override
-    public String getName() {
-        return getId();
-    }
-
-    @Override
-    public InfoItemsPage<StreamInfoItem> getPage(final Page page) throws IOException,
-            ExtractionException {
-        if (page == null || isNullOrEmpty(page.getUrl())) {
-            throw new IllegalArgumentException("Page doesn't contain an URL");
+    public void onFetchPage(@Nonnull final Downloader downloader)
+        throws ExtractionException, IOException {
+        // Check if already run
+        if (initialFetchNextPageUrl != null) {
+            return;
         }
 
-        final StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
-        final String nextPageUrl = SoundcloudParsingHelper.getStreamsFromApi(collector,
-                page.getUrl(), true);
-
-        return new InfoItemsPage<>(collector, new Page(nextPageUrl));
-    }
-
-    @Nonnull
-    @Override
-    public InfoItemsPage<StreamInfoItem> getInitialPage() throws IOException, ExtractionException {
-        final StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
+        initialFetchCollector = new StreamInfoItemsCollector(getServiceId());
 
         String apiUrl = SOUNDCLOUD_API_V2_URL + "charts" + "?genre=soundcloud:genres:all-music"
-                + "&client_id=" + SoundcloudParsingHelper.clientId();
+            + "&client_id=" + SoundcloudParsingHelper.clientId();
 
         if (getId().equals("Top 50")) {
             apiUrl += "&kind=top";
@@ -67,20 +53,45 @@ public InfoItemsPage<StreamInfoItem> getInitialPage() throws IOException, Extrac
         String apiUrlWithRegion = null;
         if (getService().getSupportedCountries().contains(contentCountry)) {
             apiUrlWithRegion = apiUrl + "&region=soundcloud:regions:"
-                    + contentCountry.getCountryCode();
+                + contentCountry.getCountryCode();
         }
 
-        String nextPageUrl;
         try {
-            nextPageUrl = SoundcloudParsingHelper.getStreamsFromApi(collector,
-                    apiUrlWithRegion == null ? apiUrl : apiUrlWithRegion, true);
+            initialFetchNextPageUrl = SoundcloudParsingHelper.getStreamsFromApi(
+                initialFetchCollector,
+                apiUrlWithRegion == null ? apiUrl : apiUrlWithRegion, true);
         } catch (final IOException e) {
             // Request to other region may be geo-restricted.
             // See https://github.com/TeamNewPipe/NewPipeExtractor/issues/537.
             // We retry without the specified region.
-            nextPageUrl = SoundcloudParsingHelper.getStreamsFromApi(collector, apiUrl, true);
+            initialFetchNextPageUrl = SoundcloudParsingHelper.getStreamsFromApi(
+                initialFetchCollector, apiUrl, true);
         }
+    }
+
+    @Nonnull
+    @Override
+    public String getName() {
+        return getId();
+    }
+
+    @Override
+    public InfoItemsPage<StreamInfoItem> getPage(final Page page) throws IOException,
+            ExtractionException {
+        if (page == null || isNullOrEmpty(page.getUrl())) {
+            throw new IllegalArgumentException("Page doesn't contain an URL");
+        }
+
+        final StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
+        final String nextPageUrl = SoundcloudParsingHelper.getStreamsFromApi(collector,
+                page.getUrl(), true);
 
         return new InfoItemsPage<>(collector, new Page(nextPageUrl));
     }
+
+    @Nonnull
+    @Override
+    public InfoItemsPage<StreamInfoItem> getInitialPage() throws IOException, ExtractionException {
+        return new InfoItemsPage<>(initialFetchCollector, new Page(initialFetchNextPageUrl));
+    }
 }