Merge pull request #299 from B0pol/sc_countries

add supported countries for soundcloud
TeamNewPipe · Apr 3, 2020 · 094b87c · 094b87c
2 parents a7d3d14 + 1eb3deb
commit 094b87c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/...main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractor.java b/...main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractor.java
@@ -11,6 +11,8 @@
 import javax.annotation.Nonnull;
 import java.io.IOException;
 
+import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
+
 public class SoundcloudChartsExtractor extends KioskExtractor<StreamInfoItem> {
     private StreamInfoItemsCollector collector = null;
     private String nextPageUrl = null;
@@ -57,11 +59,9 @@ private void computeNextPageAndStreams() throws IOException, ExtractionException
             apiUrl += "&kind=trending";
         }
 
-        /*List<String> supportedCountries = Arrays.asList("AU", "CA", "FR", "DE", "IE", "NL", "NZ", "GB", "US");
-        String contentCountry = getContentCountry();
-        if (supportedCountries.contains(contentCountry)) {
-            apiUrl += "&region=soundcloud:regions:" + contentCountry;
-        }*/
+
+        String contentCountry = SoundCloud.getContentCountry().getCountryCode();
+        apiUrl += "&region=soundcloud:regions:" + contentCountry;
 
         nextPageUrl = SoundcloudParsingHelper.getStreamsFromApi(collector, apiUrl, true);
     }

diff --git a/...tor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java b/...tor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java
@@ -7,11 +7,14 @@
 import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
 import org.schabi.newpipe.extractor.kiosk.KioskList;
 import org.schabi.newpipe.extractor.linkhandler.*;
+import org.schabi.newpipe.extractor.localization.ContentCountry;
 import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 
+import java.util.List;
+
 import static java.util.Collections.singletonList;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
 
@@ -46,6 +49,13 @@ public ListLinkHandlerFactory getPlaylistLHFactory() {
         return SoundcloudPlaylistLinkHandlerFactory.getInstance();
     }
 
+    @Override
+    public List<ContentCountry> getSupportedCountries() {
+        //Country selector here https://soundcloud.com/charts/top?genre=all-music
+        return ContentCountry.listFrom(
+                "AU", "CA", "DE", "FR", "GB", "IE", "NL", "NZ", "US"
+        );
+    }
 
     @Override
     public StreamExtractor getStreamExtractor(LinkHandler LinkHandler) {