Merge pull request #7802 from jellyfin/external

(cherry picked from commit 9954cbd550)
Signed-off-by: crobibero <cody@robibe.ro>

MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs

@@ -106,15 +106,23 @@ namespace MediaBrowser.Providers.MediaInfo
                     if (mediaInfo.MediaStreams.Count == 1)
                     {
                         MediaStream mediaStream = mediaInfo.MediaStreams[0];
+
+                        if ((mediaStream.Type == MediaStreamType.Audio && _type == DlnaProfileType.Audio)
+                            || (mediaStream.Type == MediaStreamType.Subtitle && _type == DlnaProfileType.Subtitle))
+                        {
                             mediaStream.Index = startIndex++;
                             mediaStream.IsDefault = pathInfo.IsDefault || mediaStream.IsDefault;
                             mediaStream.IsForced = pathInfo.IsForced || mediaStream.IsForced;
 
                             mediaStreams.Add(MergeMetadata(mediaStream, pathInfo));
                         }
+                    }
                     else
                     {
                         foreach (MediaStream mediaStream in mediaInfo.MediaStreams)
+                        {
+                            if ((mediaStream.Type == MediaStreamType.Audio && _type == DlnaProfileType.Audio)
+                                || (mediaStream.Type == MediaStreamType.Subtitle && _type == DlnaProfileType.Subtitle))
                             {
                                 mediaStream.Index = startIndex++;
 
@@ -123,6 +131,7 @@ namespace MediaBrowser.Providers.MediaInfo
                         }
                     }
                 }
+            }
 
             return mediaStreams.AsReadOnly();
         }
@@ -222,13 +231,6 @@ namespace MediaBrowser.Providers.MediaInfo
             mediaStream.Title = string.IsNullOrEmpty(mediaStream.Title) ? (string.IsNullOrEmpty(pathInfo.Title) ? null : pathInfo.Title) : mediaStream.Title;
             mediaStream.Language = string.IsNullOrEmpty(mediaStream.Language) ? (string.IsNullOrEmpty(pathInfo.Language) ? null : pathInfo.Language) : mediaStream.Language;
 
-            mediaStream.Type = _type switch
-            {
-                DlnaProfileType.Audio => MediaStreamType.Audio,
-                DlnaProfileType.Subtitle => MediaStreamType.Subtitle,
-                _ => mediaStream.Type
-            };
-
             return mediaStream;
         }
     }

tests/Jellyfin.Providers.Tests/MediaInfo/AudioResolverTests.cs

@@ -43,6 +43,9 @@ public class AudioResolverTests
                 MediaStreams = new List<MediaStream>
                 {
                     new()
+                    {
+                        Type = MediaStreamType.Audio
+                    }
                 }
             }));
 

tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs

@@ -359,7 +359,10 @@ public class MediaInfoResolverTests
             var mediaStreams = new List<MediaStream>();
             for (int i = 0; i < streamCount; i++)
             {
-                mediaStreams.Add(new());
+                mediaStreams.Add(new()
+                {
+                    Type = MediaStreamType.Subtitle
+                });
             }
 
             return mediaStreams;

tests/Jellyfin.Providers.Tests/MediaInfo/SubtitleResolverTests.cs

@@ -43,6 +43,9 @@ public class SubtitleResolverTests
                 MediaStreams = new List<MediaStream>
                 {
                     new()
+                    {
+                        Type = MediaStreamType.Subtitle
+                    }
                 }
             }));