Improvements for NewPipe

* Added support for content-length (important for downloader)
* Code cleanup

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

@@ -4,12 +4,13 @@ import org.schabi.newpipe.extractor.NewPipe;
 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 abstract class Downloader {
     /**
      * 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/youtube/dashmanifestcreator/AbstractYoutubeDashManifestCreator.java

@@ -102,6 +102,11 @@ public abstract class AbstractYoutubeDashManifestCreator implements DashManifest
         this.durationSecondsFallback = durationSecondsFallback;
     }
 
+    @Override
+    public long getExpectedContentLength(final Downloader downloader) {
+        return downloader.getContentLength(itagInfo.getStreamUrl());
+    }
+
     protected boolean isLiveDelivery() {
         return false;
     }

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItem.java

@@ -29,8 +29,8 @@ import javax.annotation.Nullable;
  * Info object for previews of unopened videos, eg search results, related videos
  */
 public class StreamInfoItem extends InfoItem {
-    private final boolean audioOnly;
     private final boolean live;
+    private final boolean audioOnly;
 
     private String uploaderName;
     private String shortDescription;
@@ -47,11 +47,11 @@ public class StreamInfoItem extends InfoItem {
     public StreamInfoItem(final int serviceId,
                           final String url,
                           final String name,
-                          final boolean audioOnly,
+                          final boolean live,
-                          final boolean live) {
+                          final boolean audioOnly) {
         super(InfoType.STREAM, serviceId, url, name);
-        this.audioOnly = audioOnly;
         this.live = live;
+        this.audioOnly = audioOnly;
     }
 
     public boolean isAudioOnly() {

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemsCollector.java

@@ -48,8 +48,8 @@ public class StreamInfoItemsCollector
                 getServiceId(),
                 extractor.getUrl(),
                 extractor.getName(),
-                extractor.isAudioOnly(),
+                extractor.isLive(),
-                extractor.isLive());
+                extractor.isAudioOnly());
 
         // optional information
         try {

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/delivery/DASHManifestDeliveryData.java

@@ -1,5 +1,6 @@
 package org.schabi.newpipe.extractor.streamdata.delivery;
 
+import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.streamdata.delivery.dashmanifestcreator.DashManifestCreator;
 
 import javax.annotation.Nonnull;
@@ -9,4 +10,9 @@ public interface DASHManifestDeliveryData extends DASHDeliveryData {
     DashManifestCreator dashManifestCreator();
 
     String getCachedDashManifestAsString();
+
+    @Override
+    default long getExpectedContentLength(final Downloader downloader) {
+        return dashManifestCreator().getExpectedContentLength(downloader);
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/delivery/DeliveryData.java

@@ -1,5 +1,13 @@
 package org.schabi.newpipe.extractor.streamdata.delivery;
 
+import org.schabi.newpipe.extractor.downloader.Downloader;
+
 public interface DeliveryData {
-    // Only a marker so far
+    /**
+     * Returns the expected content length/size of the data.
+     *
+     * @param downloader The downloader that may be used for fetching (HTTP HEAD).
+     * @return the expected size/content length or <code>-1</code> if unknown
+     */
+    long getExpectedContentLength(Downloader downloader);
 }

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/delivery/UrlBasedDeliveryData.java

@@ -1,8 +1,15 @@
 package org.schabi.newpipe.extractor.streamdata.delivery;
 
+import org.schabi.newpipe.extractor.downloader.Downloader;
+
 import javax.annotation.Nonnull;
 
 public interface UrlBasedDeliveryData extends DeliveryData {
     @Nonnull
     String url();
+
+    @Override
+    default long getExpectedContentLength(final Downloader downloader) {
+        return downloader.getContentLength(url());
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/delivery/dashmanifestcreator/DashManifestCreator.java

@@ -1,14 +1,23 @@
 package org.schabi.newpipe.extractor.streamdata.delivery.dashmanifestcreator;
 
+import org.schabi.newpipe.extractor.downloader.Downloader;
+
 import javax.annotation.Nonnull;
 
 public interface DashManifestCreator {
 
     /**
      * Generates the DASH manifest.
+     *
      * @return The dash manifest as string.
      * @throws DashManifestCreationException May throw a CreationException
      */
     @Nonnull
     String generateManifest();
+
+    /**
+     * See
+     * {@link org.schabi.newpipe.extractor.streamdata.delivery.DeliveryData#getExpectedContentLength(Downloader)}
+     */
+    long getExpectedContentLength(Downloader downloader);
 }

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/stream/SubtitleStream.java

@@ -39,5 +39,10 @@ public interface SubtitleStream extends Stream<SubtitleMediaFormat> {
      *
      * @return the {@link Locale locale} of the subtitles
      */
+    @Nonnull
     Locale locale();
+
+    default String getDisplayLanguageName() {
+        return locale().getDisplayName(locale());
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/stream/VideoStream.java

@@ -10,5 +10,5 @@ import javax.annotation.Nonnull;
  */
 public interface VideoStream extends Stream<VideoAudioMediaFormat> {
     @Nonnull
-    VideoQualityData videoQualityData();
+    VideoQualityData qualityData();
 }

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/stream/simpleimpl/SimpleVideoAudioStreamImpl.java

@@ -38,7 +38,7 @@ public class SimpleVideoAudioStreamImpl extends AbstractStreamImpl<VideoAudioMed
 
     @Nonnull
     @Override
-    public VideoQualityData videoQualityData() {
+    public VideoQualityData qualityData() {
         return videoQualityData;
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/stream/simpleimpl/SimpleVideoStreamImpl.java

@@ -32,7 +32,7 @@ public class SimpleVideoStreamImpl extends AbstractStreamImpl<VideoAudioMediaFor
 
     @Nonnull
     @Override
-    public VideoQualityData videoQualityData() {
+    public VideoQualityData qualityData() {
         return videoQualityData;
     }
 }

extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultStreamExtractorTest.java

@@ -270,7 +270,7 @@ public abstract class DefaultStreamExtractorTest extends DefaultExtractorTest<St
 
             for (final VideoStream stream : videoOnlyStreams) {
                 assertNotNull(stream.mediaFormat());
-                assertNotNull(stream.videoQualityData());
+                assertNotNull(stream.qualityData());
                 checkDeliveryData(stream.deliveryData());
             }
         } else {
@@ -289,7 +289,7 @@ public abstract class DefaultStreamExtractorTest extends DefaultExtractorTest<St
 
             for (final VideoAudioStream stream : videoAudioStreams) {
                 assertNotNull(stream.mediaFormat());
-                assertNotNull(stream.videoQualityData());
+                assertNotNull(stream.qualityData());
                 checkDeliveryData(stream.deliveryData());
             }
         } else {