Merge branch 'master' into segment-deletion

1 files changed, 161 insertions, 164 deletions

diff --git a/Jellyfin.Api/Controllers/GenresController.cs b/Jellyfin.Api/Controllers/GenresController.cs
index 611643bd8..da60f2c60 100644
--- a/Jellyfin.Api/Controllers/GenresController.cs
+++ b/Jellyfin.Api/Controllers/GenresController.cs
@@ -1,7 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
@@ -18,194 +17,192 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Genre = MediaBrowser.Controller.Entities.Genre;
 
-namespace Jellyfin.Api.Controllers
+namespace Jellyfin.Api.Controllers;
+
+/// <summary>
+/// The genres controller.
+/// </summary>
+[Authorize]
+public class GenresController : BaseJellyfinApiController
 {
+    private readonly IUserManager _userManager;
+    private readonly ILibraryManager _libraryManager;
+    private readonly IDtoService _dtoService;
+
     /// <summary>
-    /// The genres controller.
+    /// Initializes a new instance of the <see cref="GenresController"/> class.
     /// </summary>
-    [Authorize(Policy = Policies.DefaultAuthorization)]
-    public class GenresController : BaseJellyfinApiController
+    /// <param name="userManager">Instance of the <see cref="IUserManager"/> interface.</param>
+    /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
+    /// <param name="dtoService">Instance of the <see cref="IDtoService"/> interface.</param>
+    public GenresController(
+        IUserManager userManager,
+        ILibraryManager libraryManager,
+        IDtoService dtoService)
     {
-        private readonly IUserManager _userManager;
-        private readonly ILibraryManager _libraryManager;
-        private readonly IDtoService _dtoService;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenresController"/> class.
-        /// </summary>
-        /// <param name="userManager">Instance of the <see cref="IUserManager"/> interface.</param>
-        /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-        /// <param name="dtoService">Instance of the <see cref="IDtoService"/> interface.</param>
-        public GenresController(
-            IUserManager userManager,
-            ILibraryManager libraryManager,
-            IDtoService dtoService)
-        {
-            _userManager = userManager;
-            _libraryManager = libraryManager;
-            _dtoService = dtoService;
-        }
+        _userManager = userManager;
+        _libraryManager = libraryManager;
+        _dtoService = dtoService;
+    }
 
-        /// <summary>
-        /// Gets all genres from a given item, folder, or the entire library.
-        /// </summary>
-        /// <param name="startIndex">Optional. The record index to start at. All items with a lower index will be dropped from the results.</param>
-        /// <param name="limit">Optional. The maximum number of records to return.</param>
-        /// <param name="searchTerm">The search term.</param>
-        /// <param name="parentId">Specify this to localize the search to a specific item or folder. Omit to use the root.</param>
-        /// <param name="fields">Optional. Specify additional fields of information to return in the output.</param>
-        /// <param name="excludeItemTypes">Optional. If specified, results will be filtered out based on item type. This allows multiple, comma delimited.</param>
-        /// <param name="includeItemTypes">Optional. If specified, results will be filtered in based on item type. This allows multiple, comma delimited.</param>
-        /// <param name="isFavorite">Optional filter by items that are marked as favorite, or not.</param>
-        /// <param name="imageTypeLimit">Optional, the max number of images to return, per image type.</param>
-        /// <param name="enableImageTypes">Optional. The image types to include in the output.</param>
-        /// <param name="userId">User id.</param>
-        /// <param name="nameStartsWithOrGreater">Optional filter by items whose name is sorted equally or greater than a given input string.</param>
-        /// <param name="nameStartsWith">Optional filter by items whose name is sorted equally than a given input string.</param>
-        /// <param name="nameLessThan">Optional filter by items whose name is equally or lesser than a given input string.</param>
-        /// <param name="sortBy">Optional. Specify one or more sort orders, comma delimited.</param>
-        /// <param name="sortOrder">Sort Order - Ascending,Descending.</param>
-        /// <param name="enableImages">Optional, include image information in output.</param>
-        /// <param name="enableTotalRecordCount">Optional. Include total record count.</param>
-        /// <response code="200">Genres returned.</response>
-        /// <returns>An <see cref="OkResult"/> containing the queryresult of genres.</returns>
-        [HttpGet]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        public ActionResult<QueryResult<BaseItemDto>> GetGenres(
-            [FromQuery] int? startIndex,
-            [FromQuery] int? limit,
-            [FromQuery] string? searchTerm,
-            [FromQuery] Guid? parentId,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
-            [FromQuery] bool? isFavorite,
-            [FromQuery] int? imageTypeLimit,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ImageType[] enableImageTypes,
-            [FromQuery] Guid? userId,
-            [FromQuery] string? nameStartsWithOrGreater,
-            [FromQuery] string? nameStartsWith,
-            [FromQuery] string? nameLessThan,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] sortBy,
-            [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] SortOrder[] sortOrder,
-            [FromQuery] bool? enableImages = true,
-            [FromQuery] bool enableTotalRecordCount = true)
-        {
-            var dtoOptions = new DtoOptions { Fields = fields }
-                .AddClientFields(User)
-                .AddAdditionalDtoOptions(enableImages, false, imageTypeLimit, enableImageTypes);
+    /// <summary>
+    /// Gets all genres from a given item, folder, or the entire library.
+    /// </summary>
+    /// <param name="startIndex">Optional. The record index to start at. All items with a lower index will be dropped from the results.</param>
+    /// <param name="limit">Optional. The maximum number of records to return.</param>
+    /// <param name="searchTerm">The search term.</param>
+    /// <param name="parentId">Specify this to localize the search to a specific item or folder. Omit to use the root.</param>
+    /// <param name="fields">Optional. Specify additional fields of information to return in the output.</param>
+    /// <param name="excludeItemTypes">Optional. If specified, results will be filtered out based on item type. This allows multiple, comma delimited.</param>
+    /// <param name="includeItemTypes">Optional. If specified, results will be filtered in based on item type. This allows multiple, comma delimited.</param>
+    /// <param name="isFavorite">Optional filter by items that are marked as favorite, or not.</param>
+    /// <param name="imageTypeLimit">Optional, the max number of images to return, per image type.</param>
+    /// <param name="enableImageTypes">Optional. The image types to include in the output.</param>
+    /// <param name="userId">User id.</param>
+    /// <param name="nameStartsWithOrGreater">Optional filter by items whose name is sorted equally or greater than a given input string.</param>
+    /// <param name="nameStartsWith">Optional filter by items whose name is sorted equally than a given input string.</param>
+    /// <param name="nameLessThan">Optional filter by items whose name is equally or lesser than a given input string.</param>
+    /// <param name="sortBy">Optional. Specify one or more sort orders, comma delimited.</param>
+    /// <param name="sortOrder">Sort Order - Ascending,Descending.</param>
+    /// <param name="enableImages">Optional, include image information in output.</param>
+    /// <param name="enableTotalRecordCount">Optional. Include total record count.</param>
+    /// <response code="200">Genres returned.</response>
+    /// <returns>An <see cref="OkResult"/> containing the queryresult of genres.</returns>
+    [HttpGet]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public ActionResult<QueryResult<BaseItemDto>> GetGenres(
+        [FromQuery] int? startIndex,
+        [FromQuery] int? limit,
+        [FromQuery] string? searchTerm,
+        [FromQuery] Guid? parentId,
+        [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ItemFields[] fields,
+        [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] excludeItemTypes,
+        [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] BaseItemKind[] includeItemTypes,
+        [FromQuery] bool? isFavorite,
+        [FromQuery] int? imageTypeLimit,
+        [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] ImageType[] enableImageTypes,
+        [FromQuery] Guid? userId,
+        [FromQuery] string? nameStartsWithOrGreater,
+        [FromQuery] string? nameStartsWith,
+        [FromQuery] string? nameLessThan,
+        [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] string[] sortBy,
+        [FromQuery, ModelBinder(typeof(CommaDelimitedArrayModelBinder))] SortOrder[] sortOrder,
+        [FromQuery] bool? enableImages = true,
+        [FromQuery] bool enableTotalRecordCount = true)
+    {
+        userId = RequestHelpers.GetUserId(User, userId);
+        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
+            .AddAdditionalDtoOptions(enableImages, false, imageTypeLimit, enableImageTypes);
 
-            User? user = userId is null || userId.Value.Equals(default)
-                ? null
-                : _userManager.GetUserById(userId.Value);
+        User? user = userId.Value.Equals(default)
+            ? null
+            : _userManager.GetUserById(userId.Value);
 
-            var parentItem = _libraryManager.GetParentItem(parentId, userId);
+        var parentItem = _libraryManager.GetParentItem(parentId, userId);
 
-            var query = new InternalItemsQuery(user)
-            {
-                ExcludeItemTypes = excludeItemTypes,
-                IncludeItemTypes = includeItemTypes,
-                StartIndex = startIndex,
-                Limit = limit,
-                IsFavorite = isFavorite,
-                NameLessThan = nameLessThan,
-                NameStartsWith = nameStartsWith,
-                NameStartsWithOrGreater = nameStartsWithOrGreater,
-                DtoOptions = dtoOptions,
-                SearchTerm = searchTerm,
-                EnableTotalRecordCount = enableTotalRecordCount,
-                OrderBy = RequestHelpers.GetOrderBy(sortBy, sortOrder)
-            };
-
-            if (parentId.HasValue)
-            {
-                if (parentItem is Folder)
-                {
-                    query.AncestorIds = new[] { parentId.Value };
-                }
-                else
-                {
-                    query.ItemIds = new[] { parentId.Value };
-                }
-            }
-
-            QueryResult<(BaseItem, ItemCounts)> result;
-            if (parentItem is ICollectionFolder parentCollectionFolder
-                && (string.Equals(parentCollectionFolder.CollectionType, CollectionType.Music, StringComparison.Ordinal)
-                || string.Equals(parentCollectionFolder.CollectionType, CollectionType.MusicVideos, StringComparison.Ordinal)))
+        var query = new InternalItemsQuery(user)
+        {
+            ExcludeItemTypes = excludeItemTypes,
+            IncludeItemTypes = includeItemTypes,
+            StartIndex = startIndex,
+            Limit = limit,
+            IsFavorite = isFavorite,
+            NameLessThan = nameLessThan,
+            NameStartsWith = nameStartsWith,
+            NameStartsWithOrGreater = nameStartsWithOrGreater,
+            DtoOptions = dtoOptions,
+            SearchTerm = searchTerm,
+            EnableTotalRecordCount = enableTotalRecordCount,
+            OrderBy = RequestHelpers.GetOrderBy(sortBy, sortOrder)
+        };
+
+        if (parentId.HasValue)
+        {
+            if (parentItem is Folder)
             {
-                result = _libraryManager.GetMusicGenres(query);
+                query.AncestorIds = new[] { parentId.Value };
             }
             else
             {
-                result = _libraryManager.GetGenres(query);
+                query.ItemIds = new[] { parentId.Value };
             }
-
-            var shouldIncludeItemTypes = includeItemTypes.Length != 0;
-            return RequestHelpers.CreateQueryResult(result, dtoOptions, _dtoService, shouldIncludeItemTypes, user);
         }
 
-        /// <summary>
-        /// Gets a genre, by name.
-        /// </summary>
-        /// <param name="genreName">The genre name.</param>
-        /// <param name="userId">The user id.</param>
-        /// <response code="200">Genres returned.</response>
-        /// <returns>An <see cref="OkResult"/> containing the genre.</returns>
-        [HttpGet("{genreName}")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        public ActionResult<BaseItemDto> GetGenre([FromRoute, Required] string genreName, [FromQuery] Guid? userId)
+        QueryResult<(BaseItem, ItemCounts)> result;
+        if (parentItem is ICollectionFolder parentCollectionFolder
+            && (string.Equals(parentCollectionFolder.CollectionType, CollectionType.Music, StringComparison.Ordinal)
+                || string.Equals(parentCollectionFolder.CollectionType, CollectionType.MusicVideos, StringComparison.Ordinal)))
         {
-            var dtoOptions = new DtoOptions()
-                .AddClientFields(User);
+            result = _libraryManager.GetMusicGenres(query);
+        }
+        else
+        {
+            result = _libraryManager.GetGenres(query);
+        }
 
-            Genre? item;
-            if (genreName.Contains(BaseItem.SlugChar, StringComparison.OrdinalIgnoreCase))
-            {
-                item = GetItemFromSlugName<Genre>(_libraryManager, genreName, dtoOptions, BaseItemKind.Genre);
-            }
-            else
-            {
-                item = _libraryManager.GetGenre(genreName);
-            }
+        var shouldIncludeItemTypes = includeItemTypes.Length != 0;
+        return RequestHelpers.CreateQueryResult(result, dtoOptions, _dtoService, shouldIncludeItemTypes, user);
+    }
 
-            item ??= new Genre();
+    /// <summary>
+    /// Gets a genre, by name.
+    /// </summary>
+    /// <param name="genreName">The genre name.</param>
+    /// <param name="userId">The user id.</param>
+    /// <response code="200">Genres returned.</response>
+    /// <returns>An <see cref="OkResult"/> containing the genre.</returns>
+    [HttpGet("{genreName}")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public ActionResult<BaseItemDto> GetGenre([FromRoute, Required] string genreName, [FromQuery] Guid? userId)
+    {
+        userId = RequestHelpers.GetUserId(User, userId);
+        var dtoOptions = new DtoOptions()
+            .AddClientFields(User);
 
-            if (userId is null || userId.Value.Equals(default))
-            {
-                return _dtoService.GetBaseItemDto(item, dtoOptions);
-            }
+        Genre? item;
+        if (genreName.Contains(BaseItem.SlugChar, StringComparison.OrdinalIgnoreCase))
+        {
+            item = GetItemFromSlugName<Genre>(_libraryManager, genreName, dtoOptions, BaseItemKind.Genre);
+        }
+        else
+        {
+            item = _libraryManager.GetGenre(genreName);
+        }
 
-            var user = _userManager.GetUserById(userId.Value);
+        item ??= new Genre();
 
-            return _dtoService.GetBaseItemDto(item, dtoOptions, user);
-        }
+        var user = userId.Value.Equals(default)
+            ? null
+            : _userManager.GetUserById(userId.Value);
+
+        return _dtoService.GetBaseItemDto(item, dtoOptions, user);
+    }
 
-        private T? GetItemFromSlugName<T>(ILibraryManager libraryManager, string name, DtoOptions dtoOptions, BaseItemKind baseItemKind)
-            where T : BaseItem, new()
+    private T? GetItemFromSlugName<T>(ILibraryManager libraryManager, string name, DtoOptions dtoOptions, BaseItemKind baseItemKind)
+        where T : BaseItem, new()
+    {
+        var result = libraryManager.GetItemList(new InternalItemsQuery
         {
-            var result = libraryManager.GetItemList(new InternalItemsQuery
-            {
-                Name = name.Replace(BaseItem.SlugChar, '&'),
-                IncludeItemTypes = new[] { baseItemKind },
-                DtoOptions = dtoOptions
-            }).OfType<T>().FirstOrDefault();
+            Name = name.Replace(BaseItem.SlugChar, '&'),
+            IncludeItemTypes = new[] { baseItemKind },
+            DtoOptions = dtoOptions
+        }).OfType<T>().FirstOrDefault();
 
-            result ??= libraryManager.GetItemList(new InternalItemsQuery
-            {
-                Name = name.Replace(BaseItem.SlugChar, '/'),
-                IncludeItemTypes = new[] { baseItemKind },
-                DtoOptions = dtoOptions
-            }).OfType<T>().FirstOrDefault();
+        result ??= libraryManager.GetItemList(new InternalItemsQuery
+        {
+            Name = name.Replace(BaseItem.SlugChar, '/'),
+            IncludeItemTypes = new[] { baseItemKind },
+            DtoOptions = dtoOptions
+        }).OfType<T>().FirstOrDefault();
 
-            result ??= libraryManager.GetItemList(new InternalItemsQuery
-            {
-                Name = name.Replace(BaseItem.SlugChar, '?'),
-                IncludeItemTypes = new[] { baseItemKind },
-                DtoOptions = dtoOptions
-            }).OfType<T>().FirstOrDefault();
+        result ??= libraryManager.GetItemList(new InternalItemsQuery
+        {
+            Name = name.Replace(BaseItem.SlugChar, '?'),
+            IncludeItemTypes = new[] { baseItemKind },
+            DtoOptions = dtoOptions
+        }).OfType<T>().FirstOrDefault();
 
-            return result;
-        }
+        return result;
     }
 }