merge branch master into media-attachments

MediaBrowser.Model/Configuration/ServerConfiguration.cs

@@ -172,16 +172,18 @@ namespace MediaBrowser.Model.Configuration
                 if (string.IsNullOrWhiteSpace(value))
                 {
                     // If baseUrl is empty, set an empty prefix string
-                    value = string.Empty;
+                    _baseUrl = string.Empty;
+                    return;
                 }
-                else if (!value.StartsWith("/"))
+
+                if (value[0] != '/')
                 {
                     // If baseUrl was not configured with a leading slash, append one for consistency
                     value = "/" + value;
                 }
 
                 // Normalize the end of the string
-                if (value.EndsWith("/"))
+                if (value[value.Length - 1] == '/')
                 {
                     // If baseUrl was configured with a trailing slash, remove it for consistency
                     value = value.Remove(value.Length - 1);
@@ -231,7 +233,6 @@ namespace MediaBrowser.Model.Configuration
             LocalNetworkSubnets = Array.Empty<string>();
             LocalNetworkAddresses = Array.Empty<string>();
             CodecsUsed = Array.Empty<string>();
-            ImageExtractionTimeoutMs = 0;
             PathSubstitutions = Array.Empty<PathSubstitution>();
             IgnoreVirtualInterfaces = false;
             EnableSimpleArtistDetection = true;

MediaBrowser.Model/Cryptography/ICryptoProvider.cs

@@ -8,10 +8,6 @@ namespace MediaBrowser.Model.Cryptography
 
         IEnumerable<string> GetSupportedHashMethods();
 
-        byte[] ComputeHash(string HashMethod, byte[] bytes);
-
-        byte[] ComputeHashWithDefaultMethod(byte[] bytes);
-
         byte[] ComputeHash(string HashMethod, byte[] bytes, byte[] salt);
 
         byte[] ComputeHashWithDefaultMethod(byte[] bytes, byte[] salt);

MediaBrowser.Model/Globalization/ILocalizationManager.cs

@@ -64,10 +64,10 @@ namespace MediaBrowser.Model.Globalization
         bool HasUnicodeCategory(string value, UnicodeCategory category);
 
         /// <summary>
-        /// Returns the correct <see cref="Cultureinfo" /> for the given language.
+        /// Returns the correct <see cref="CultureInfo" /> for the given language.
         /// </summary>
         /// <param name="language">The language.</param>
-        /// <returns>The correct <see cref="Cultureinfo" /> for the given language.</returns>
+        /// <returns>The correct <see cref="CultureInfo" /> for the given language.</returns>
         CultureDto FindLanguageInfo(string language);
     }
 }

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
@@ -16,6 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0" />
+    <PackageReference Include="System.Globalization" Version="4.3.0" />
     <PackageReference Include="System.Text.Json" Version="4.6.0" />
   </ItemGroup>
 

MediaBrowser.Model/MediaInfo/SubtitleTrackInfo.cs

@@ -1,12 +1,15 @@
+using System;
+using System.Collections.Generic;
+
 namespace MediaBrowser.Model.MediaInfo
 {
     public class SubtitleTrackInfo
     {
-        public SubtitleTrackEvent[] TrackEvents { get; set; }
+        public IReadOnlyList<SubtitleTrackEvent> TrackEvents { get; set; }
 
         public SubtitleTrackInfo()
         {
-            TrackEvents = new SubtitleTrackEvent[] { };
+            TrackEvents = Array.Empty<SubtitleTrackEvent>();
         }
     }
 }

MediaBrowser.Model/Net/SocketReceiveResult.cs

@@ -18,7 +18,7 @@ namespace MediaBrowser.Model.Net
         public int ReceivedBytes { get; set; }
 
         /// <summary>
-        /// The <see cref="IpEndPointInfo"/> the data was received from.
+        /// The <see cref="IPEndPoint"/> the data was received from.
         /// </summary>
         public IPEndPoint RemoteEndPoint { get; set; }
         public IPAddress LocalIPAddress { get; set; }

MediaBrowser.Model/Querying/QueryResult.cs

@@ -17,6 +17,12 @@ namespace MediaBrowser.Model.Querying
         /// <value>The total record count.</value>
         public int TotalRecordCount { get; set; }
 
+        /// <summary>
+        /// The index of the first record in Items.
+        /// </summary>
+        /// <value>First record index.</value>
+        public int StartIndex { get; set; }
+
         public QueryResult()
         {
             Items = Array.Empty<T>();

MediaBrowser.Model/System/SystemInfo.cs

@@ -110,9 +110,9 @@ namespace MediaBrowser.Model.System
         public string InternalMetadataPath { get; set; }
 
         /// <summary>
-        /// Gets or sets the transcoding temporary path.
+        /// Gets or sets the transcode path.
         /// </summary>
-        /// <value>The transcoding temporary path.</value>
+        /// <value>The transcode path.</value>
         public string TranscodingTempPath { get; set; }
 
         /// <summary>

MediaBrowser.Model/Updates/PackageInfo.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Updates
 {
@@ -150,7 +151,7 @@ namespace MediaBrowser.Model.Updates
         /// Gets or sets the versions.
         /// </summary>
         /// <value>The versions.</value>
-        public PackageVersionInfo[] versions { get; set; }
+        public IReadOnlyList<PackageVersionInfo> versions { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [enable in application store].