Bump version to 10.9.11

Merge pull request #12575 from dmitrylyzo/fix-subtitleextract
Fix subtitle and attachment extraction when input path contains quotes
2026-01-16 16:18:06 +00:00 · 2024-09-07 18:10:49 -04:00 · 2024-09-07 22:07:05 +02:00 · 2024-09-04 00:53:57 +03:00 · 2024-09-04 00:09:09 +03:00 · 2024-09-03 09:20:27 +02:00
26 changed files with 184 additions and 57 deletions
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -36,7 +36,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Naming</PackageId>
-    <VersionPrefix>10.9.9</VersionPrefix>
+    <VersionPrefix>10.9.11</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -91,7 +91,7 @@ namespace Emby.Server.Implementations.TV
            }

            string? presentationUniqueKey = null;
-            int? limit = request.Limit;
+            int? limit = null;
            if (!request.SeriesId.IsNullOrEmpty())
            {
                if (_libraryManager.GetItemById(request.SeriesId.Value) is Series series)
--- a/Jellyfin.Api/Controllers/ImageController.cs
+++ b/Jellyfin.Api/Controllers/ImageController.cs
@@ -2089,6 +2089,8 @@ public class ImageController : BaseJellyfinApiController
        Response.Headers.Append(HeaderNames.Age, Convert.ToInt64((DateTime.UtcNow - dateImageModified).TotalSeconds).ToString(CultureInfo.InvariantCulture));
        Response.Headers.Append(HeaderNames.Vary, HeaderNames.Accept);

+        Response.Headers.ContentDisposition = "attachment";
+
        if (disableCaching)
        {
            Response.Headers.Append(HeaderNames.CacheControl, "no-cache, no-store, must-revalidate");
--- a/Jellyfin.Api/Controllers/PluginsController.cs
+++ b/Jellyfin.Api/Controllers/PluginsController.cs
@@ -233,6 +233,8 @@ public class PluginsController : BaseJellyfinApiController
            return NotFound();
        }

+        Response.Headers.ContentDisposition = "attachment";
+
        imagePath = Path.Combine(plugin.Path, plugin.Manifest.ImagePath);
        return PhysicalFile(imagePath, MimeTypes.GetMimeType(imagePath));
    }
--- a/Jellyfin.Api/Controllers/TrickplayController.cs
+++ b/Jellyfin.Api/Controllers/TrickplayController.cs
@@ -95,6 +95,7 @@ public class TrickplayController : BaseJellyfinApiController
        var path = _trickplayManager.GetTrickplayTilePath(item, width, index);
        if (System.IO.File.Exists(path))
        {
+            Response.Headers.ContentDisposition = "attachment";
            return PhysicalFile(path, MediaTypeNames.Image.Jpeg);
        }

--- a/Jellyfin.Data/Jellyfin.Data.csproj
+++ b/Jellyfin.Data/Jellyfin.Data.csproj
@@ -18,7 +18,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Data</PackageId>
-    <VersionPrefix>10.9.9</VersionPrefix>
+    <VersionPrefix>10.9.11</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Common</PackageId>
-    <VersionPrefix>10.9.9</VersionPrefix>
+    <VersionPrefix>10.9.11</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1180,28 +1180,29 @@ namespace MediaBrowser.Controller.Entities
            return info;
        }

-        private string GetMediaSourceName(BaseItem item)
+        internal string GetMediaSourceName(BaseItem item)
        {
            var terms = new List<string>();

            var path = item.Path;
            if (item.IsFileProtocol && !string.IsNullOrEmpty(path))
            {
+                var displayName = System.IO.Path.GetFileNameWithoutExtension(path);
                if (HasLocalAlternateVersions)
                {
-                    var displayName = System.IO.Path.GetFileNameWithoutExtension(path)
-                        .Replace(System.IO.Path.GetFileName(ContainingFolderPath), string.Empty, StringComparison.OrdinalIgnoreCase)
-                        .TrimStart(new char[] { ' ', '-' });
-
-                    if (!string.IsNullOrEmpty(displayName))
+                    var containingFolderName = System.IO.Path.GetFileName(ContainingFolderPath);
+                    if (displayName.Length > containingFolderName.Length && displayName.StartsWith(containingFolderName, StringComparison.OrdinalIgnoreCase))
                    {
-                        terms.Add(displayName);
+                        var name = displayName.AsSpan(containingFolderName.Length).TrimStart([' ', '-']);
+                        if (!name.IsWhiteSpace())
+                        {
+                            terms.Add(name.ToString());
+                        }
                    }
                }

                if (terms.Count == 0)
                {
-                    var displayName = System.IO.Path.GetFileNameWithoutExtension(path);
                    terms.Add(displayName);
                }
            }
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -180,10 +180,7 @@ namespace MediaBrowser.Controller.Entities.TV
        }

        public string FindSeriesPresentationUniqueKey()
