Merge pull request #585 from TeamPiped/audio-track-locale

Add audio track locale info.
TeamPiped · May 5, 2023 · 0536236 · 0536236
2 parents 8596211 + 32db199
commit 0536236
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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.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 static Streams collectStreamInfo(StreamInfo info) {
                             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
@@ -5,7 +5,7 @@
 @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 PipedStream(String url, String format, String quality, String mimeType, b
     }
 
     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 PipedStream(String url, String format, String quality, String mimeType, b
         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,