Modified type hierarchy for downloads

Author: litetex

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/dashmanifestcreator/AbstractYoutubeDashManifestCreator.java

@@ -102,6 +102,12 @@ protected AbstractYoutubeDashManifestCreator(
         this.durationSecondsFallback = durationSecondsFallback;
     }
 
+    @Nonnull
+    @Override
+    public String downloadUrl() {
+        return itagInfo.getStreamUrl();
+    }
+
     @Override
     public long getExpectedContentLength(final Downloader downloader) {
         return downloader.getContentLength(itagInfo.getStreamUrl());

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

@@ -5,12 +5,18 @@
 
 import javax.annotation.Nonnull;
 
-public interface DASHManifestDeliveryData extends DASHDeliveryData {
+public interface DASHManifestDeliveryData extends DASHDeliveryData, DownloadableDeliveryData {
     @Nonnull
     DashManifestCreator dashManifestCreator();
 
     String getCachedDashManifestAsString();
 
+    @Nonnull
+    @Override
+    default String downloadUrl() {
+        return dashManifestCreator().downloadUrl();
+    }
+
     @Override
     default long getExpectedContentLength(final Downloader downloader) {
         return dashManifestCreator().getExpectedContentLength(downloader);

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

@@ -1,5 +1,5 @@
 package org.schabi.newpipe.extractor.streamdata.delivery;
 
-public interface DASHUrlDeliveryData extends UrlBasedDeliveryData, DASHDeliveryData {
+public interface DASHUrlDeliveryData extends DownloadableUrlBasedDeliveryData, DASHDeliveryData {
     // Nothing to implement additionally
 }

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

@@ -1,13 +1,5 @@
 package org.schabi.newpipe.extractor.streamdata.delivery;
 
-import org.schabi.newpipe.extractor.downloader.Downloader;
-
 public interface DeliveryData {
-    /**
-     * 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);
+    // Just a marker
 }

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

@@ -0,0 +1,22 @@
+package org.schabi.newpipe.extractor.streamdata.delivery;
+
+import org.schabi.newpipe.extractor.downloader.Downloader;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Provides information for downloading a stream.
+ */
+public interface DownloadableDeliveryData extends DeliveryData {
+
+    @Nonnull
+    String downloadUrl();
+
+    /**
+     * 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/DownloadableUrlBasedDeliveryData.java

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

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

@@ -1,5 +1,5 @@
 package org.schabi.newpipe.extractor.streamdata.delivery;
 
-public interface HLSDeliveryData extends UrlBasedDeliveryData {
+public interface HLSDeliveryData extends DownloadableUrlBasedDeliveryData {
     // Nothing to implement additionally
 }

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

@@ -1,5 +1,5 @@
 package org.schabi.newpipe.extractor.streamdata.delivery;
 
-public interface ProgressiveHTTPDeliveryData extends UrlBasedDeliveryData {
+public interface ProgressiveHTTPDeliveryData extends DownloadableUrlBasedDeliveryData {
     // Nothing to implement additionally
 }

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

@@ -1,15 +1,8 @@
 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

@@ -15,9 +15,12 @@ public interface DashManifestCreator {
     @Nonnull
     String generateManifest();
 
+    @Nonnull
+    String downloadUrl();
+
     /**
      * See
-     * {@link org.schabi.newpipe.extractor.streamdata.delivery.DeliveryData#getExpectedContentLength(Downloader)}
+     * {@link org.schabi.newpipe.extractor.streamdata.delivery.DownloadableDeliveryData#getExpectedContentLength(Downloader)}
      */
     long getExpectedContentLength(Downloader downloader);
 }