Skip to content

Commit e50f499

Browse files
committed
[YouTube] Return orignial text date in lockupViewModels premieres
1 parent 7673ea0 commit e50f499

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -256,28 +256,18 @@ public String getTextualUploadDate() throws ParsingException {
256256
final Optional<String> dateText = getDateText();
257257

258258
if (isPremiere()) {
259-
final LocalDateTime premiereDate = getDateFromPremiere(dateText);
260-
if (premiereDate == null) {
261-
return null;
262-
}
263-
return DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(premiereDate);
259+
return getDateFromPremiere(dateText);
264260
}
265261

266262
return dateText.orElse(null);
267263
}
268264

269-
private LocalDateTime getDateFromPremiere(final Optional<String> dateText) {
265+
@Nullable
266+
private String getDateFromPremiere(final Optional<String> dateText) {
270267
// This approach is language dependent
271268
// Remove the premieres text from the upload date metadata part
272-
final String trimmedTextUploadDate =
273-
dateText.map(str -> str.replace(PREMIERES_TEXT, ""))
269+
return dateText.map(str -> str.replace(PREMIERES_TEXT, ""))
274270
.orElse(null);
275-
if (trimmedTextUploadDate == null) {
276-
return null;
277-
}
278-
279-
// As we request a UTC offset of 0 minutes, we get the UTC date
280-
return LocalDateTime.parse(trimmedTextUploadDate, PREMIERES_DATE_FORMATTER);
281271
}
282272

283273
@Nullable
@@ -294,12 +284,14 @@ public DateWrapper getUploadDate() throws ParsingException {
294284
}
295285

296286
if (isPremiere()) {
297-
final LocalDateTime premiereDate = getDateFromPremiere(getDateText());
287+
final String premiereDate = getDateFromPremiere(getDateText());
298288
if (premiereDate == null) {
299289
throw new ParsingException("Could not get upload date from premiere");
300290
}
301291

302-
return new DateWrapper(OffsetDateTime.of(premiereDate, ZoneOffset.UTC));
292+
// As we request a UTC offset of 0 minutes, we get the UTC data
293+
return new DateWrapper(OffsetDateTime.of(
294+
LocalDateTime.parse(premiereDate, PREMIERES_DATE_FORMATTER), ZoneOffset.UTC));
303295
}
304296

305297
return timeAgoParser.parse(textualUploadDate);

0 commit comments

Comments
 (0)