Delivery methods without design flaws

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

@@ -42,19 +42,19 @@ public void addAllErrors(final Collection<Throwable> throwables) {
         this.errors.addAll(throwables);
     }
 
-    public Info(final int serviceId,
-                final String id,
-                final String url,
-                final String originalUrl,
-                final String name) {
+    protected Info(final int serviceId,
+                   final String id,
+                   final String url,
+                   final String originalUrl,
+                   final String name) {
         this.serviceId = serviceId;
         this.id = id;
         this.url = url;
         this.originalUrl = originalUrl;
         this.name = name;
     }
 
-    public Info(final int serviceId, final LinkHandler linkHandler, final String name) {
+    protected Info(final int serviceId, final LinkHandler linkHandler, final String name) {
         this(serviceId,
                 linkHandler.getId(),
                 linkHandler.getUrl(),

extractor/src/main/java/org/schabi/newpipe/extractor/downloader/Downloader.java

@@ -4,12 +4,13 @@
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.extractor.localization.Localization;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * A base for downloader implementations that NewPipe will use
  * to download needed resources during extraction.
@@ -148,8 +149,27 @@ public Response post(final String url,
     /**
      * Do a request using the specified {@link Request} object.
      *
+     * @param request The request to process
      * @return the result of the request
      */
     public abstract Response execute(@Nonnull Request request)
             throws IOException, ReCaptchaException;
+
+    /**
+     * Get the size of the content that the url is pointing by firing a HEAD request.
+     *
+     * @param url an url pointing to the content
+     * @return the size of the content, in bytes or -1 if unknown
+     */
+    public long getContentLength(final String url) {
+        try {
+            final String contentLengthHeader = head(url).getHeader("Content-Length");
+            if (contentLengthHeader == null) {
+                return -1;
+            }
+            return Long.parseLong(contentLengthHeader);
+        } catch (final Exception e) {
+            return -1;
+        }
+    }
 }

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

@@ -2,17 +2,17 @@
 
 package org.schabi.newpipe.extractor.services.bandcamp.extractors;
 
+import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_URL;
+import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.getImageUrl;
+
 import com.grack.nanojson.JsonObject;
+
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
-import org.schabi.newpipe.extractor.stream.StreamType;
 
 import javax.annotation.Nullable;
 
-import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_URL;
-import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.getImageUrl;
-
 public class BandcampRadioInfoItemExtractor implements StreamInfoItemExtractor {
 
     private final JsonObject show;
@@ -58,8 +58,8 @@ public String getThumbnailUrl() {
     }
 
     @Override
-    public StreamType getStreamType() {
-        return StreamType.AUDIO_STREAM;
+    public boolean isAudioOnly() {
+        return true;
     }
 
     @Override

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

@@ -11,7 +11,6 @@
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
-import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.downloader.Downloader;
@@ -21,9 +20,12 @@
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItemsCollector;
-import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.StreamSegment;
+import org.schabi.newpipe.extractor.streamdata.delivery.simpleimpl.SimpleProgressiveHTTPDeliveryDataImpl;
+import org.schabi.newpipe.extractor.streamdata.format.registry.AudioFormatRegistry;
+import org.schabi.newpipe.extractor.streamdata.stream.AudioStream;
+import org.schabi.newpipe.extractor.streamdata.stream.simpleimpl.SimpleAudioStreamImpl;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -120,24 +122,23 @@ public long getLength() {
 
     @Override
     public List<AudioStream> getAudioStreams() {
-        final List<AudioStream> audioStreams = new ArrayList<>();
         final JsonObject streams = showInfo.getObject("audio_stream");
 
+        final List<AudioStream> audioStreams = new ArrayList<>();
         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());
+            audioStreams.add(new SimpleAudioStreamImpl(
+                    AudioFormatRegistry.MP3,
+                    new SimpleProgressiveHTTPDeliveryDataImpl(streams.getString(MP3_128)),
+                    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());
+            audioStreams.add(new SimpleAudioStreamImpl(
+                    AudioFormatRegistry.OPUS,
+                    new SimpleProgressiveHTTPDeliveryDataImpl(streams.getString(OPUS_LO)),
+                    100
+            ));
         }
 
         return audioStreams;