Fix StreamInfoItem

litetex · litetex · commit a2df180d443b · 2022-08-26T17:17:52.000+02:00
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioInfoItemExtractor.java b/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
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/streaminfoitem/BandcampSearchStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/streaminfoitem/BandcampSearchStreamInfoItemExtractor.java
@@ -22,11 +22,7 @@ public BandcampSearchStreamInfoItemExtractor(final Element searchResult,
     public String getUploaderName() {
         final String subhead = resultInfo.getElementsByClass("subhead").text();
         final String[] splitBy = subhead.split("by ");
-        if (splitBy.length > 1) {
-            return splitBy[1];
-        } else {
-            return splitBy[0];
-        }
+        return splitBy.length > 1 ? splitBy[1] : splitBy[0];
     }
 
     @Nullable
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/streaminfoitem/BandcampStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/streaminfoitem/BandcampStreamInfoItemExtractor.java
@@ -3,7 +3,6 @@
 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;
 
@@ -13,13 +12,13 @@
 public abstract class BandcampStreamInfoItemExtractor implements StreamInfoItemExtractor {
     private final String uploaderUrl;
 
-    public BandcampStreamInfoItemExtractor(final String uploaderUrl) {
+    protected BandcampStreamInfoItemExtractor(final String uploaderUrl) {
         this.uploaderUrl = uploaderUrl;
     }
 
     @Override
-    public StreamType getStreamType() {
-        return StreamType.AUDIO_STREAM;
+    public boolean isAudioOnly() {
+        return true;
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamKioskExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamKioskExtractor.java
@@ -1,10 +1,10 @@
 package org.schabi.newpipe.extractor.services.media_ccc.extractors;
 
 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;
 
@@ -38,15 +38,16 @@ public String getThumbnailUrl() throws ParsingException {
     }
 
     @Override
-    public StreamType getStreamType() throws ParsingException {
-        boolean isVideo = false;
-        for (final Object stream : roomInfo.getArray("streams")) {
-            if ("video".equals(((JsonObject) stream).getString("type"))) {
-                isVideo = true;
-                break;
-            }
-        }
-        return isVideo ? StreamType.LIVE_STREAM :  StreamType.AUDIO_LIVE_STREAM;
+    public boolean isLive() {
+        return true;
+    }
+
+    @Override
+    public boolean isAudioOnly() {
+        return roomInfo.getArray("streams").stream()
+                .filter(JsonObject.class::isInstance)
+                .map(JsonObject.class::cast)
+                .noneMatch(s -> "video".equalsIgnoreCase(s.getString("type")));
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCRecentKioskExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCRecentKioskExtractor.java
@@ -6,7 +6,6 @@
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCConferenceLinkHandlerFactory;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
-import org.schabi.newpipe.extractor.stream.StreamType;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -36,11 +35,6 @@ public String getThumbnailUrl() throws ParsingException {
         return event.getString("thumb_url");
     }
 
-    @Override
-    public StreamType getStreamType() throws ParsingException {
-        return StreamType.VIDEO_STREAM;
-    }
-
     @Override
     public boolean isAd() {
         return false;
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/infoItems/MediaCCCStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/infoItems/MediaCCCStreamInfoItemExtractor.java
@@ -1,11 +1,11 @@
 package org.schabi.newpipe.extractor.services.media_ccc.extractors.infoItems;
 
 import com.grack.nanojson.JsonObject;
+
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
-import org.schabi.newpipe.extractor.stream.StreamType;
 
 import javax.annotation.Nullable;
 
@@ -16,11 +16,6 @@ public MediaCCCStreamInfoItemExtractor(final JsonObject event) {
         this.event = event;
     }
 
-    @Override
-    public StreamType getStreamType() {
-        return StreamType.VIDEO_STREAM;
-    }
-
     @Override
     public boolean isAd() {
         return false;
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamInfoItemExtractor.java
@@ -1,12 +1,12 @@
 package org.schabi.newpipe.extractor.services.peertube.extractors;
 
 import com.grack.nanojson.JsonObject;
+
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 
 import javax.annotation.Nullable;
@@ -93,8 +93,8 @@ public DateWrapper getUploadDate() throws ParsingException {
     }
 
     @Override
-    public StreamType getStreamType() {
-        return item.getBoolean("isLive") ? StreamType.LIVE_STREAM : StreamType.VIDEO_STREAM;
+    public boolean isLive() {
+        return item.getBoolean("isLive");
     }
 
     @Override
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamInfoItemExtractor.java
@@ -8,7 +8,6 @@
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
-import org.schabi.newpipe.extractor.stream.StreamType;
 
 import javax.annotation.Nullable;
 
@@ -20,6 +19,11 @@ public SoundcloudStreamInfoItemExtractor(final JsonObject itemObject) {
         this.itemObject = itemObject;
     }
 
+    @Override
+    public boolean isAudioOnly() {
+        return true;
+    }
+
     @Override
     public String getUrl() {
         return replaceHttpWithHttps(itemObject.getString("permalink_url"));
@@ -80,11 +84,6 @@ public String getThumbnailUrl() {
         return artworkUrl.replace("large.jpg", "crop.jpg");
     }
 
-    @Override
-    public StreamType getStreamType() {
-        return StreamType.AUDIO_STREAM;
-    }
-
     @Override
     public boolean isAd() {
         return false;
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeFeedInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeFeedInfoItemExtractor.java
@@ -4,26 +4,19 @@
 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 java.time.OffsetDateTime;
 import java.time.format.DateTimeParseException;
 
+import javax.annotation.Nullable;
+
 public class YoutubeFeedInfoItemExtractor implements StreamInfoItemExtractor {
     private final Element entryElement;
 
     public YoutubeFeedInfoItemExtractor(final Element entryElement) {
         this.entryElement = entryElement;
     }
 
-    @Override
-    public StreamType getStreamType() {
-        // It is not possible to determine the stream type using the feed endpoint.
-        // All entries are considered a video stream.
-        return StreamType.VIDEO_STREAM;
-    }
-
     @Override
     public boolean isAd() {
         return false;
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamInfoItemExtractor.java
@@ -14,7 +14,6 @@
 import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper;
 import org.schabi.newpipe.extractor.services.youtube.linkHandler.YoutubeStreamLinkHandlerFactory;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
-import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 import org.schabi.newpipe.extractor.utils.Utils;
 
@@ -46,7 +45,7 @@
 public class YoutubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
     private final JsonObject videoInfo;
     private final TimeAgoParser timeAgoParser;
-    private StreamType cachedStreamType;
+    private Boolean cachedIsLive;
 
     /**
      * Creates an extractor of StreamInfoItems from a YouTube page.
@@ -61,19 +60,23 @@ public YoutubeStreamInfoItemExtractor(final JsonObject videoInfoItem,
     }
 
     @Override
-    public StreamType getStreamType() {
-        if (cachedStreamType != null) {
-            return cachedStreamType;
+    public boolean isLive() {
+        if (cachedIsLive != null) {
+            return cachedIsLive;
         }
 
+        cachedIsLive = determineIfIsLive();
+        return cachedIsLive;
+    }
+
+    private boolean determineIfIsLive() {
         final JsonArray badges = videoInfo.getArray("badges");
         for (final Object badge : badges) {
             final JsonObject badgeRenderer
                     = ((JsonObject) badge).getObject("metadataBadgeRenderer");
-            if (badgeRenderer.getString("style", "").equals("BADGE_STYLE_TYPE_LIVE_NOW")
-                    || badgeRenderer.getString("label", "").equals("LIVE NOW")) {
-                cachedStreamType = StreamType.LIVE_STREAM;
-                return cachedStreamType;
+            if ("BADGE_STYLE_TYPE_LIVE_NOW".equals(badgeRenderer.getString("style"))
+                    || "LIVE NOW".equals(badgeRenderer.getString("label"))) {
+                return true;
             }
         }
 
@@ -82,13 +85,11 @@ public StreamType getStreamType() {
                     .getObject("thumbnailOverlayTimeStatusRenderer")
                     .getString("style", "");
             if (style.equalsIgnoreCase("LIVE")) {
-                cachedStreamType = StreamType.LIVE_STREAM;
-                return cachedStreamType;
+                return true;
             }
         }
 
-        cachedStreamType = StreamType.VIDEO_STREAM;
-        return cachedStreamType;
+        return false;
     }
 
     @Override
@@ -118,7 +119,7 @@ public String getName() throws ParsingException {
 
     @Override
     public long getDuration() throws ParsingException {
-        if (getStreamType() == StreamType.LIVE_STREAM || isPremiere()) {
+        if (isLive() || isPremiere()) {
             return -1;
         }
 
@@ -212,7 +213,7 @@ public boolean isUploaderVerified() throws ParsingException {
     @Nullable
     @Override
     public String getTextualUploadDate() throws ParsingException {
-        if (getStreamType().equals(StreamType.LIVE_STREAM)) {
+        if (isLive()) {
             return null;
         }
 
@@ -232,7 +233,7 @@ public String getTextualUploadDate() throws ParsingException {
     @Nullable
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
-        if (getStreamType().equals(StreamType.LIVE_STREAM)) {
+        if (isLive()) {
             return null;
         }
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java
@@ -81,8 +81,8 @@ public class StreamInfo extends Info {
     @Nonnull
     private String hlsMasterPlaylistUrl = "";
 
-    private boolean audioOnly = false;
-    private boolean live = false;
+    private final boolean audioOnly;
+    private final boolean live;
 
     private List<InfoItem> relatedItems = new ArrayList<>();
 
@@ -104,9 +104,13 @@ public StreamInfo(final int serviceId,
                       final String originalUrl,
                       final String id,
                       final String name,
-                      final int ageLimit) {
+                      final int ageLimit,
+                      final boolean audioOnly,
+                      final boolean live) {
         super(serviceId, id, url, originalUrl, name);
         this.ageLimit = ageLimit;
+        this.audioOnly = audioOnly;
+        this.live = live;
     }
 
     /**
@@ -319,18 +323,10 @@ public boolean isAudioOnly() {
         return audioOnly;
     }
 
-    public void setAudioOnly(final boolean audioOnly) {
-        this.audioOnly = audioOnly;
-    }
-
     public boolean isLive() {
         return live;
     }
 
-    public void setLive(final boolean live) {
-        this.live = live;
-    }
-
     public List<InfoItem> getRelatedItems() {
         return relatedItems;
     }
@@ -495,19 +491,15 @@ private static StreamInfo extractImportantData(@Nonnull final StreamExtractor ex
             throw new ExtractionException("Some important stream information was not given");
         }
 
-        final StreamInfo streamInfo = new StreamInfo(
+        return new StreamInfo(
                 extractor.getServiceId(),
                 url,
                 extractor.getOriginalUrl(),
                 id,
                 name,
-                ageLimit);
-
-        // These methods don't throw checked exceptions but the data is essential.
-        streamInfo.setLive(extractor.isLive());
-        streamInfo.setAudioOnly(extractor.isAudioOnly());
-
-        return streamInfo;
+                ageLimit,
+                extractor.isAudioOnly(),
+                extractor.isLive());
     }
 
 
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItem.java
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemExtractor.java
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemsCollector.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemsCollector.java
