[YouTube] Fix fetching item duration from the new A/B test

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 allprojects {
     apply(plugin = "java-library")
 
-    version = "v0.25.2"
+    version = "v0.26.0"
 
     tasks.withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.toString()

extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java

@@ -27,6 +27,7 @@
 import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 /*
  * Copyright (C) 2018 Christian Schabesberger <chris.schabesberger@mailbox.org>
@@ -54,23 +55,23 @@ public abstract class StreamingService {
     public static class ServiceInfo {
         private final String name;
 
-        private final List<MediaCapability> mediaCapabilities;
+        private final Set<MediaCapability> mediaCapabilities;
 
         /**
          * Creates a new instance of a ServiceInfo
          * @param name the name of the service
          * @param mediaCapabilities the type of media this service can handle
          */
-        public ServiceInfo(final String name, final List<MediaCapability> mediaCapabilities) {
+        public ServiceInfo(final String name, final Set<MediaCapability> mediaCapabilities) {
             this.name = name;
-            this.mediaCapabilities = Collections.unmodifiableList(mediaCapabilities);
+            this.mediaCapabilities = mediaCapabilities;
         }
 
         public String getName() {
             return name;
         }
 
-        public List<MediaCapability> getMediaCapabilities() {
+        public Set<MediaCapability> getMediaCapabilities() {
             return mediaCapabilities;
         }
 
@@ -104,7 +105,7 @@ public enum LinkType {
      */
     public StreamingService(final int id,
                             final String name,
-                            final List<ServiceInfo.MediaCapability> capabilities) {
+                            final Set<ServiceInfo.MediaCapability> capabilities) {
         this.serviceId = id;
         this.serviceInfo = new ServiceInfo(name, capabilities);
     }

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampService.java

@@ -47,12 +47,12 @@
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
 
-import java.util.Arrays;
+import java.util.EnumSet;
 
 public class BandcampService extends StreamingService {
 
     public BandcampService(final int id) {
-        super(id, "Bandcamp", Arrays.asList(AUDIO, COMMENTS));
+        super(id, "Bandcamp", EnumSet.of(AUDIO, COMMENTS));
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCService.java

@@ -2,7 +2,6 @@
 
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
-import static java.util.Arrays.asList;
 
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
@@ -38,9 +37,11 @@
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
 
+import java.util.EnumSet;
+
 public class MediaCCCService extends StreamingService {
     public MediaCCCService(final int id) {
-        super(id, "media.ccc.de", asList(AUDIO, VIDEO));
+        super(id, "media.ccc.de", EnumSet.of(AUDIO, VIDEO));
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeService.java

@@ -2,7 +2,6 @@
 
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
-import static java.util.Arrays.asList;
 
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
@@ -38,6 +37,7 @@
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
 
+import java.util.EnumSet;
 import java.util.List;
 
 public class PeertubeService extends StreamingService {
@@ -49,7 +49,7 @@ public PeertubeService(final int id) {
     }
 
     public PeertubeService(final int id, final PeertubeInstance instance) {
-        super(id, "PeerTube", asList(VIDEO, COMMENTS));
+        super(id, "PeerTube", EnumSet.of(VIDEO, COMMENTS));
         this.instance = instance;
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java

@@ -2,7 +2,6 @@
 
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
-import static java.util.Arrays.asList;
 
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
@@ -38,12 +37,13 @@
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 
+import java.util.EnumSet;
 import java.util.List;
 
 public class SoundcloudService extends StreamingService {
 
     public SoundcloudService(final int id) {
-        super(id, "SoundCloud", asList(AUDIO, COMMENTS));
+        super(id, "SoundCloud", EnumSet.of(AUDIO, COMMENTS));
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java

@@ -4,7 +4,6 @@
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.LIVE;
 import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
-import static java.util.Arrays.asList;
 
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
@@ -57,6 +56,7 @@
 import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
 import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
 
+import java.util.EnumSet;
 import java.util.List;
 
 import javax.annotation.Nonnull;
@@ -84,7 +84,7 @@
 public class YoutubeService extends StreamingService {
 
     public YoutubeService(final int id) {
-        super(id, "YouTube", asList(AUDIO, VIDEO, LIVE, COMMENTS));
+        super(id, "YouTube", EnumSet.of(AUDIO, VIDEO, LIVE, COMMENTS));
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamInfoItemExtractor.java

@@ -130,10 +130,15 @@ public String getUrl() throws ParsingException {
 
     @Override
     public String getName() throws ParsingException {
-        final String name = getTextFromObject(videoInfo.getObject("title"));
+        final JsonObject title = videoInfo.getObject("title");
+        final String name = getTextFromObject(title);
         if (!isNullOrEmpty(name)) {
             return name;
         }
+        // Videos can have no title, e.g. https://www.youtube.com/watch?v=nc1kN8ZSfGQ
+        if (!isNullOrEmpty(title) && !title.has("runs")) {
+            return "";
+        }
         throw new ParsingException("Could not get name");
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamInfoItemLockupExtractor.java

@@ -151,17 +151,30 @@ public long getDuration() throws ParsingException {
             return -1;
         }
 
-        final List<String> potentialDurations = JsonUtils.getArray(lockupViewModel,
-                "contentImage.thumbnailViewModel.overlays")
-            .streamAsJsonObjects()
-            .flatMap(jsonObject -> jsonObject
-                .getObject("thumbnailOverlayBadgeViewModel")
-                .getArray("thumbnailBadges")
-                .streamAsJsonObjects())
-            .map(jsonObject -> jsonObject
-                .getObject("thumbnailBadgeViewModel")
-                .getString("text"))
-            .collect(Collectors.toList());
+        final JsonArray overlays = JsonUtils.getArray(lockupViewModel,
+                "contentImage.thumbnailViewModel.overlays");
+
+        List<JsonObject> thumbnailBadges = overlays.streamAsJsonObjects()
+                .flatMap(jsonObject -> jsonObject
+                        .getObject("thumbnailOverlayBadgeViewModel")
+                        .getArray("thumbnailBadges")
+                        .streamAsJsonObjects())
+                .collect(Collectors.toList());
+
+        if (thumbnailBadges.isEmpty()) {
+            thumbnailBadges = overlays.streamAsJsonObjects()
+                    .flatMap(jsonObject -> jsonObject
+                            .getObject("thumbnailBottomOverlayViewModel")
+                            .getArray("badges")
+                            .streamAsJsonObjects())
+                    .collect(Collectors.toList());
+        }
+
+        final List<String> potentialDurations = thumbnailBadges.stream()
+                .map(jsonObject -> jsonObject
+                        .getObject("thumbnailBadgeViewModel")
+                        .getString("text"))
+                .collect(Collectors.toList());
 
         if (potentialDurations.isEmpty()) {
             throw new ParsingException("Could not get duration: No parsable durations detected");

extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamInfoItemTest.java

@@ -85,4 +85,29 @@ void lockupViewModelPremiere()
         () -> assertFalse(extractor.isShortFormContent())
         );
     }
+
+    @Test
+    void emptyTitle() throws FileNotFoundException, JsonParserException {
+        final var json = JsonParser.object().from(new FileInputStream(getMockPath(
+                YoutubeStreamInfoItemTest.class, "emptyTitle") + ".json"));
+        final var timeAgoParser = TimeAgoPatternsManager.getTimeAgoParserFor(Localization.DEFAULT);
+        final var extractor = new YoutubeStreamInfoItemExtractor(json, timeAgoParser);
+        assertAll(
+                () -> assertEquals(StreamType.VIDEO_STREAM, extractor.getStreamType()),
+                () -> assertFalse(extractor.isAd()),
+                () -> assertEquals("https://www.youtube.com/watch?v=nc1kN8ZSfGQ", extractor.getUrl()),
+                () -> assertEquals("", extractor.getName()),
+                () -> assertEquals(39, extractor.getDuration()),
+                () -> assertEquals("hyper", extractor.getUploaderName()),
+                () -> assertEquals("https://www.youtube.com/channel/UCSezUnbvCLYBXuUlPcXU_QQ", extractor.getUploaderUrl()),
+                () -> assertFalse(extractor.getUploaderAvatars().isEmpty()),
+                () -> assertTrue(extractor.isUploaderVerified()),
+                () -> assertEquals("8 years ago", extractor.getTextualUploadDate()),
+                () -> assertNotNull(extractor.getUploadDate()),
+                () -> assertTrue(extractor.getViewCount() >= 1318193),
+                () -> assertFalse(extractor.getThumbnails().isEmpty()),
+                () -> assertNull(extractor.getShortDescription()),
+                () -> assertFalse(extractor.isShortFormContent())
+        );
+    }
 }