From 53909820f881c88c85df952c6aa8331b000c78c1 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Fri, 24 Jun 2022 21:21:59 +0200
Subject: [PATCH] Cleanup ``MediaCCCLiveStreamExtractor``

---
 .../MediaCCCLiveStreamExtractor.java          | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java
index 9a7617743..46659bf7f 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java
@@ -27,6 +27,7 @@ import org.schabi.newpipe.extractor.streamdata.stream.simpleimpl.SimpleVideoAudi
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -162,22 +163,16 @@ public class MediaCCCLiveStreamExtractor extends StreamExtractor {
     public List<AudioStream> getAudioStreams() throws IOException, ExtractionException {
         return getStreamDTOs("audio")
                 .map(dto -> {
-                    final String url = dto.getUrlValue().getString(URL);
-                    final DeliveryData deliveryData;
-                    if ("hls".equals(dto.getUrlKey())) {
-                        deliveryData = new SimpleHLSDeliveryDataImpl(url);
-                    } else if ("dash".equals(dto.getUrlKey())) {
-                        deliveryData = new SimpleDASHUrlDeliveryDataImpl(url);
-                    } else {
-                        deliveryData = new SimpleProgressiveHTTPDeliveryDataImpl(url);
+                    try {
+                        return new SimpleAudioStreamImpl(
+                                new AudioFormatRegistry().getFromSuffixOrThrow(dto.getUrlKey()),
+                                buildDeliveryData(dto)
+                        );
+                    } catch (final Exception ignored) {
+                        return null;
                     }
-
-                    return new SimpleAudioStreamImpl(
-                            // TODO: This looks wrong
-                            new AudioFormatRegistry().getFromSuffixOrThrow(dto.getUrlKey()),
-                            deliveryData
-                    );
                 })
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
     }
 
@@ -185,30 +180,37 @@ public class MediaCCCLiveStreamExtractor extends StreamExtractor {
     public List<VideoAudioStream> getVideoStreams() throws IOException, ExtractionException {
         return getStreamDTOs("video")
                 .map(dto -> {
-                    final String url = dto.getUrlValue().getString(URL);
-                    final DeliveryData deliveryData;
-                    if ("hls".equals(dto.getUrlKey())) {
-                        deliveryData = new SimpleHLSDeliveryDataImpl(url);
-                    } else if ("dash".equals(dto.getUrlKey())) {
-                        deliveryData = new SimpleDASHUrlDeliveryDataImpl(url);
-                    } else {
-                        deliveryData = new SimpleProgressiveHTTPDeliveryDataImpl(url);
+                    try {
+                        final JsonArray videoSize =
+                                dto.getStreamJsonObj().getArray("videoSize");
+
+                        return new SimpleVideoAudioStreamImpl(
+                                // TODO: This looks wrong
+                                new VideoAudioFormatRegistry()
+                                        .getFromSuffixOrThrow(dto.getUrlKey()),
+                                buildDeliveryData(dto),
+                                VideoQualityData.fromHeightWidth(
+                                        videoSize.getInt(1, VideoQualityData.UNKNOWN),
+                                        videoSize.getInt(0, VideoQualityData.UNKNOWN))
+                        );
+                    } catch (final Exception ignored) {
+                        return null;
                     }
-
-                    final JsonArray videoSize = dto.getStreamJsonObj().getArray("videoSize");
-
-                    return new SimpleVideoAudioStreamImpl(
-                            // TODO: This looks wrong
-                            new VideoAudioFormatRegistry().getFromSuffixOrThrow(dto.getUrlKey()),
-                            deliveryData,
-                            VideoQualityData.fromHeightWidth(
-                                    /*height=*/videoSize.getInt(1, VideoQualityData.UNKNOWN),
-                                    /*width=*/videoSize.getInt(0, VideoQualityData.UNKNOWN))
-                    );
                 })
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
     }
 
+    private DeliveryData buildDeliveryData(final MediaCCCLiveStreamMapperDTO dto) {
+        final String url = dto.getUrlValue().getString(URL);
+        if ("hls".equals(dto.getUrlKey())) {
+            return new SimpleHLSDeliveryDataImpl(url);
+        } else if ("dash".equals(dto.getUrlKey())) {
+            return new SimpleDASHUrlDeliveryDataImpl(url);
+        }
+        return new SimpleProgressiveHTTPDeliveryDataImpl(url);
+    }
+
     private Stream<MediaCCCLiveStreamMapperDTO> getStreamDTOs(@Nonnull final String streamType) {
         return room.getArray(STREAMS).stream()
                 // Ensure that we use only process JsonObjects