-        {
-            var series = Series;
-            return series is null ? null : series.PresentationUniqueKey;
-        }
+            => Series?.PresentationUniqueKey;

        public string FindSeasonName()
        {
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -430,8 +430,6 @@ namespace MediaBrowser.Controller.Entities
            InternalItemsQuery query,
            ILibraryManager libraryManager)
        {
-            var user = query.User;
-
            // This must be the last filter
            if (!query.AdjacentTo.IsNullOrEmpty())
            {
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Controller</PackageId>
-    <VersionPrefix>10.9.9</VersionPrefix>
+    <VersionPrefix>10.9.11</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1313,7 +1313,7 @@ namespace MediaBrowser.Controller.MediaEncoding

            // Apply aac_adtstoasc bitstream filter when media source is in mpegts.
            if (string.Equals(segmentFormat, "mp4", StringComparison.OrdinalIgnoreCase)
-                && (string.Equals(mediaSourceContainer, "mpegts", StringComparison.OrdinalIgnoreCase)
+                && (string.Equals(mediaSourceContainer, "ts", StringComparison.OrdinalIgnoreCase)
                    || string.Equals(mediaSourceContainer, "aac", StringComparison.OrdinalIgnoreCase)
                    || string.Equals(mediaSourceContainer, "hls", StringComparison.OrdinalIgnoreCase)))
            {
@@ -2005,7 +2005,26 @@ namespace MediaBrowser.Controller.MediaEncoding
            }

            var profile = state.GetRequestedProfiles(targetVideoCodec).FirstOrDefault() ?? string.Empty;
-            profile = WhiteSpaceRegex().Replace(profile, string.Empty);
+            profile = WhiteSpaceRegex().Replace(profile, string.Empty).ToLowerInvariant();
+
+            var videoProfiles = Array.Empty<string>();
+            if (string.Equals("h264", targetVideoCodec, StringComparison.OrdinalIgnoreCase))
+            {
+                videoProfiles = _videoProfilesH264;
+            }
+            else if (string.Equals("hevc", targetVideoCodec, StringComparison.OrdinalIgnoreCase))
+            {
+                videoProfiles = _videoProfilesH265;
+            }
+            else if (string.Equals("av1", targetVideoCodec, StringComparison.OrdinalIgnoreCase))
+            {
+                videoProfiles = _videoProfilesAv1;
+            }
+
+            if (!videoProfiles.Contains(profile, StringComparison.OrdinalIgnoreCase))
+            {
+                profile = string.Empty;
+            }

            // We only transcode to HEVC 8-bit for now, force Main Profile.
            if (profile.Contains("main10", StringComparison.OrdinalIgnoreCase)
--- a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
+++ b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
@@ -89,7 +89,8 @@ namespace MediaBrowser.MediaEncoding.Attachments
            string outputPath,
            CancellationToken cancellationToken)
        {
-            var shouldExtractOneByOne = mediaSource.MediaAttachments.Any(a => a.FileName.Contains('/', StringComparison.OrdinalIgnoreCase) || a.FileName.Contains('\\', StringComparison.OrdinalIgnoreCase));
+            var shouldExtractOneByOne = mediaSource.MediaAttachments.Any(a => !string.IsNullOrEmpty(a.FileName)
+                                                                              && (a.FileName.Contains('/', StringComparison.OrdinalIgnoreCase) || a.FileName.Contains('\\', StringComparison.OrdinalIgnoreCase)));
            if (shouldExtractOneByOne)
            {
                var attachmentIndexes = mediaSource.MediaAttachments.Select(a => a.Index);
@@ -283,7 +284,7 @@ namespace MediaBrowser.MediaEncoding.Attachments

                if (extractableAttachmentIds.Count > 0)
                {
-                    await CacheAllAttachmentsInternal(mediaPath, inputFile, mediaSource, extractableAttachmentIds, cancellationToken).ConfigureAwait(false);
+                    await CacheAllAttachmentsInternal(mediaPath, _mediaEncoder.GetInputArgument(inputFile, mediaSource), mediaSource, extractableAttachmentIds, cancellationToken).ConfigureAwait(false);
                }
            }
            catch (Exception ex)
@@ -322,7 +323,7 @@ namespace MediaBrowser.MediaEncoding.Attachments

            processArgs += string.Format(
                CultureInfo.InvariantCulture,
-                " -i \"{0}\" -t 0 -f null null",
+                " -i {0} -t 0 -f null null",
                inputFile);

            int exitCode;
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -168,6 +168,8 @@ namespace MediaBrowser.MediaEncoding.Encoder

        private readonly string _encoderPath;

+        private readonly Version _minFFmpegMultiThreadedCli = new Version(7, 0);
+
        public EncoderValidator(ILogger logger, string encoderPath)
        {
            _logger = logger;
@@ -477,8 +479,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
            return false;
        }

-        private readonly Version _minFFmpegMultiThreadedCli = new Version(7, 0);
-
        public bool CheckSupportedRuntimeKey(string keyDesc, Version? ffmpegVersion)
        {
            if (string.IsNullOrEmpty(keyDesc))
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -625,7 +625,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
            {
                try
                {
-                    return await ExtractImageInternal(inputArgument, container, videoStream, imageStreamIndex, threedFormat, offset, true, targetFormat, cancellationToken).ConfigureAwait(false);
+                    return await ExtractImageInternal(inputArgument, container, videoStream, imageStreamIndex, threedFormat, offset, true, targetFormat, false, cancellationToken).ConfigureAwait(false);
                }
                catch (ArgumentException)
                {
@@ -637,7 +637,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                }
            }

-            return await ExtractImageInternal(inputArgument, container, videoStream, imageStreamIndex, threedFormat, offset, false, targetFormat, cancellationToken).ConfigureAwait(false);
+            return await ExtractImageInternal(inputArgument, container, videoStream, imageStreamIndex, threedFormat, offset, false, targetFormat, isAudio, cancellationToken).ConfigureAwait(false);
        }

        private string GetImageResolutionParameter()
@@ -663,7 +663,17 @@ namespace MediaBrowser.MediaEncoding.Encoder
            return imageResolutionParameter;
        }

-        private async Task<string> ExtractImageInternal(string inputPath, string container, MediaStream videoStream, int? imageStreamIndex, Video3DFormat? threedFormat, TimeSpan? offset, bool useIFrame, ImageFormat? targetFormat, CancellationToken cancellationToken)
+        private async Task<string> ExtractImageInternal(
+            string inputPath,
+            string container,
+            MediaStream videoStream,
+            int? imageStreamIndex,
+            Video3DFormat? threedFormat,
+            TimeSpan? offset,
+            bool useIFrame,
+            ImageFormat? targetFormat,
+            bool isAudio,
+            CancellationToken cancellationToken)
        {
            ArgumentException.ThrowIfNullOrEmpty(inputPath);

@@ -722,7 +732,7 @@ namespace MediaBrowser.MediaEncoding.Encoder

            var vf = string.Join(',', filters);
            var mapArg = imageStreamIndex.HasValue ? (" -map 0:" + imageStreamIndex.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty;
-            var args = string.Format(CultureInfo.InvariantCulture, "-i {0}{3} -threads {4} -v quiet -vframes 1 -vf {2}{5} -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, _threads, GetImageResolutionParameter());
+            var args = string.Format(CultureInfo.InvariantCulture, "-i {0}{3} -threads {4} -v quiet -vframes 1 -vf {2}{5} -f image2 \"{1}\"", inputPath, tempExtractPath, vf, mapArg, _threads, isAudio ? string.Empty : GetImageResolutionParameter());

            if (offset.HasValue)
            {
@@ -1197,7 +1207,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
            }

            // Generate concat configuration entries for each file and write to file
-            using StreamWriter sw = new StreamWriter(concatFilePath);
+            Directory.CreateDirectory(Path.GetDirectoryName(concatFilePath));
+            using StreamWriter sw = new FormattingStreamWriter(concatFilePath, CultureInfo.InvariantCulture);
            foreach (var path in files)
            {
                var mediaInfoResult = GetMediaInfo(
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -501,11 +501,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
            List<MediaStream> subtitleStreams,
            CancellationToken cancellationToken)
        {
-            var inputPath = mediaSource.Path;
+            var inputPath = _mediaEncoder.GetInputArgument(mediaSource.Path, mediaSource);
            var outputPaths = new List<string>();
            var args = string.Format(
                CultureInfo.InvariantCulture,
-                "-i \"{0}\" -copyts",
+                "-i {0} -copyts",
                inputPath);

            foreach (var subtitleStream in subtitleStreams)
@@ -676,7 +676,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles

            var processArgs = string.Format(
                CultureInfo.InvariantCulture,
-                "-i \"{0}\" -copyts -map 0:{1} -an -vn -c:s {2} \"{3}\"",
+                "-i {0} -copyts -map 0:{1} -an -vn -c:s {2} \"{3}\"",
                inputPath,
                subtitleStreamIndex,
                outputCodec,
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -858,7 +858,7 @@ namespace MediaBrowser.Model.Dlna
            {
                audioStream = directAudioStream;
                playlistItem.AudioStreamIndex = audioStream.Index;
-                playlistItem.AudioCodecs = new[] { audioStream.Codec };
+                playlistItem.AudioCodecs = audioCodecs = new[] { audioStream.Codec };

                // Copy matching audio codec options
                playlistItem.AudioSampleRate = audioStream.SampleRate;
@@ -897,18 +897,18 @@ namespace MediaBrowser.Model.Dlna

            var appliedVideoConditions = options.Profile.CodecProfiles
                .Where(i => i.Type == CodecType.Video &&
-                    i.ContainsAnyCodec(videoStream?.Codec, container) &&
-                    i.ApplyConditions.All(applyCondition => ConditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoRangeType, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc)));
-            var isFirstAppliedCodecProfile = true;
+                    i.ContainsAnyCodec(videoCodecs, container) &&
+                    i.ApplyConditions.All(applyCondition => ConditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoRangeType, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isInterlaced, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc)))
+                // Reverse codec profiles for backward compatibility - first codec profile has higher priority
+                .Reverse();
+
            foreach (var i in appliedVideoConditions)
            {
-                var transcodingVideoCodecs = ContainerProfile.SplitValue(videoCodec);
-                foreach (var transcodingVideoCodec in transcodingVideoCodecs)
+                foreach (var transcodingVideoCodec in videoCodecs)
                {
                    if (i.ContainsAnyCodec(transcodingVideoCodec, container))
                    {
-                        ApplyTranscodingConditions(playlistItem, i.Conditions, transcodingVideoCodec, true, isFirstAppliedCodecProfile);
-                        isFirstAppliedCodecProfile = false;
+                        ApplyTranscodingConditions(playlistItem, i.Conditions, transcodingVideoCodec, true, true);
                        continue;
                    }
                }
@@ -929,18 +929,18 @@ namespace MediaBrowser.Model.Dlna

            var appliedAudioConditions = options.Profile.CodecProfiles
                .Where(i => i.Type == CodecType.VideoAudio &&
-                    i.ContainsAnyCodec(audioStream?.Codec, container) &&
-                    i.ApplyConditions.All(applyCondition => ConditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth, audioProfile, isSecondaryAudio)));
-            isFirstAppliedCodecProfile = true;
+                    i.ContainsAnyCodec(audioCodecs, container) &&
+                    i.ApplyConditions.All(applyCondition => ConditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, inputAudioBitrate, inputAudioSampleRate, inputAudioBitDepth, audioProfile, isSecondaryAudio)))
+                // Reverse codec profiles for backward compatibility - first codec profile has higher priority
+                .Reverse();
+
            foreach (var codecProfile in appliedAudioConditions)
            {
-                var transcodingAudioCodecs = ContainerProfile.SplitValue(audioCodec);
-                foreach (var transcodingAudioCodec in transcodingAudioCodecs)
+                foreach (var transcodingAudioCodec in audioCodecs)
                {
                    if (codecProfile.ContainsAnyCodec(transcodingAudioCodec, container))
                    {
-                        ApplyTranscodingConditions(playlistItem, codecProfile.Conditions, transcodingAudioCodec, true, isFirstAppliedCodecProfile);
-                        isFirstAppliedCodecProfile = false;
+                        ApplyTranscodingConditions(playlistItem, codecProfile.Conditions, transcodingAudioCodec, true, true);
                        break;
                    }
                }
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Model</PackageId>
-    <VersionPrefix>10.9.9</VersionPrefix>
+    <VersionPrefix>10.9.11</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Providers/TV/SeriesMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeriesMetadataService.cs
@@ -211,8 +211,12 @@ namespace MediaBrowser.Providers.TV
                }
                else if (existingSeason.IsVirtualItem)
                {
-                    existingSeason.IsVirtualItem = false;
-                    await existingSeason.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
+                    var episodeCount = seriesChildren.OfType<Episode>().Count(e => e.ParentIndexNumber == seasonNumber && !e.IsMissingEpisode);
+                    if (episodeCount > 0)
+                    {
+                        existingSeason.IsVirtualItem = false;
+                        await existingSeason.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
+                    }
                }
            }
        }
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;

-[assembly: AssemblyVersion("10.9.9")]
-[assembly: AssemblyFileVersion("10.9.9")]
+[assembly: AssemblyVersion("10.9.11")]
+[assembly: AssemblyFileVersion("10.9.11")]
--- a/src/Jellyfin.Drawing/ImageProcessor.cs
+++ b/src/Jellyfin.Drawing/ImageProcessor.cs
@@ -102,7 +102,8 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
            "astc",
            "ktx",
            "pkm",
-            "wbmp"
+            "wbmp",
+            "avif"
        };

    /// <inheritdoc />
--- a/src/Jellyfin.Extensions/FormattingStreamWriter.cs
+++ b/src/Jellyfin.Extensions/FormattingStreamWriter.cs
@@ -0,0 +1,38 @@
+using System;
+using System.IO;
+
+namespace Jellyfin.Extensions;
+
+/// <summary>
+/// A custom StreamWriter which supports setting a IFormatProvider.
+/// </summary>
+public class FormattingStreamWriter : StreamWriter
+{
+    private readonly IFormatProvider _formatProvider;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FormattingStreamWriter"/> class.
+    /// </summary>
+    /// <param name="stream">The stream to write to.</param>
+    /// <param name="formatProvider">The format provider to use.</param>
+    public FormattingStreamWriter(Stream stream, IFormatProvider formatProvider)
+        : base(stream)
+    {
+        _formatProvider = formatProvider;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FormattingStreamWriter"/> class.
+    /// </summary>
+    /// <param name="path">The complete file path to write to.</param>
+    /// <param name="formatProvider">The format provider to use.</param>
+    public FormattingStreamWriter(string path, IFormatProvider formatProvider)
+        : base(path)
+    {
+        _formatProvider = formatProvider;
+    }
+
+    /// <inheritdoc />
+    public override IFormatProvider FormatProvider
+        => _formatProvider;
+}
--- a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
+++ b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
@@ -15,7 +15,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Extensions</PackageId>
-    <VersionPrefix>10.9.9</VersionPrefix>
+    <VersionPrefix>10.9.11</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/src/Jellyfin.LiveTv/Listings/XmlTvListingsProvider.cs
+++ b/src/Jellyfin.LiveTv/Listings/XmlTvListingsProvider.cs
@@ -167,7 +167,7 @@ namespace Jellyfin.LiveTv.Listings
                Overview = program.Description,
                ProductionYear = program.CopyrightDate?.Year,
                SeasonNumber = program.Episode.Series,
-                IsSeries = program.Episode.Series is not null,
+                IsSeries = program.Episode.Episode is not null,
                IsRepeat = program.IsPreviouslyShown && !program.IsNew,
                IsPremiere = program.Premiere is not null,
                IsKids = programCategories.Any(c => info.KidsCategories.Contains(c, StringComparison.OrdinalIgnoreCase)),
--- a/tests/Jellyfin.Controller.Tests/Entities/BaseItemTests.cs
+++ b/tests/Jellyfin.Controller.Tests/Entities/BaseItemTests.cs
@@ -1,4 +1,7 @@
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.MediaInfo;
+using Moq;
 using Xunit;

 namespace Jellyfin.Controller.Tests.Entities;
@@ -14,4 +17,30 @@ public class BaseItemTests
    [InlineData("1test 2", "0000000001test 0000000002")]
    public void BaseItem_ModifySortChunks_Valid(string input, string expected)
        => Assert.Equal(expected, BaseItem.ModifySortChunks(input));
+
+    [Theory]
+    [InlineData("/Movies/Ted/Ted.mp4", "/Movies/Ted/Ted - Unrated Edition.mp4", "Ted", "Unrated Edition")]
+    [InlineData("/Movies/Deadpool 2 (2018)/Deadpool 2 (2018).mkv", "/Movies/Deadpool 2 (2018)/Deadpool 2 (2018) - Super Duper Cut.mkv", "Deadpool 2 (2018)", "Super Duper Cut")]
+    public void GetMediaSourceName_Valid(string primaryPath, string altPath, string name, string altName)
+    {
+        var mediaSourceManager = new Mock<IMediaSourceManager>();
+        mediaSourceManager.Setup(x => x.GetPathProtocol(It.IsAny<string>()))
+                .Returns((string x) => MediaProtocol.File);
+        BaseItem.MediaSourceManager = mediaSourceManager.Object;
+
+        var video = new Video()
+        {
+            Path = primaryPath
+        };
+
+        var videoAlt = new Video()
+        {
+            Path = altPath,
+        };
+
+        video.LocalAlternateVersions = [videoAlt.Path];
+
+        Assert.Equal(name, video.GetMediaSourceName(video));
+        Assert.Equal(altName, video.GetMediaSourceName(videoAlt));
+    }
 }
--- a/tests/Jellyfin.Extensions.Tests/FormattingStreamWriterTests.cs
+++ b/tests/Jellyfin.Extensions.Tests/FormattingStreamWriterTests.cs
@@ -0,0 +1,23 @@
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Threading;
+using Xunit;
+
+namespace Jellyfin.Extensions.Tests;
+
+public static class FormattingStreamWriterTests
+{
+    [Fact]
+    public static void Shuffle_Valid_Correct()
+    {
+        Thread.CurrentThread.CurrentCulture = new CultureInfo("de-DE", false);
+        using (var ms = new MemoryStream())
+        using (var txt = new FormattingStreamWriter(ms, CultureInfo.InvariantCulture))
+        {
+            txt.Write("{0}", 3.14159);
+            txt.Close();
+            Assert.Equal("3.14159", Encoding.UTF8.GetString(ms.ToArray()));
+        }
+    }
+}
Author	SHA1	Message	Date
Jellyfin Release Bot	7bbdfc0d49	Bump version to 10.9.11	2024-09-07 18:10:49 -04:00
Bond-009	3c3ebe8344	Merge pull request #12575 from dmitrylyzo/fix-subtitleextract Fix subtitle and attachment extraction when input path contains quotes	2024-09-07 22:07:05 +02:00
Dmitry Lyzo	8c4d23435e	Fix attachment extraction when input path contains quotes	2024-09-04 00:53:57 +03:00
Dmitry Lyzo	9e4befa52e	Fix subtitle extraction when input path contains quotes	2024-09-04 00:09:09 +03:00
Bond-009	b3efae71c0	Merge pull request #12562 from nyanmisaka/fix-profiles Use filtered codecs to build appliedConditions	2024-09-03 09:20:27 +02:00
Bond-009	70f4f2e8c2	Merge pull request #12558 from Bond-009/altsourcename Fix alt version name generation	2024-09-03 09:20:15 +02:00
Bond-009	cd2f2ca178	Merge pull request #12550 from Bond-009/formattingstreamwriter Create and use FormattingStreamWriter	2024-09-03 09:19:32 +02:00
nyanmisaka	8095d39954	Use filtered codecs to build appliedConditions Signed-off-by: nyanmisaka <nst799610810@gmail.com>	2024-09-01 21:44:23 +08:00
Bond_009	e1ac30ba17	Fix alt version name generation Instead of replacing all occurrences of the containing folder name, just check the start of the string. This matches what happens in VideoListResolver.IsEligibleForMultiVersion Fixes #12555	2024-08-31 14:03:53 +02:00
Bond_009	3b94cfa837	Create and use FormattingStreamWriter Prevents bugs causes by system cultures with different formatting	2024-08-30 17:19:02 +02:00
Niels van Velzen	2fe13f54ea	Merge pull request #12531 from gnattu/dont-apply-chapter-image-settings-to-music Don't apply chapter image settings to music	2024-08-29 09:43:43 +02:00
gnattu	eb6a6d319b	Don't apply chapter image settings to music Music Album covers are usually not 16:9 and should not use the chapter image resolutions in any case. Signed-off-by: gnattu <gnattuoc@me.com>	2024-08-29 03:11:34 +08:00
Nyanmisaka	b74c9cae1b	Fix CodecProfiles and video encoder profiles (#12521 ) Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>	2024-08-28 12:42:44 -06:00
Jellyfin Release Bot	24d482b36b	Bump version to 10.9.10	2024-08-25 02:34:36 -04:00
Dmitry Lyzo	fff4477a93	Apply all codec conditions (#12499 )	2024-08-23 07:54:12 -06:00
Fredrik Eriksson	9810d22d96	Revert "NextUp query respects Limit (#11956 )" (#12414 ) fix from PR #11956 leads to unexpected behaviour as Fixes: #12367	2024-08-23 07:54:02 -06:00
ikelos	5027e3cd53	Include AVIF extension for support images (#12415 )	2024-08-22 08:04:50 -06:00
Niels van Velzen	9645955629	Set Content-Disposition header to attachment for image endpoints (#12490 )	2024-08-22 08:01:10 -06:00
Niels van Velzen	078ee1f2de	Merge pull request #12493 from jellyfin/fix-ts-bsf Fix bitstream filter not applied to videos in TS container	2024-08-22 15:50:56 +02:00
Nyanmisaka	236c7649dd	Fix bitstream filter not applied to videos in TS container Signed-off-by: nyanmisaka <nst799610810@gmail.com>	2024-08-21 22:52:08 +08:00
Bond-009	c1e52df0b7	Fix the record series button missing on many programs (port of #12398 ) (#12481 ) Co-authored-by: grumpycat <bryan.pauquette@gmail.com>	2024-08-20 11:13:37 -06:00
Bond-009	be949af59e	Merge pull request #12425 from scampower3/10.9.z-dont-force-virtual Don't force non-virtual when all episodes in season are isMissing=true	2024-08-14 16:10:30 +02:00
Bond-009	122da8f447	Merge pull request #12443 from gnattu/check-attach-path-for-null Check attachment path for null before use	2024-08-14 16:10:11 +02:00
gnattu	486c7fa51e	Check attachment path for null before use This one is particularly nasty because the `Path` is not supposed to be nullable. However, fixing it in the parser and type constructor is beyond the scope of the 10.9 release. For now, just check with `IsNullOrEmpty`. Signed-off-by: gnattu <gnattuoc@me.com>	2024-08-14 04:44:35 +08:00
LJQ	6709c80f0a	Don't force non-virtual when all episodes in season have isMissing flag.	2024-08-11 18:06:09 +08:00
Niels van Velzen	3f3145600c	Merge pull request #12390 from justinkb/fix-sa1201 fix SA1201 issue	2024-08-05 14:19:48 +02:00
Paul Mulders	bc613b8344	fix SA1201 issue	2024-08-05 13:22:24 +02:00