More reworks

* Killed StreamType
* Move ``Privacy`` out of ``Extractor``
* Reworked YT stream extractor

Author: litetex

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

@@ -20,7 +20,6 @@
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItemsCollector;
 import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
-import org.schabi.newpipe.extractor.stream.StreamType;
 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;
@@ -158,14 +157,14 @@ public List<AudioStream> getAudioStreams() {
     }
 
     @Override
-    public long getLength() throws ParsingException {
-        return (long) albumJson.getArray("trackinfo").getObject(0)
-                .getDouble("duration");
+    public boolean isAudioOnly() {
+        return true;
     }
 
     @Override
-    public StreamType getStreamType() {
-        return StreamType.AUDIO_STREAM;
+    public long getLength() throws ParsingException {
+        return (long) albumJson.getArray("trackinfo").getObject(0)
+                .getDouble("duration");
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java

@@ -13,7 +13,6 @@
 import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
 import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.streamdata.delivery.DeliveryData;
 import org.schabi.newpipe.extractor.streamdata.delivery.simpleimpl.SimpleDASHUrlDeliveryDataImpl;
 import org.schabi.newpipe.extractor.streamdata.delivery.simpleimpl.SimpleHLSDeliveryDataImpl;
@@ -226,11 +225,6 @@ private Stream<MediaCCCLiveStreamMapperDTO> getStreamDTOs(@Nonnull final String
                                 (JsonObject) e.getValue())));
     }
 
-    @Override
-    public StreamType getStreamType() throws ParsingException {
-        return StreamType.LIVE_STREAM;
-    }
-
     @Override
     public boolean isLive() {
         return true;

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java

@@ -15,7 +15,6 @@
 import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCStreamLinkHandlerFactory;
 import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.streamdata.delivery.simpleimpl.SimpleProgressiveHTTPDeliveryDataImpl;
 import org.schabi.newpipe.extractor.streamdata.format.registry.AudioFormatRegistry;
 import org.schabi.newpipe.extractor.streamdata.format.registry.VideoAudioFormatRegistry;
@@ -126,11 +125,6 @@ private Stream<JsonObject> getRecordingsByMimeType(final String startsWithMimeTy
                         .startsWith(startsWithMimeType));
     }
 
-    @Override
-    public StreamType getStreamType() {
-        return StreamType.VIDEO_STREAM;
-    }
-
     @Override
     public void onFetchPage(@Nonnull final Downloader downloader)
             throws IOException, ExtractionException {

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java

@@ -21,9 +21,9 @@
 import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeSearchQueryHandlerFactory;
 import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeStreamLinkHandlerFactory;
 import org.schabi.newpipe.extractor.stream.Description;
+import org.schabi.newpipe.extractor.stream.Privacy;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.streamdata.delivery.DeliveryData;
 import org.schabi.newpipe.extractor.streamdata.delivery.simpleimpl.SimpleHLSDeliveryDataImpl;
 import org.schabi.newpipe.extractor.streamdata.delivery.simpleimpl.SimpleProgressiveHTTPDeliveryDataImpl;
@@ -259,11 +259,6 @@ public List<SubtitleStream> getSubtitles() {
         return subtitles;
     }
 
-    @Override
-    public StreamType getStreamType() {
-        return isLive() ? StreamType.LIVE_STREAM : StreamType.VIDEO_STREAM;
-    }
-
     @Override
     public boolean isLive() {
         return json.getBoolean("isLive");

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java

@@ -25,9 +25,9 @@
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper;
 import org.schabi.newpipe.extractor.stream.Description;
+import org.schabi.newpipe.extractor.stream.Privacy;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.streamdata.delivery.simpleimpl.SimpleHLSDeliveryDataImpl;
 import org.schabi.newpipe.extractor.streamdata.delivery.simpleimpl.SimpleProgressiveHTTPDeliveryDataImpl;
 import org.schabi.newpipe.extractor.streamdata.format.AudioMediaFormat;
@@ -402,17 +402,9 @@ private static String getSingleUrlFromHlsManifest(@Nonnull final String hlsManif
         throw new ParsingException("Could not get any URL from HLS manifest");
     }
 
-    private static String urlEncode(final String value) {
-        try {
-            return URLEncoder.encode(value, UTF_8);
-        } catch (final UnsupportedEncodingException e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
     @Override
-    public StreamType getStreamType() {
-        return StreamType.AUDIO_STREAM;
+    public boolean isAudioOnly() {
+        return true;
     }
 
     @Nullable
@@ -470,4 +462,13 @@ public List<String> getTags() {
         }
         return tags;
     }
+
+
+    private static String urlEncode(final String value) {
+        try {
+            return URLEncoder.encode(value, UTF_8);
+        } catch (final UnsupportedEncodingException e) {
+            throw new IllegalStateException(e);
+        }
+    }
 }