Refactor date parsing

extractor/src/main/java/org/schabi/newpipe/extractor/localization/DateWrapper.java

@@ -1,65 +1,52 @@
 package org.schabi.newpipe.extractor.localization;
 
-
 import javax.annotation.Nonnull;
 import java.io.Serializable;
+import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
 
 /**
  * A wrapper class that provides a field to describe if the date/time is precise or just an
  * approximation.
  */
 public class DateWrapper implements Serializable {
     @Nonnull
-    private final OffsetDateTime offsetDateTime;
+    private final Instant instant;
     private final boolean isApproximation;
 
-    /**
-     * @deprecated Use {@link #DateWrapper(OffsetDateTime)} instead.
-     */
-    @Deprecated
-    public DateWrapper(@Nonnull final Calendar calendar) {
-        //noinspection deprecation
-        this(calendar, false);
-    }
-
-    /**
-     * @deprecated Use {@link #DateWrapper(OffsetDateTime, boolean)} instead.
-     */
-    @Deprecated
-    public DateWrapper(@Nonnull final Calendar calendar, final boolean isApproximation) {
-        this(OffsetDateTime.ofInstant(calendar.toInstant(), ZoneOffset.UTC), isApproximation);
-    }
-
     public DateWrapper(@Nonnull final OffsetDateTime offsetDateTime) {
         this(offsetDateTime, false);
     }
 
     public DateWrapper(@Nonnull final OffsetDateTime offsetDateTime,
                        final boolean isApproximation) {
-        this.offsetDateTime = offsetDateTime.withOffsetSameInstant(ZoneOffset.UTC);
+        this(offsetDateTime.toInstant(), isApproximation);
+    }
+
+    public DateWrapper(@Nonnull final Instant instant) {
+        this(instant, false);
+    }
+
+    public DateWrapper(@Nonnull final Instant instant, final boolean isApproximation) {
+        this.instant = instant;
         this.isApproximation = isApproximation;
     }
 
     /**
-     * @return the wrapped date/time as a {@link Calendar}.
-     * @deprecated use {@link #offsetDateTime()} instead.
+     * @return the wrapped {@link Instant}
      */
-    @Deprecated
     @Nonnull
-    public Calendar date() {
-        return GregorianCalendar.from(offsetDateTime.toZonedDateTime());
+    public Instant getInstant() {
+        return instant;
     }
 
     /**
-     * @return the wrapped date/time.
+     * @return the wrapped {@link Instant} as an {@link OffsetDateTime} set to UTC.
      */
     @Nonnull
     public OffsetDateTime offsetDateTime() {
-        return offsetDateTime;
+        return instant.atOffset(ZoneOffset.UTC);
     }
 
     /**

extractor/src/main/java/org/schabi/newpipe/extractor/localization/TimeAgoParser.java

@@ -5,7 +5,6 @@
 import org.schabi.newpipe.extractor.utils.Parser;
 
 import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -28,7 +27,7 @@ public class TimeAgoParser {
      *                       language word separator.
      */
     public TimeAgoParser(final PatternsHolder patternsHolder) {
-        this(patternsHolder, OffsetDateTime.now(ZoneOffset.UTC));
+        this(patternsHolder, OffsetDateTime.now());
     }
 
     /**

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

@@ -204,7 +204,7 @@ public static DateWrapper parseDate(final String textDate) throws ParsingExcepti
         try {
             final ZonedDateTime zonedDateTime = ZonedDateTime.parse(textDate,
                     DateTimeFormatter.ofPattern("dd MMM yyyy HH:mm:ss zzz", Locale.ENGLISH));
-            return new DateWrapper(zonedDateTime.toOffsetDateTime(), false);
+            return new DateWrapper(zonedDateTime.toInstant());
         } catch (final DateTimeException e) {
             throw new ParsingException("Could not parse date '" + textDate + "'", e);
         }

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

@@ -8,15 +8,12 @@
 import org.schabi.newpipe.extractor.Image.ResolutionLevel;
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.extractor.localization.Localization;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.IOException;
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -33,15 +30,6 @@ public final class MediaCCCParsingHelper {
 
     private MediaCCCParsingHelper() { }
 
-    public static OffsetDateTime parseDateFrom(final String textualUploadDate)
-            throws ParsingException {
-        try {
-            return OffsetDateTime.parse(textualUploadDate);
-        } catch (final DateTimeParseException e) {
-            throw new ParsingException("Could not parse date: \"" + textualUploadDate + "\"", e);
-        }
-    }
-
     /**
      * Check whether an id is a live stream id
      * @param id the {@code id} to check

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

@@ -54,7 +54,7 @@ public InfoItemsPage<StreamInfoItem> getInitialPage() throws IOException, Extrac
         // Sort them to have the latest stream at the beginning of the list.
         final Comparator<StreamInfoItem> comparator = Comparator
                 .comparing(StreamInfoItem::getUploadDate, Comparator
-                        .nullsLast(Comparator.comparing(DateWrapper::offsetDateTime)))
+                        .nullsLast(Comparator.comparing(DateWrapper::getInstant)))
                 .reversed();
         final StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId(),
                 comparator);

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

@@ -92,6 +92,6 @@ public String getTextualUploadDate() throws ParsingException {
     public DateWrapper getUploadDate() throws ParsingException {
         final ZonedDateTime zonedDateTime = ZonedDateTime.parse(event.getString("date"),
                 DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSzzzz"));
-        return new DateWrapper(zonedDateTime.toOffsetDateTime(), false);
+        return new DateWrapper(zonedDateTime.toInstant());
     }
 }

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

@@ -2,7 +2,6 @@
 
 import static org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper.getImageListFromLogoImageUrl;
 import static org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper.getThumbnailsFromStreamItem;
-import static org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper.parseDateFrom;
 import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE;
 import static org.schabi.newpipe.extractor.stream.Stream.ID_UNKNOWN;
 
@@ -27,6 +26,7 @@
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.extractor.utils.ExtractorHelper;
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 import org.schabi.newpipe.extractor.utils.LocaleCompat;
 
@@ -55,7 +55,7 @@ public String getTextualUploadDate() {
     @Nonnull
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
-        return new DateWrapper(parseDateFrom(getTextualUploadDate()));
+        return ExtractorHelper.parseDateWrapper(getTextualUploadDate());
     }
 
     @Nonnull

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

@@ -4,9 +4,9 @@
 import org.schabi.newpipe.extractor.Image;
 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 org.schabi.newpipe.extractor.utils.ExtractorHelper;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -66,10 +66,8 @@ public String getTextualUploadDate() {
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
         final String date = getTextualUploadDate();
-        if (date == null) {
-            return null; // event is in the future...
-        }
-        return new DateWrapper(MediaCCCParsingHelper.parseDateFrom(date));
+        // if null, event is in the future...
+        return date == null ? null : ExtractorHelper.parseDateWrapper(date);
     }
 
     @Override

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

@@ -10,6 +10,7 @@
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
+import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeChannelInfoItemExtractor;
 import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubePlaylistInfoItemExtractor;
 import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeSepiaStreamInfoItemExtractor;
@@ -19,8 +20,6 @@
 
 import javax.annotation.Nonnull;
 import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -48,10 +47,10 @@ public static void validate(final JsonObject json) throws ContentNotAvailableExc
         }
     }
 
-    public static OffsetDateTime parseDateFrom(final String textualUploadDate)
+    public static DateWrapper parseDateWrapper(final String textualUploadDate)
             throws ParsingException {
         try {
-            return OffsetDateTime.ofInstant(Instant.parse(textualUploadDate), ZoneOffset.UTC);
+            return new DateWrapper(Instant.parse(textualUploadDate));
         } catch (final DateTimeParseException e) {
             throw new ParsingException("Could not parse date: \"" + textualUploadDate + "\"", e);
         }

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

@@ -23,7 +23,7 @@
 
 import static org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeCommentsExtractor.CHILDREN;
 import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getAvatarsFromOwnerAccountOrVideoChannelObject;
-import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseDateFrom;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseDateWrapper;
 
 public class PeertubeCommentsInfoItemExtractor implements CommentsInfoItemExtractor {
     @Nonnull
@@ -73,8 +73,7 @@ public String getTextualUploadDate() throws ParsingException {
 
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
-        final String textualUploadDate = getTextualUploadDate();
-        return new DateWrapper(parseDateFrom(textualUploadDate));
+        return parseDateWrapper(getTextualUploadDate());
     }
 
     @Nonnull

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

@@ -2,6 +2,7 @@
 
 import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getAvatarsFromOwnerAccountOrVideoChannelObject;
 import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getThumbnailsFromPlaylistOrVideoItem;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseDateWrapper;
 import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE;
 import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
 
@@ -80,12 +81,7 @@ public String getTextualUploadDate() throws ParsingException {
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
         final String textualUploadDate = getTextualUploadDate();
-
-        if (textualUploadDate == null) {
-            return null;
-        }
-
-        return new DateWrapper(PeertubeParsingHelper.parseDateFrom(textualUploadDate));
+        return textualUploadDate == null ? null : parseDateWrapper(textualUploadDate);
     }
 
     @Nonnull

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

@@ -14,7 +14,7 @@
 
 import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getAvatarsFromOwnerAccountOrVideoChannelObject;
 import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.getThumbnailsFromPlaylistOrVideoItem;
-import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseDateFrom;
+import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.parseDateWrapper;
 
 public class PeertubeStreamInfoItemExtractor implements StreamInfoItemExtractor {
 
@@ -86,12 +86,7 @@ public String getTextualUploadDate() throws ParsingException {
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
         final String textualUploadDate = getTextualUploadDate();
-
-        if (textualUploadDate == null) {
-            return null;
-        }
-
-        return new DateWrapper(parseDateFrom(textualUploadDate));
+        return textualUploadDate == null ? null : parseDateWrapper(textualUploadDate);
     }
 
     @Override

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

@@ -67,10 +67,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -294,20 +290,6 @@ public static String getFeedUrlFrom(@Nonnull final String channelIdOrUser) {
         }
     }
 
-    public static OffsetDateTime parseDateFrom(final String textualUploadDate)
-            throws ParsingException {
-        try {
-            return OffsetDateTime.parse(textualUploadDate);
-        } catch (final DateTimeParseException e) {
-            try {
-                return LocalDate.parse(textualUploadDate).atStartOfDay().atOffset(ZoneOffset.UTC);
-            } 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/YoutubeFeedInfoItemExtractor.java

@@ -7,11 +7,10 @@
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
 import org.schabi.newpipe.extractor.stream.StreamType;
+import org.schabi.newpipe.extractor.utils.ExtractorHelper;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeParseException;
 import java.util.List;
 
 public class YoutubeFeedInfoItemExtractor implements StreamInfoItemExtractor {
@@ -69,12 +68,8 @@ public String getTextualUploadDate() {
     @Nullable
     @Override
     public DateWrapper getUploadDate() throws ParsingException {
-        try {
-            return new DateWrapper(OffsetDateTime.parse(getTextualUploadDate()));
-        } catch (final DateTimeParseException e) {
-            throw new ParsingException("Could not parse date (\"" + getTextualUploadDate() + "\")",
-                    e);
-        }
+        final String date = getTextualUploadDate();
+        return date == null ? null : ExtractorHelper.parseDateWrapper(date);
     }
 
     @Override