Move ArtistsService to Jellyfin.Api
This commit is contained in:
David
parent
dbf939467f
commit
45e034e9a1
488
Jellyfin.Api/Controllers/ArtistsController.cs
Normal file
488
Jellyfin.Api/Controllers/ArtistsController.cs
Normal file
|
|
@ -0,0 +1,488 @@
|
||||||
|
using System;
|
||||||
|
using System.Linq;
|
||||||
|
using Jellyfin.Api.Constants;
|
||||||
|
using Jellyfin.Api.Extensions;
|
||||||
|
using Jellyfin.Api.Helpers;
|
||||||
|
using Jellyfin.Data.Entities;
|
||||||
|
using MediaBrowser.Controller.Dto;
|
||||||
|
using MediaBrowser.Controller.Entities;
|
||||||
|
using MediaBrowser.Controller.Library;
|
||||||
|
using MediaBrowser.Model.Dto;
|
||||||
|
using MediaBrowser.Model.Querying;
|
||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.AspNetCore.Http;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
|
namespace Jellyfin.Api.Controllers
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The artists controller.
|
||||||
|
/// </summary>
|
||||||
|
[Authorize(Policy = Policies.DefaultAuthorization)]
|
||||||
|
[Route("/Artists")]
|
||||||
|
public class ArtistsController : BaseJellyfinApiController
|
||||||
|
{
|
||||||
|
private readonly ILibraryManager _libraryManager;
|
||||||
|
private readonly IUserManager _userManager;
|
||||||
|
private readonly IDtoService _dtoService;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="ArtistsController"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
|
||||||
|
/// <param name="userManager">Instance of the <see cref="IUserManager"/> interface.</param>
|
||||||
|
/// <param name="dtoService">Instance of the <see cref="IDtoService"/> interface.</param>
|
||||||
|
public ArtistsController(
|
||||||
|
ILibraryManager libraryManager,
|
||||||
|
IUserManager userManager,
|
||||||
|
IDtoService dtoService)
|
||||||
|
{
|
||||||
|
_libraryManager = libraryManager;
|
||||||
|
_userManager = userManager;
|
||||||
|
_dtoService = dtoService;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets all artists from a given item, folder, or the entire library.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="minCommunityRating">Optional filter by minimum community rating.</param>
|
||||||
|
/// <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">Optional. 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. This allows multiple, comma delimited. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines.</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 based on item type. This allows multiple, comma delimited.</param>
|
||||||
|
/// <param name="filters">Optional. Specify additional filters to apply. This allows multiple, comma delimited. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsResumable, Likes, Dislikes.</param>
|
||||||
|
/// <param name="isFavorite">Optional filter by items that are marked as favorite, or not.</param>
|
||||||
|
/// <param name="mediaTypes">Optional filter by MediaType. Allows multiple, comma delimited.</param>
|
||||||
|
/// <param name="genres">Optional. If specified, results will be filtered based on genre. This allows multiple, pipe delimited.</param>
|
||||||
|
/// <param name="genreIds">Optional. If specified, results will be filtered based on genre id. This allows multiple, pipe delimited.</param>
|
||||||
|
/// <param name="officialRatings">Optional. If specified, results will be filtered based on OfficialRating. This allows multiple, pipe delimited.</param>
|
||||||
|
/// <param name="tags">Optional. If specified, results will be filtered based on tag. This allows multiple, pipe delimited.</param>
|
||||||
|
/// <param name="years">Optional. If specified, results will be filtered based on production year. This allows multiple, comma delimited.</param>
|
||||||
|
/// <param name="enableUserData">Optional, include user data.</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="person">Optional. If specified, results will be filtered to include only those containing the specified person.</param>
|
||||||
|
/// <param name="personIds">Optional. If specified, results will be filtered to include only those containing the specified person ids.</param>
|
||||||
|
/// <param name="personTypes">Optional. If specified, along with Person, results will be filtered to include only those containing the specified person and PersonType. Allows multiple, comma-delimited.</param>
|
||||||
|
/// <param name="studios">Optional. If specified, results will be filtered based on studio. This allows multiple, pipe delimited.</param>
|
||||||
|
/// <param name="studioIds">Optional. If specified, results will be filtered based on studio id. This allows multiple, pipe delimited.</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="enableImages">Optional, include image information in output.</param>
|
||||||
|
/// <param name="enableTotalRecordCount">Total record count.</param>
|
||||||
|
/// <response code="200">Artists returned.</response>
|
||||||
|
/// <returns>An <see cref="OkResult"/> containing the artists.</returns>
|
||||||
|
[HttpGet]
|
||||||
|
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||||
|
public ActionResult<QueryResult<BaseItemDto>> GetArtists(
|
||||||
|
[FromQuery] double? minCommunityRating,
|
||||||
|
[FromQuery] int? startIndex,
|
||||||
|
[FromQuery] int? limit,
|
||||||
|
[FromQuery] string searchTerm,
|
||||||
|
[FromQuery] string parentId,
|
||||||
|
[FromQuery] string fields,
|
||||||
|
[FromQuery] string excludeItemTypes,
|
||||||
|
[FromQuery] string includeItemTypes,
|
||||||
|
[FromQuery] string filters,
|
||||||
|
[FromQuery] bool? isFavorite,
|
||||||
|
[FromQuery] string mediaTypes,
|
||||||
|
[FromQuery] string genres,
|
||||||
|
[FromQuery] string genreIds,
|
||||||
|
[FromQuery] string officialRatings,
|
||||||
|
[FromQuery] string tags,
|
||||||
|
[FromQuery] string years,
|
||||||
|
[FromQuery] bool? enableUserData,
|
||||||
|
[FromQuery] int? imageTypeLimit,
|
||||||
|
[FromQuery] string enableImageTypes,
|
||||||
|
[FromQuery] string person,
|
||||||
|
[FromQuery] string personIds,
|
||||||
|
[FromQuery] string personTypes,
|
||||||
|
[FromQuery] string studios,
|
||||||
|
[FromQuery] string studioIds,
|
||||||
|
[FromQuery] Guid userId,
|
||||||
|
[FromQuery] string nameStartsWithOrGreater,
|
||||||
|
[FromQuery] string nameStartsWith,
|
||||||
|
[FromQuery] string nameLessThan,
|
||||||
|
[FromQuery] bool? enableImages = true,
|
||||||
|
[FromQuery] bool enableTotalRecordCount = true)
|
||||||
|
{
|
||||||
|
var dtoOptions = new DtoOptions()
|
||||||
|
.AddItemFields(fields)
|
||||||
|
.AddClientFields(Request)
|
||||||
|
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
|
||||||
|
|
||||||
|
User? user = null;
|
||||||
|
BaseItem parentItem;
|
||||||
|
|
||||||
|
if (!userId.Equals(Guid.Empty))
|
||||||
|
{
|
||||||
|
user = _userManager.GetUserById(userId);
|
||||||
|
parentItem = string.IsNullOrEmpty(parentId) ? _libraryManager.GetUserRootFolder() : _libraryManager.GetItemById(parentId);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
parentItem = string.IsNullOrEmpty(parentId) ? _libraryManager.RootFolder : _libraryManager.GetItemById(parentId);
|
||||||
|
}
|
||||||
|
|
||||||
|
var excludeItemTypesArr = RequestHelpers.Split(excludeItemTypes, ',', true);
|
||||||
|
var includeItemTypesArr = RequestHelpers.Split(includeItemTypes, ',', true);
|
||||||
|
var mediaTypesArr = RequestHelpers.Split(mediaTypes, ',', true);
|
||||||
|
|
||||||
|
var query = new InternalItemsQuery(user)
|
||||||
|
{
|
||||||
|
ExcludeItemTypes = excludeItemTypesArr,
|
||||||
|
IncludeItemTypes = includeItemTypesArr,
|
||||||
|
MediaTypes = mediaTypesArr,
|
||||||
|
StartIndex = startIndex,
|
||||||
|
Limit = limit,
|
||||||
|
IsFavorite = isFavorite,
|
||||||
|
NameLessThan = nameLessThan,
|
||||||
|
NameStartsWith = nameStartsWith,
|
||||||
|
NameStartsWithOrGreater = nameStartsWithOrGreater,
|
||||||
|
Tags = RequestHelpers.Split(tags, ',', true),
|
||||||
|
OfficialRatings = RequestHelpers.Split(officialRatings, ',', true),
|
||||||
|
Genres = RequestHelpers.Split(genres, ',', true),
|
||||||
|
GenreIds = RequestHelpers.GetGuids(genreIds),
|
||||||
|
StudioIds = RequestHelpers.GetGuids(studioIds),
|
||||||
|
Person = person,
|
||||||
|
PersonIds = RequestHelpers.GetGuids(personIds),
|
||||||
|
PersonTypes = RequestHelpers.Split(personTypes, ',', true),
|
||||||
|
Years = RequestHelpers.Split(years, ',', true).Select(int.Parse).ToArray(),
|
||||||
|
MinCommunityRating = minCommunityRating,
|
||||||
|
DtoOptions = dtoOptions,
|
||||||
|
SearchTerm = searchTerm,
|
||||||
|
EnableTotalRecordCount = enableTotalRecordCount
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(parentId))
|
||||||
|
{
|
||||||
|
if (parentItem is Folder)
|
||||||
|
{
|
||||||
|
query.AncestorIds = new[] { new Guid(parentId) };
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
query.ItemIds = new[] { new Guid(parentId) };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Studios
|
||||||
|
if (!string.IsNullOrEmpty(studios))
|
||||||
|
{
|
||||||
|
query.StudioIds = studios.Split('|').Select(i =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return _libraryManager.GetStudio(i);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}).Where(i => i != null).Select(i => i!.Id).ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var filter in RequestHelpers.GetFilters(filters))
|
||||||
|
{
|
||||||
|
switch (filter)
|
||||||
|
{
|
||||||
|
case ItemFilter.Dislikes:
|
||||||
|
query.IsLiked = false;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsFavorite:
|
||||||
|
query.IsFavorite = true;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsFavoriteOrLikes:
|
||||||
|
query.IsFavoriteOrLiked = true;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsFolder:
|
||||||
|
query.IsFolder = true;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsNotFolder:
|
||||||
|
query.IsFolder = false;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsPlayed:
|
||||||
|
query.IsPlayed = true;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsResumable:
|
||||||
|
query.IsResumable = true;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsUnplayed:
|
||||||
|
query.IsPlayed = false;
|
||||||
|
break;
|
||||||
|
case ItemFilter.Likes:
|
||||||
|
query.IsLiked = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var result = _libraryManager.GetArtists(query);
|
||||||
|
|
||||||
|
var dtos = result.Items.Select(i =>
|
||||||
|
{
|
||||||
|
var (baseItem, itemCounts) = i;
|
||||||
|
var dto = _dtoService.GetItemByNameDto(baseItem, dtoOptions, null, user);
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(includeItemTypes))
|
||||||
|
{
|
||||||
|
dto.ChildCount = itemCounts.ItemCount;
|
||||||
|
dto.ProgramCount = itemCounts.ProgramCount;
|
||||||
|
dto.SeriesCount = itemCounts.SeriesCount;
|
||||||
|
dto.EpisodeCount = itemCounts.EpisodeCount;
|
||||||
|
dto.MovieCount = itemCounts.MovieCount;
|
||||||
|
dto.TrailerCount = itemCounts.TrailerCount;
|
||||||
|
dto.AlbumCount = itemCounts.AlbumCount;
|
||||||
|
dto.SongCount = itemCounts.SongCount;
|
||||||
|
dto.ArtistCount = itemCounts.ArtistCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
return dto;
|
||||||
|
});
|
||||||
|
|
||||||
|
return new QueryResult<BaseItemDto>
|
||||||
|
{
|
||||||
|
Items = dtos.ToArray(),
|
||||||
|
TotalRecordCount = result.TotalRecordCount
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets all album artists from a given item, folder, or the entire library.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="minCommunityRating">Optional filter by minimum community rating.</param>
|
||||||
|
/// <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">Optional. 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. This allows multiple, comma delimited. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines.</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 based on item type. This allows multiple, comma delimited.</param>
|
||||||
|
/// <param name="filters">Optional. Specify additional filters to apply. This allows multiple, comma delimited. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsResumable, Likes, Dislikes.</param>
|
||||||
|
/// <param name="isFavorite">Optional filter by items that are marked as favorite, or not.</param>
|
||||||
|
/// <param name="mediaTypes">Optional filter by MediaType. Allows multiple, comma delimited.</param>
|
||||||
|
/// <param name="genres">Optional. If specified, results will be filtered based on genre. This allows multiple, pipe delimited.</param>
|
||||||
|
/// <param name="genreIds">Optional. If specified, results will be filtered based on genre id. This allows multiple, pipe delimited.</param>
|
||||||
|
/// <param name="officialRatings">Optional. If specified, results will be filtered based on OfficialRating. This allows multiple, pipe delimited.</param>
|
||||||
|
/// <param name="tags">Optional. If specified, results will be filtered based on tag. This allows multiple, pipe delimited.</param>
|
||||||
|
/// <param name="years">Optional. If specified, results will be filtered based on production year. This allows multiple, comma delimited.</param>
|
||||||
|
/// <param name="enableUserData">Optional, include user data.</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="person">Optional. If specified, results will be filtered to include only those containing the specified person.</param>
|
||||||
|
/// <param name="personIds">Optional. If specified, results will be filtered to include only those containing the specified person ids.</param>
|
||||||
|
/// <param name="personTypes">Optional. If specified, along with Person, results will be filtered to include only those containing the specified person and PersonType. Allows multiple, comma-delimited.</param>
|
||||||
|
/// <param name="studios">Optional. If specified, results will be filtered based on studio. This allows multiple, pipe delimited.</param>
|
||||||
|
/// <param name="studioIds">Optional. If specified, results will be filtered based on studio id. This allows multiple, pipe delimited.</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="enableImages">Optional, include image information in output.</param>
|
||||||
|
/// <param name="enableTotalRecordCount">Total record count.</param>
|
||||||
|
/// <response code="200">Album artists returned.</response>
|
||||||
|
/// <returns>An <see cref="OkResult"/> containing the album artists.</returns>
|
||||||
|
[HttpGet("/AlbumArtists")]
|
||||||
|
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||||
|
public ActionResult<QueryResult<BaseItemDto>> GetAlbumArtists(
|
||||||
|
[FromQuery] double? minCommunityRating,
|
||||||
|
[FromQuery] int? startIndex,
|
||||||
|
[FromQuery] int? limit,
|
||||||
|
[FromQuery] string searchTerm,
|
||||||
|
[FromQuery] string parentId,
|
||||||
|
[FromQuery] string fields,
|
||||||
|
[FromQuery] string excludeItemTypes,
|
||||||
|
[FromQuery] string includeItemTypes,
|
||||||
|
[FromQuery] string filters,
|
||||||
|
[FromQuery] bool? isFavorite,
|
||||||
|
[FromQuery] string mediaTypes,
|
||||||
|
[FromQuery] string genres,
|
||||||
|
[FromQuery] string genreIds,
|
||||||
|
[FromQuery] string officialRatings,
|
||||||
|
[FromQuery] string tags,
|
||||||
|
[FromQuery] string years,
|
||||||
|
[FromQuery] bool? enableUserData,
|
||||||
|
[FromQuery] int? imageTypeLimit,
|
||||||
|
[FromQuery] string enableImageTypes,
|
||||||
|
[FromQuery] string person,
|
||||||
|
[FromQuery] string personIds,
|
||||||
|
[FromQuery] string personTypes,
|
||||||
|
[FromQuery] string studios,
|
||||||
|
[FromQuery] string studioIds,
|
||||||
|
[FromQuery] Guid userId,
|
||||||
|
[FromQuery] string nameStartsWithOrGreater,
|
||||||
|
[FromQuery] string nameStartsWith,
|
||||||
|
[FromQuery] string nameLessThan,
|
||||||
|
[FromQuery] bool? enableImages = true,
|
||||||
|
[FromQuery] bool enableTotalRecordCount = true)
|
||||||
|
{
|
||||||
|
var dtoOptions = new DtoOptions()
|
||||||
|
.AddItemFields(fields)
|
||||||
|
.AddClientFields(Request)
|
||||||
|
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
|
||||||
|
|
||||||
|
User? user = null;
|
||||||
|
BaseItem parentItem;
|
||||||
|
|
||||||
|
if (!userId.Equals(Guid.Empty))
|
||||||
|
{
|
||||||
|
user = _userManager.GetUserById(userId);
|
||||||
|
parentItem = string.IsNullOrEmpty(parentId) ? _libraryManager.GetUserRootFolder() : _libraryManager.GetItemById(parentId);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
parentItem = string.IsNullOrEmpty(parentId) ? _libraryManager.RootFolder : _libraryManager.GetItemById(parentId);
|
||||||
|
}
|
||||||
|
|
||||||
|
var excludeItemTypesArr = RequestHelpers.Split(excludeItemTypes, ',', true);
|
||||||
|
var includeItemTypesArr = RequestHelpers.Split(includeItemTypes, ',', true);
|
||||||
|
var mediaTypesArr = RequestHelpers.Split(mediaTypes, ',', true);
|
||||||
|
|
||||||
|
var query = new InternalItemsQuery(user)
|
||||||
|
{
|
||||||
|
ExcludeItemTypes = excludeItemTypesArr,
|
||||||
|
IncludeItemTypes = includeItemTypesArr,
|
||||||
|
MediaTypes = mediaTypesArr,
|
||||||
|
StartIndex = startIndex,
|
||||||
|
Limit = limit,
|
||||||
|
IsFavorite = isFavorite,
|
||||||
|
NameLessThan = nameLessThan,
|
||||||
|
NameStartsWith = nameStartsWith,
|
||||||
|
NameStartsWithOrGreater = nameStartsWithOrGreater,
|
||||||
|
Tags = RequestHelpers.Split(tags, ',', true),
|
||||||
|
OfficialRatings = RequestHelpers.Split(officialRatings, ',', true),
|
||||||
|
Genres = RequestHelpers.Split(genres, ',', true),
|
||||||
|
GenreIds = RequestHelpers.GetGuids(genreIds),
|
||||||
|
StudioIds = RequestHelpers.GetGuids(studioIds),
|
||||||
|
Person = person,
|
||||||
|
PersonIds = RequestHelpers.GetGuids(personIds),
|
||||||
|
PersonTypes = RequestHelpers.Split(personTypes, ',', true),
|
||||||
|
Years = RequestHelpers.Split(years, ',', true).Select(int.Parse).ToArray(),
|
||||||
|
MinCommunityRating = minCommunityRating,
|
||||||
|
DtoOptions = dtoOptions,
|
||||||
|
SearchTerm = searchTerm,
|
||||||
|
EnableTotalRecordCount = enableTotalRecordCount
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(parentId))
|
||||||
|
{
|
||||||
|
if (parentItem is Folder)
|
||||||
|
{
|
||||||
|
query.AncestorIds = new[] { new Guid(parentId) };
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
query.ItemIds = new[] { new Guid(parentId) };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Studios
|
||||||
|
if (!string.IsNullOrEmpty(studios))
|
||||||
|
{
|
||||||
|
query.StudioIds = studios.Split('|').Select(i =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return _libraryManager.GetStudio(i);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}).Where(i => i != null).Select(i => i!.Id).ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var filter in RequestHelpers.GetFilters(filters))
|
||||||
|
{
|
||||||
|
switch (filter)
|
||||||
|
{
|
||||||
|
case ItemFilter.Dislikes:
|
||||||
|
query.IsLiked = false;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsFavorite:
|
||||||
|
query.IsFavorite = true;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsFavoriteOrLikes:
|
||||||
|
query.IsFavoriteOrLiked = true;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsFolder:
|
||||||
|
query.IsFolder = true;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsNotFolder:
|
||||||
|
query.IsFolder = false;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsPlayed:
|
||||||
|
query.IsPlayed = true;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsResumable:
|
||||||
|
query.IsResumable = true;
|
||||||
|
break;
|
||||||
|
case ItemFilter.IsUnplayed:
|
||||||
|
query.IsPlayed = false;
|
||||||
|
break;
|
||||||
|
case ItemFilter.Likes:
|
||||||
|
query.IsLiked = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var result = _libraryManager.GetAlbumArtists(query);
|
||||||
|
|
||||||
|
var dtos = result.Items.Select(i =>
|
||||||
|
{
|
||||||
|
var (baseItem, itemCounts) = i;
|
||||||
|
var dto = _dtoService.GetItemByNameDto(baseItem, dtoOptions, null, user);
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(includeItemTypes))
|
||||||
|
{
|
||||||
|
dto.ChildCount = itemCounts.ItemCount;
|
||||||
|
dto.ProgramCount = itemCounts.ProgramCount;
|
||||||
|
dto.SeriesCount = itemCounts.SeriesCount;
|
||||||
|
dto.EpisodeCount = itemCounts.EpisodeCount;
|
||||||
|
dto.MovieCount = itemCounts.MovieCount;
|
||||||
|
dto.TrailerCount = itemCounts.TrailerCount;
|
||||||
|
dto.AlbumCount = itemCounts.AlbumCount;
|
||||||
|
dto.SongCount = itemCounts.SongCount;
|
||||||
|
dto.ArtistCount = itemCounts.ArtistCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
return dto;
|
||||||
|
});
|
||||||
|
|
||||||
|
return new QueryResult<BaseItemDto>
|
||||||
|
{
|
||||||
|
Items = dtos.ToArray(),
|
||||||
|
TotalRecordCount = result.TotalRecordCount
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets an artist by name.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="name">Studio name.</param>
|
||||||
|
/// <param name="userId">Optional. Filter by user id, and attach user data.</param>
|
||||||
|
/// <response code="200">Artist returned.</response>
|
||||||
|
/// <returns>An <see cref="OkResult"/> containing the artist.</returns>
|
||||||
|
[HttpGet("{name}")]
|
||||||
|
[ProducesResponseType(StatusCodes.Status200OK)]
|
||||||
|
public ActionResult<BaseItemDto> GetArtistByName([FromRoute] string name, [FromQuery] Guid userId)
|
||||||
|
{
|
||||||
|
var dtoOptions = new DtoOptions().AddClientFields(Request);
|
||||||
|
|
||||||
|
var item = _libraryManager.GetArtist(name, dtoOptions);
|
||||||
|
|
||||||
|
if (!userId.Equals(Guid.Empty))
|
||||||
|
{
|
||||||
|
var user = _userManager.GetUserById(userId);
|
||||||
|
|
||||||
|
return _dtoService.GetBaseItemDto(item, dtoOptions, user);
|
||||||
|
}
|
||||||
|
|
||||||
|
return _dtoService.GetBaseItemDto(item, dtoOptions);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -4,6 +4,7 @@ using Jellyfin.Data.Enums;
|
||||||
using MediaBrowser.Controller.Net;
|
using MediaBrowser.Controller.Net;
|
||||||
using MediaBrowser.Controller.Session;
|
using MediaBrowser.Controller.Session;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
|
using MediaBrowser.Model.Querying;
|
||||||
using Microsoft.AspNetCore.Http;
|
using Microsoft.AspNetCore.Http;
|
||||||
|
|
||||||
namespace Jellyfin.Api.Helpers
|
namespace Jellyfin.Api.Helpers
|
||||||
|
|
@ -130,5 +131,18 @@ namespace Jellyfin.Api.Helpers
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the filters.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="filters">The filter string.</param>
|
||||||
|
/// <returns>IEnumerable{ItemFilter}.</returns>
|
||||||
|
internal static ItemFilter[] GetFilters(string filters)
|
||||||
|
{
|
||||||
|
return string.IsNullOrEmpty(filters)
|
||||||
|
? Array.Empty<ItemFilter>()
|
||||||
|
: Split(filters, ',', true)
|
||||||
|
.Select(v => Enum.Parse<ItemFilter>(v, true)).ToArray();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,143 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Dto;
|
|
||||||
using MediaBrowser.Controller.Entities;
|
|
||||||
using MediaBrowser.Controller.Entities.Audio;
|
|
||||||
using MediaBrowser.Controller.Library;
|
|
||||||
using MediaBrowser.Controller.Net;
|
|
||||||
using MediaBrowser.Model.Dto;
|
|
||||||
using MediaBrowser.Model.Querying;
|
|
||||||
using MediaBrowser.Model.Services;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Api.UserLibrary
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Class GetArtists
|
|
||||||
/// </summary>
|
|
||||||
[Route("/Artists", "GET", Summary = "Gets all artists from a given item, folder, or the entire library")]
|
|
||||||
public class GetArtists : GetItemsByName
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/Artists/AlbumArtists", "GET", Summary = "Gets all album artists from a given item, folder, or the entire library")]
|
|
||||||
public class GetAlbumArtists : GetItemsByName
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/Artists/{Name}", "GET", Summary = "Gets an artist, by name")]
|
|
||||||
public class GetArtist : IReturn<BaseItemDto>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the name.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The name.</value>
|
|
||||||
[ApiMember(Name = "Name", Description = "The artist name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
|
|
||||||
public string Name { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the user id.
|
|
||||||
/// </summary>
|
|
||||||
/// <value>The user id.</value>
|
|
||||||
[ApiMember(Name = "UserId", Description = "Optional. Filter by user id, and attach user data", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
|
|
||||||
public Guid UserId { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Class ArtistsService
|
|
||||||
/// </summary>
|
|
||||||
[Authenticated]
|
|
||||||
public class ArtistsService : BaseItemsByNameService<MusicArtist>
|
|
||||||
{
|
|
||||||
public ArtistsService(
|
|
||||||
ILogger<ArtistsService> logger,
|
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
|
||||||
IHttpResultFactory httpResultFactory,
|
|
||||||
IUserManager userManager,
|
|
||||||
ILibraryManager libraryManager,
|
|
||||||
IUserDataManager userDataRepository,
|
|
||||||
IDtoService dtoService,
|
|
||||||
IAuthorizationContext authorizationContext)
|
|
||||||
: base(
|
|
||||||
logger,
|
|
||||||
serverConfigurationManager,
|
|
||||||
httpResultFactory,
|
|
||||||
userManager,
|
|
||||||
libraryManager,
|
|
||||||
userDataRepository,
|
|
||||||
dtoService,
|
|
||||||
authorizationContext)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the specified request.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The request.</param>
|
|
||||||
/// <returns>System.Object.</returns>
|
|
||||||
public object Get(GetArtist request)
|
|
||||||
{
|
|
||||||
return GetItem(request);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the item.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The request.</param>
|
|
||||||
/// <returns>Task{BaseItemDto}.</returns>
|
|
||||||
private BaseItemDto GetItem(GetArtist request)
|
|
||||||
{
|
|
||||||
var dtoOptions = GetDtoOptions(AuthorizationContext, request);
|
|
||||||
|
|
||||||
var item = GetArtist(request.Name, LibraryManager, dtoOptions);
|
|
||||||
|
|
||||||
if (!request.UserId.Equals(Guid.Empty))
|
|
||||||
{
|
|
||||||
var user = UserManager.GetUserById(request.UserId);
|
|
||||||
|
|
||||||
return DtoService.GetBaseItemDto(item, dtoOptions, user);
|
|
||||||
}
|
|
||||||
|
|
||||||
return DtoService.GetBaseItemDto(item, dtoOptions);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the specified request.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The request.</param>
|
|
||||||
/// <returns>System.Object.</returns>
|
|
||||||
public object Get(GetArtists request)
|
|
||||||
{
|
|
||||||
return GetResultSlim(request);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the specified request.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The request.</param>
|
|
||||||
/// <returns>System.Object.</returns>
|
|
||||||
public object Get(GetAlbumArtists request)
|
|
||||||
{
|
|
||||||
var result = GetResultSlim(request);
|
|
||||||
|
|
||||||
return ToOptimizedResult(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override QueryResult<(BaseItem, ItemCounts)> GetItems(GetItemsByName request, InternalItemsQuery query)
|
|
||||||
{
|
|
||||||
return request is GetAlbumArtists ? LibraryManager.GetAlbumArtists(query) : LibraryManager.GetArtists(query);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets all items.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The request.</param>
|
|
||||||
/// <param name="items">The items.</param>
|
|
||||||
/// <returns>IEnumerable{Tuple{System.StringFunc{System.Int32}}}.</returns>
|
|
||||||
protected override IEnumerable<BaseItem> GetAllItems(GetItemsByName request, IList<BaseItem> items)
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user