Merge branch 'master' into feature/season-provider-id-from-path

7 files changed, 17 insertions, 43 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index ac5c12304e..a58c01c960 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -287,5 +287,5 @@ public class ServerConfiguration : BaseApplicationConfiguration
     /// <summary>
     /// Gets or sets a value indicating whether old authorization methods are allowed.
     /// </summary>
-    public bool EnableLegacyAuthorization { get; set; }
+    public bool EnableLegacyAuthorization { get; set; } = true;
 }
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 75b8c137f7..c9697c685c 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -1555,7 +1555,7 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
-                if (!subtitleStream.IsExternal && !transcoderSupport.CanExtractSubtitles(subtitleStream.Codec))
+                if (!subtitleStream.IsExternal && playMethod == PlayMethod.Transcode && !transcoderSupport.CanExtractSubtitles(subtitleStream.Codec))
                 {
                     continue;
                 }
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 8f223c12a5..e96bba0464 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -790,6 +790,12 @@ namespace MediaBrowser.Model.Dto
         public float? NormalizationGain { get; set; }
 
         /// <summary>
+        /// Gets or sets the gain required for audio normalization. This field is inherited from music album normalization gain.
+        /// </summary>
+        /// <value>The gain required for audio normalization.</value>
+        public float? AlbumNormalizationGain { get; set; }
+
+        /// <summary>
         /// Gets or sets the current program.
         /// </summary>
         /// <value>The current program.</value>
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index c443af32cf..4491fb5ace 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -2,11 +2,9 @@
 #pragma warning disable CS1591
 
 using System;
-using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using System.Linq;
 using System.Text;
 using System.Text.Json.Serialization;
 using Jellyfin.Data.Enums;
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 79f8675cbf..c0d1bc86e7 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -132,6 +132,7 @@ namespace MediaBrowser.Model.Net
 
             // Type image
             new("image/jpeg", ".jpg"),
+            new("image/jpg", ".jpg"),
             new("image/tiff", ".tiff"),
             new("image/x-png", ".png"),
             new("image/x-icon", ".ico"),
diff --git a/MediaBrowser.Model/Providers/SubtitleOptions.cs b/MediaBrowser.Model/Providers/SubtitleOptions.cs
deleted file mode 100644
index 6ea1e14862..0000000000
--- a/MediaBrowser.Model/Providers/SubtitleOptions.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-
-namespace MediaBrowser.Model.Providers
-{
-    public class SubtitleOptions
-    {
-        public SubtitleOptions()
-        {
-            DownloadLanguages = Array.Empty<string>();
-
-            SkipIfAudioTrackMatches = true;
-            RequirePerfectMatch = true;
-        }
-
-        public bool SkipIfEmbeddedSubtitlesPresent { get; set; }
-
-        public bool SkipIfAudioTrackMatches { get; set; }
-
-        public string[] DownloadLanguages { get; set; }
-
-        public bool DownloadMovieSubtitles { get; set; }
-
-        public bool DownloadEpisodeSubtitles { get; set; }
-
-        public string OpenSubtitlesUsername { get; set; }
-
-        public string OpenSubtitlesPasswordHash { get; set; }
-
-        public bool IsOpenSubtitleVipAccount { get; set; }
-
-        public bool RequirePerfectMatch { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/System/FolderStorageInfo.cs b/MediaBrowser.Model/System/FolderStorageInfo.cs
index 7b10e4ea58..ebca39228b 100644
--- a/MediaBrowser.Model/System/FolderStorageInfo.cs
+++ b/MediaBrowser.Model/System/FolderStorageInfo.cs
@@ -11,17 +11,22 @@ public record FolderStorageInfo
     public required string Path { get; init; }
 
     /// <summary>
-    /// Gets the free space of the underlying storage device of the <see cref="Path"/>.
+    /// Gets the fully resolved path of the folder in question (interpolating any symlinks if present).
+    /// </summary>
+    public required string ResolvedPath { get; init; }
+
+    /// <summary>
+    /// Gets the free space of the underlying storage device of the <see cref="ResolvedPath"/>.
     /// </summary>
     public long FreeSpace { get; init; }
 
     /// <summary>
-    /// Gets the used space of the underlying storage device of the <see cref="Path"/>.
+    /// Gets the used space of the underlying storage device of the <see cref="ResolvedPath"/>.
     /// </summary>
     public long UsedSpace { get; init; }
 
     /// <summary>
-    /// Gets the kind of storage device of the <see cref="Path"/>.
+    /// Gets the kind of storage device of the <see cref="ResolvedPath"/>.
     /// </summary>
     public string? StorageType { get; init; }