Merge remote-tracking branch 'upstream/master' into fixes

2 files changed, 26 insertions, 24 deletions

diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index 0dadc283ee..988557f42c 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Controller.Dto
 {
@@ -12,20 +11,6 @@ namespace MediaBrowser.Controller.Dto
     public interface IDtoService
     {
         /// <summary>
-        /// Gets the dto id.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>System.String.</returns>
-        string GetDtoId(BaseItem item);
-
-        /// <summary>
-        /// Attaches the primary image aspect ratio.
-        /// </summary>
-        /// <param name="dto">The dto.</param>
-        /// <param name="item">The item.</param>
-        void AttachPrimaryImageAspectRatio(IItemDto dto, BaseItem item);
-
-        /// <summary>
         /// Gets the primary image aspect ratio.
         /// </summary>
         /// <param name="item">The item.</param>
@@ -36,15 +21,6 @@ namespace MediaBrowser.Controller.Dto
         /// Gets the base item dto.
         /// </summary>
         /// <param name="item">The item.</param>
-        /// <param name="fields">The fields.</param>
-        /// <param name="user">The user.</param>
-        /// <param name="owner">The owner.</param>
-        BaseItemDto GetBaseItemDto(BaseItem item, ItemFields[] fields, User user = null, BaseItem owner = null);
-
-        /// <summary>
-        /// Gets the base item dto.
-        /// </summary>
-        /// <param name="item">The item.</param>
         /// <param name="options">The options.</param>
         /// <param name="user">The user.</param>
         /// <param name="owner">The owner.</param>
diff --git a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
index c2932cc4c4..4c2209b67c 100644
--- a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
@@ -34,6 +34,16 @@ namespace MediaBrowser.Controller.Extensions
         public const string PlaylistsAllowDuplicatesKey = "playlists:allowDuplicates";
 
         /// <summary>
+        /// The key for a setting that indicates whether kestrel should bind to a unix socket.
+        /// </summary>
+        public const string BindToUnixSocketKey = "kestrel:socket";
+
+        /// <summary>
+        /// The key for the unix socket path.
+        /// </summary>
+        public const string UnixSocketPathKey = "kestrel:socketPath";
+
+        /// <summary>
         /// Gets a value indicating whether the application should host static web content from the <see cref="IConfiguration"/>.
         /// </summary>
         /// <param name="configuration">The configuration to retrieve the value from.</param>
@@ -65,5 +75,21 @@ namespace MediaBrowser.Controller.Extensions
         /// <returns>True if playlists should allow duplicates, otherwise false.</returns>
         public static bool DoPlaylistsAllowDuplicates(this IConfiguration configuration)
             => configuration.GetValue<bool>(PlaylistsAllowDuplicatesKey);
+
+        /// <summary>
+        /// Gets a value indicating whether kestrel should bind to a unix socket from the <see cref="IConfiguration" />.
+        /// </summary>
+        /// <param name="configuration">The configuration to read the setting from.</param>
+        /// <returns><c>true</c> if kestrel should bind to a unix socket, otherwise <c>false</c>.</returns>
+        public static bool UseUnixSocket(this IConfiguration configuration)
+            => configuration.GetValue<bool>(BindToUnixSocketKey);
+
+        /// <summary>
+        /// Gets the path for the unix socket from the <see cref="IConfiguration" />.
+        /// </summary>
+        /// <param name="configuration">The configuration to read the setting from.</param>
+        /// <returns>The unix socket path.</returns>
+        public static string GetUnixSocketPath(this IConfiguration configuration)
+            => configuration[UnixSocketPathKey];
     }
 }