Allow retrieval of a non-approximate DateWrapper in YoutubeStreamExtractor

Author: Isira-Seneviratne

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

@@ -67,11 +67,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -295,21 +290,6 @@ public static String getFeedUrlFrom(@Nonnull final String channelIdOrUser) {
         }
     }
 
-    public static Instant parseInstantFrom(final String textualUploadDate)
-            throws ParsingException {
-        try {
-            return OffsetDateTime.parse(textualUploadDate).toInstant();
-        } catch (final DateTimeParseException e) {
-            try {
-                return LocalDate.parse(textualUploadDate).atStartOfDay(ZoneId.systemDefault())
-                        .toInstant();
-            } catch (final DateTimeParseException e1) {
-                throw new ParsingException("Could not parse date: \"" + textualUploadDate + "\"",
-                        e1);
-            }
-        }
-    }
-
     /**
      * Checks if the given playlist id is a YouTube Mix (auto-generated playlist)
      * Ids from a YouTube Mix start with "RD"

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

@@ -20,6 +20,7 @@
 
 package org.schabi.newpipe.extractor.services.youtube.extractors;
 
+import static org.schabi.newpipe.extractor.localization.TimeAgoPatternsManager.getTimeAgoParserFor;
 import static org.schabi.newpipe.extractor.services.youtube.ItagItem.APPROX_DURATION_MS_UNKNOWN;
 import static org.schabi.newpipe.extractor.services.youtube.ItagItem.CONTENT_LENGTH_UNKNOWN;
 import static org.schabi.newpipe.extractor.services.youtube.YoutubeDescriptionHelper.attributedDescriptionToHtml;
@@ -59,7 +60,6 @@
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.localization.Localization;
 import org.schabi.newpipe.extractor.localization.TimeAgoParser;
-import org.schabi.newpipe.extractor.localization.TimeAgoPatternsManager;
 import org.schabi.newpipe.extractor.services.youtube.ItagItem;
 import org.schabi.newpipe.extractor.services.youtube.PoTokenProvider;
 import org.schabi.newpipe.extractor.services.youtube.PoTokenResult;
@@ -87,14 +87,17 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
@@ -169,77 +172,72 @@ public String getName() throws ParsingException {
     @Nullable
     @Override
     public String getTextualUploadDate() throws ParsingException {
-        if (!playerMicroFormatRenderer.getString("uploadDate", "").isEmpty()) {
-            return playerMicroFormatRenderer.getString("uploadDate");
-        } else if (!playerMicroFormatRenderer.getString("publishDate", "").isEmpty()) {
-            return playerMicroFormatRenderer.getString("publishDate");
+        final var uploadDate = getUploadDate();
+        if (uploadDate == null) {
+            return null;
         }
+        return LocalDate.ofInstant(uploadDate.getInstant(), ZoneId.systemDefault()).toString();
+    }
+
+    @Override
+    public DateWrapper getUploadDate() throws ParsingException {
+        final String dateStr = playerMicroFormatRenderer.getString("uploadDate",
+                playerMicroFormatRenderer.getString("publishDate", ""));
+        if (!dateStr.isEmpty()) {
+            return new DateWrapper(OffsetDateTime.parse(dateStr));
+        }
+
+        final var liveDetails = playerMicroFormatRenderer.getObject("liveBroadcastDetails");
+        final String timestamp = liveDetails.getString("endTimestamp", // an ended live stream
+                liveDetails.getString("startTimestamp", "")); // a running live stream
 
-        final JsonObject liveDetails = playerMicroFormatRenderer.getObject(
-                "liveBroadcastDetails");
-        if (!liveDetails.getString("endTimestamp", "").isEmpty()) {
-            // an ended live stream
-            return liveDetails.getString("endTimestamp");
-        } else if (!liveDetails.getString("startTimestamp", "").isEmpty()) {
-            // a running live stream
-            return liveDetails.getString("startTimestamp");
+        if (!timestamp.isEmpty()) {
+            return new DateWrapper(OffsetDateTime.parse(timestamp));
         } else if (getStreamType() == StreamType.LIVE_STREAM) {
             // this should never be reached, but a live stream without upload date is valid
             return null;
         }
 
-        final String videoPrimaryInfoRendererDateText =
-                getTextFromObject(getVideoPrimaryInfoRenderer().getObject("dateText"));
+        final var textObject = getVideoPrimaryInfoRenderer().getObject("dateText");
+        return Optional.ofNullable(getTextFromObject(textObject))
+                .flatMap(rendererDateText -> {
+                    final Optional<LocalDate> dateOptional;
 
-        if (videoPrimaryInfoRendererDateText != null) {
-            if (videoPrimaryInfoRendererDateText.startsWith("Premiered")) {
-                final String time = videoPrimaryInfoRendererDateText.substring(13);
+                    if (rendererDateText.startsWith("Premiered")) {
+                        final String time = rendererDateText.substring(13);
 
-                try { // Premiered 20 hours ago
-                    final var timeAgoParser = TimeAgoPatternsManager.getTimeAgoParserFor(
-                            new Localization("en"));
-                    final var instant = timeAgoParser.parse(time).getInstant();
-                    return LocalDate.ofInstant(instant, ZoneId.systemDefault()).toString();
-                } catch (final Exception ignored) {
-                }
-
-                try { // Premiered Feb 21, 2020
-                    final var formatter = DateTimeFormatter.ofPattern("MMM dd, yyyy",
-                            Locale.ENGLISH);
-                    return LocalDate.parse(time, formatter).toString();
-                } catch (final Exception ignored) {
-                }
-
-                try { // Premiered on 21 Feb 2020
-                    final var formatter = DateTimeFormatter.ofPattern("dd MMM yyyy",
-                            Locale.ENGLISH);
-                    return LocalDate.parse(time, formatter).toString();
-                } catch (final Exception ignored) {
-                }
-            }
+                        try { // Premiered 20 hours ago
+                            final var localization = new Localization("en");
+                            return Optional.of(getTimeAgoParserFor(localization).parse(time));
+                        } catch (final Exception e) {
+                        }
 
-            try {
-                // TODO: this parses English formatted dates only, we need a better approach to
-                //  parse the textual date
-                final var formatter = DateTimeFormatter.ofPattern("dd MMM yyyy", Locale.ENGLISH);
-                return LocalDate.parse(videoPrimaryInfoRendererDateText, formatter).toString();
-            } catch (final Exception e) {
-                throw new ParsingException("Could not get upload date", e);
-            }
-        }
+                        // Premiered Feb 21, 2020
+                        dateOptional = parseOptionalDate(time, "MMM dd, yyyy")
+                                // Premiered on 21 Feb 2020
+                                .or(() -> parseOptionalDate(time, "dd MMM yyyy"));
+                    } else {
+                        // Premiered on 21 Feb 2020
+                        dateOptional = parseOptionalDate(rendererDateText, "dd MMM yyyy");
+                    }
 
-        throw new ParsingException("Could not get upload date");
+                    return dateOptional.map(date -> {
+                        final var instant = date.atStartOfDay(ZoneId.systemDefault()).toInstant();
+                        return new DateWrapper(instant, true);
+                    });
+                })
+                .orElseThrow(() -> new ParsingException("Could not get upload date"));
     }
 
-    @Override
-    public DateWrapper getUploadDate() throws ParsingException {
-        final String textualUploadDate = getTextualUploadDate();
-
-        if (isNullOrEmpty(textualUploadDate)) {
-            return null;
+    private Optional<LocalDate> parseOptionalDate(String date, String pattern) {
+        try {
+            // TODO: this parses English formatted dates only, we need a better approach to
+            // parse the textual date
+            final var formatter = DateTimeFormatter.ofPattern(pattern, Locale.ENGLISH);
+            return Optional.of(LocalDate.parse(date, formatter));
+        } catch (DateTimeParseException e) {
+            return Optional.empty();
         }
-
-        return new DateWrapper(YoutubeParsingHelper.parseInstantFrom(textualUploadDate), true);
     }
 
     @Nonnull