Merge pull request #810 from TiA4f8R/delivery-methods-v2

Support delivery methods other than progressive HTTP

Author: Stypox

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java

@@ -30,9 +30,12 @@
 import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_API_URL;
 import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_URL;
 import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.getImageUrl;
+import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
 
 public class BandcampRadioStreamExtractor extends BandcampStreamExtractor {
 
+    private static final String OPUS_LO = "opus-lo";
+    private static final String MP3_128 = "mp3-128";
     private JsonObject showInfo;
 
     public BandcampRadioStreamExtractor(final StreamingService service,
@@ -116,23 +119,27 @@ public long getLength() {
 
     @Override
     public List<AudioStream> getAudioStreams() {
-        final ArrayList<AudioStream> list = new ArrayList<>();
+        final List<AudioStream> audioStreams = new ArrayList<>();
         final JsonObject streams = showInfo.getObject("audio_stream");
 
-        if (streams.has("opus-lo")) {
-            list.add(new AudioStream(
-                    streams.getString("opus-lo"),
-                    MediaFormat.OPUS, 100
-            ));
+        if (streams.has(MP3_128)) {
+            audioStreams.add(new AudioStream.Builder()
+                    .setId(MP3_128)
+                    .setContent(streams.getString(MP3_128), true)
+                    .setMediaFormat(MediaFormat.MP3)
+                    .setAverageBitrate(128)
+                    .build());
         }
-        if (streams.has("mp3-128")) {
-            list.add(new AudioStream(
-                    streams.getString("mp3-128"),
-                    MediaFormat.MP3, 128
-            ));
+
+        if (streams.has(OPUS_LO)) {
+            audioStreams.add(new AudioStream.Builder()
+                    .setId(OPUS_LO)
+                    .setContent(streams.getString(OPUS_LO), true)
+                    .setMediaFormat(MediaFormat.OPUS)
+                    .setAverageBitrate(100).build());
         }
 
-        return list;
+        return audioStreams;
     }
 
     @Nonnull
@@ -156,14 +163,14 @@ public List<StreamSegment> getStreamSegments() throws ParsingException {
     @Override
     public String getLicence() {
         // Contrary to other Bandcamp streams, radio streams don't have a license
-        return "";
+        return EMPTY_STRING;
     }
 
     @Nonnull
     @Override
     public String getCategory() {
         // Contrary to other Bandcamp streams, radio streams don't have categories
-        return "";
+        return EMPTY_STRING;
     }
 
     @Nonnull

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampStreamExtractor.java

@@ -3,14 +3,15 @@
 package org.schabi.newpipe.extractor.services.bandcamp.extractors;
 
 import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.getImageUrl;
+import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
+import static org.schabi.newpipe.extractor.utils.Utils.HTTPS;
 
 import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonParserException;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
-import org.jsoup.select.Elements;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.downloader.Downloader;
@@ -27,16 +28,15 @@
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 import org.schabi.newpipe.extractor.utils.Utils;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import java.util.stream.Collectors;
 
 public class BandcampStreamExtractor extends StreamExtractor {
-
     private JsonObject albumJson;
     private JsonObject current;
     private Document document;
@@ -88,7 +88,7 @@ public String getName() throws ParsingException {
     public String getUploaderUrl() throws ParsingException {
         final String[] parts = getUrl().split("/");
         // https: (/) (/) * .bandcamp.com (/) and leave out the rest
-        return "https://" + parts[2] + "/";
+        return HTTPS + parts[2] + "/";
     }
 
     @Nonnull
@@ -119,10 +119,10 @@ public DateWrapper getUploadDate() throws ParsingException {
     @Override
     public String getThumbnailUrl() throws ParsingException {
         if (albumJson.isNull("art_id")) {
-            return Utils.EMPTY_STRING;
-        } else {
-            return getImageUrl(albumJson.getLong("art_id"), true);
+            return EMPTY_STRING;
         }
+
+        return getImageUrl(albumJson.getLong("art_id"), true);
     }
 
     @Nonnull
@@ -139,24 +139,26 @@ public String getUploaderAvatarUrl() {
     public Description getDescription() {
         final String s = Utils.nonEmptyAndNullJoin(
                 "\n\n",
-                new String[]{
+                new String[] {
                         current.getString("about"),
                         current.getString("lyrics"),
                         current.getString("credits")
-                }
-        );
+                });
         return new Description(s, Description.PLAIN_TEXT);
     }
 
     @Override
     public List<AudioStream> getAudioStreams() {
         final List<AudioStream> audioStreams = new ArrayList<>();
-
-        audioStreams.add(new AudioStream(
-                albumJson.getArray("trackinfo").getObject(0)
-                        .getObject("file").getString("mp3-128"),
-                MediaFormat.MP3, 128
-        ));
+        audioStreams.add(new AudioStream.Builder()
+                .setId("mp3-128")
+                .setContent(albumJson.getArray("trackinfo")
+                        .getObject(0)
+                        .getObject("file")
+                        .getString("mp3-128"), true)
+                .setMediaFormat(MediaFormat.MP3)
+                .setAverageBitrate(128)
+                .build());
         return audioStreams;
     }
 
@@ -184,11 +186,11 @@ public StreamType getStreamType() {
     @Override
     public PlaylistInfoItemsCollector getRelatedItems() {
         final PlaylistInfoItemsCollector collector = new PlaylistInfoItemsCollector(getServiceId());
-        final Elements recommendedAlbums = document.getElementsByClass("recommended-album");
+        document.getElementsByClass("recommended-album")
+                .stream()
+                .map(BandcampRelatedPlaylistInfoItemExtractor::new)
+                .forEach(collector::commit);
 
-        for (final Element album : recommendedAlbums) {
-            collector.commit(new BandcampRelatedPlaylistInfoItemExtractor(album));
-        }
         return collector;
     }
 
@@ -200,15 +202,17 @@ public String getCategory() {
                 .flatMap(element -> element.getElementsByClass("tag").stream())
                 .map(Element::text)
                 .findFirst()
-                .orElse("");
+                .orElse(EMPTY_STRING);
     }
 
     @Nonnull
     @Override
     public String getLicence() {
-        /* Tests resulted in this mapping of ints to licence:
+        /*
+        Tests resulted in this mapping of ints to licence:
         https://cloud.disroot.org/s/ZTWBxbQ9fKRmRWJ/preview (screenshot from a Bandcamp artist's
-        account) */
+        account)
+        */
 
         switch (current.getInt("license_type")) {
             case 1:
@@ -233,14 +237,9 @@ public String getLicence() {
     @Nonnull
     @Override
     public List<String> getTags() {
-        final Elements tagElements = document.getElementsByAttributeValue("itemprop", "keywords");
-
-        final List<String> tags = new ArrayList<>();
-
-        for (final Element e : tagElements) {
-            tags.add(e.text());
-        }
-
-        return tags;
+        return document.getElementsByAttributeValue("itemprop", "keywords")
+                .stream()
+                .map(Element::text)
+                .collect(Collectors.toList());
     }
 }