From 32db19956b0980a25c475f82d5bc7a2ae79e5c12 Mon Sep 17 00:00:00 2001 From: Kavin <20838718+FireMasterK@users.noreply.github.com> Date: Fri, 5 May 2023 21:30:13 +0100 Subject: [PATCH] Add audio track locale info. --- src/main/java/me/kavin/piped/utils/CollectionUtils.java | 4 +++- src/main/java/me/kavin/piped/utils/obj/PipedStream.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/kavin/piped/utils/CollectionUtils.java b/src/main/java/me/kavin/piped/utils/CollectionUtils.java index 24e1ff4..ccbf539 100644 --- a/src/main/java/me/kavin/piped/utils/CollectionUtils.java +++ b/src/main/java/me/kavin/piped/utils/CollectionUtils.java @@ -10,6 +10,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.stream.StreamType; import java.util.List; +import java.util.Locale; import java.util.Optional; import static me.kavin.piped.utils.URLUtils.*; @@ -54,7 +55,8 @@ public class CollectionUtils { String.valueOf(stream.getFormat()), stream.getAverageBitrate() + " kbps", stream.getFormat().getMimeType(), false, stream.getBitrate(), stream.getInitStart(), stream.getInitEnd(), stream.getIndexStart(), stream.getIndexEnd(), stream.getCodec(), stream.getAudioTrackId(), stream.getAudioTrackName(), - Optional.ofNullable(stream.getAudioTrackType()).map(Enum::name).orElse(null) + Optional.ofNullable(stream.getAudioTrackType()).map(Enum::name).orElse(null), + Optional.ofNullable(stream.getAudioLocale()).map(Locale::toLanguageTag).orElse(null) ))); } diff --git a/src/main/java/me/kavin/piped/utils/obj/PipedStream.java b/src/main/java/me/kavin/piped/utils/obj/PipedStream.java index 33c41df..818b6c2 100644 --- a/src/main/java/me/kavin/piped/utils/obj/PipedStream.java +++ b/src/main/java/me/kavin/piped/utils/obj/PipedStream.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class PipedStream { - public String url, format, quality, mimeType, codec, audioTrackId, audioTrackName, audioTrackType; + public String url, format, quality, mimeType, codec, audioTrackId, audioTrackName, audioTrackType, audioTrackLocale; public boolean videoOnly; public int bitrate, initStart, initEnd, indexStart, indexEnd, width, height, fps; @@ -19,7 +19,8 @@ public class PipedStream { } public PipedStream(String url, String format, String quality, String mimeType, boolean videoOnly, int bitrate, - int initStart, int initEnd, int indexStart, int indexEnd, String codec, String audioTrackId, String audioTrackName, String audioTrackType) { + int initStart, int initEnd, int indexStart, int indexEnd, String codec, String audioTrackId, + String audioTrackName, String audioTrackType, String audioTrackLocale) { this.url = url; this.format = format; this.quality = quality; @@ -34,6 +35,7 @@ public class PipedStream { this.audioTrackId = audioTrackId; this.audioTrackName = audioTrackName; this.audioTrackType = audioTrackType; + this.audioTrackLocale = audioTrackLocale; } public PipedStream(String url, String format, String quality, String mimeType, boolean videoOnly, int bitrate,