lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove AddItemFields

Browse Source
This commit is contained in:
crobibero 2020-10-29 11:17:13 -06:00
parent b9406e5444
commit 372f0eb38a
16 changed files with 32 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jellyfin.Api/Controllers/ArtistsController.cs
View File

@ -113,8 +113,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? enableImages = true, [FromQuery] bool? enableImages = true,
[FromQuery] bool enableTotalRecordCount = true) [FromQuery] bool enableTotalRecordCount = true)
{ {
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
@ -322,8 +321,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? enableImages = true, [FromQuery] bool? enableImages = true,
[FromQuery] bool enableTotalRecordCount = true) [FromQuery] bool enableTotalRecordCount = true)
{ {
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

8
Jellyfin.Api/Controllers/ChannelsController.cs
View File

@ -133,11 +133,10 @@ namespace Jellyfin.Api.Controllers
{ {
Limit = limit, Limit = limit,
StartIndex = startIndex, StartIndex = startIndex,
ChannelIds = new[] { channelId }, ChannelIds = new[] {channelId},
ParentId = folderId ?? Guid.Empty, ParentId = folderId ?? Guid.Empty,
OrderBy = RequestHelpers.GetOrderBy(sortBy, sortOrder), OrderBy = RequestHelpers.GetOrderBy(sortBy, sortOrder),
DtoOptions = new DtoOptions() DtoOptions = new DtoOptions { Fields = fields }
.AddItemFields(fields)
}; };
foreach (var filter in filters) foreach (var filter in filters)
@ -213,8 +212,7 @@ namespace Jellyfin.Api.Controllers
.Where(i => !string.IsNullOrWhiteSpace(i)) .Where(i => !string.IsNullOrWhiteSpace(i))
.Select(i => new Guid(i)) .Select(i => new Guid(i))
.ToArray(), .ToArray(),
DtoOptions = new DtoOptions() DtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
}; };
foreach (var filter in filters) foreach (var filter in filters)

3
Jellyfin.Api/Controllers/GenresController.cs
View File

@ -114,8 +114,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? enableImages = true, [FromQuery] bool? enableImages = true,
[FromQuery] bool enableTotalRecordCount = true) [FromQuery] bool enableTotalRecordCount = true)
{ {
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

21
Jellyfin.Api/Controllers/InstantMixController.cs
View File

@ -78,8 +78,7 @@ namespace Jellyfin.Api.Controllers
var user = userId.HasValue && !userId.Equals(Guid.Empty) var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value) ? _userManager.GetUserById(userId.Value)
: null; : null;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions); var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
@ -115,8 +114,7 @@ namespace Jellyfin.Api.Controllers
var user = userId.HasValue && !userId.Equals(Guid.Empty) var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value) ? _userManager.GetUserById(userId.Value)
: null; : null;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
var items = _musicManager.GetInstantMixFromItem(album, user, dtoOptions); var items = _musicManager.GetInstantMixFromItem(album, user, dtoOptions);
@ -152,8 +150,7 @@ namespace Jellyfin.Api.Controllers
var user = userId.HasValue && !userId.Equals(Guid.Empty) var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value) ? _userManager.GetUserById(userId.Value)
: null; : null;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
var items = _musicManager.GetInstantMixFromItem(playlist, user, dtoOptions); var items = _musicManager.GetInstantMixFromItem(playlist, user, dtoOptions);
@ -188,8 +185,7 @@ namespace Jellyfin.Api.Controllers
var user = userId.HasValue && !userId.Equals(Guid.Empty) var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value) ? _userManager.GetUserById(userId.Value)
: null; : null;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
var items = _musicManager.GetInstantMixFromGenres(new[] { name }, user, dtoOptions); var items = _musicManager.GetInstantMixFromGenres(new[] { name }, user, dtoOptions);
@ -225,8 +221,7 @@ namespace Jellyfin.Api.Controllers
var user = userId.HasValue && !userId.Equals(Guid.Empty) var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value) ? _userManager.GetUserById(userId.Value)
: null; : null;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions); var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
@ -262,8 +257,7 @@ namespace Jellyfin.Api.Controllers
var user = userId.HasValue && !userId.Equals(Guid.Empty) var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value) ? _userManager.GetUserById(userId.Value)
: null; : null;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions); var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
@ -299,8 +293,7 @@ namespace Jellyfin.Api.Controllers
var user = userId.HasValue && !userId.Equals(Guid.Empty) var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value) ? _userManager.GetUserById(userId.Value)
: null; : null;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions); var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);

6
Jellyfin.Api/Controllers/ItemsController.cs
View File

@ -233,8 +233,7 @@ namespace Jellyfin.Api.Controllers
var user = userId.HasValue && !userId.Equals(Guid.Empty) var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value) ? _userManager.GetUserById(userId.Value)
: null; : null;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
@ -544,8 +543,7 @@ namespace Jellyfin.Api.Controllers
{ {
var user = _userManager.GetUserById(userId); var user = _userManager.GetUserById(userId);
var parentIdGuid = string.IsNullOrWhiteSpace(parentId) ? Guid.Empty : new Guid(parentId); var parentIdGuid = string.IsNullOrWhiteSpace(parentId) ? Guid.Empty : new Guid(parentId);
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

3
Jellyfin.Api/Controllers/LibraryController.cs
View File

@ -892,8 +892,7 @@ namespace Jellyfin.Api.Controllers
var user = userId.HasValue && !userId.Equals(Guid.Empty) var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value) ? _userManager.GetUserById(userId.Value)
: null; : null;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request); .AddClientFields(Request);
var query = new InternalItemsQuery(user) var query = new InternalItemsQuery(user)

15
Jellyfin.Api/Controllers/LiveTvController.cs
View File

@ -154,8 +154,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool enableFavoriteSorting = false, [FromQuery] bool enableFavoriteSorting = false,
[FromQuery] bool addCurrentProgram = true) [FromQuery] bool addCurrentProgram = true)
{ {
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
@ -274,8 +273,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? isLibraryItem, [FromQuery] bool? isLibraryItem,
[FromQuery] bool enableTotalRecordCount = true) [FromQuery] bool enableTotalRecordCount = true)
{ {
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
@ -606,8 +604,7 @@ namespace Jellyfin.Api.Controllers
} }
} }
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
return await _liveTvManager.GetPrograms(query, dtoOptions, CancellationToken.None).ConfigureAwait(false); return await _liveTvManager.GetPrograms(query, dtoOptions, CancellationToken.None).ConfigureAwait(false);
@ -662,8 +659,7 @@ namespace Jellyfin.Api.Controllers
} }
} }
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = body.Fields }
.AddItemFields(body.Fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(body.EnableImages, body.EnableUserData, body.ImageTypeLimit, body.EnableImageTypes); .AddAdditionalDtoOptions(body.EnableImages, body.EnableUserData, body.ImageTypeLimit, body.EnableImageTypes);
return await _liveTvManager.GetPrograms(query, dtoOptions, CancellationToken.None).ConfigureAwait(false); return await _liveTvManager.GetPrograms(query, dtoOptions, CancellationToken.None).ConfigureAwait(false);
@ -729,8 +725,7 @@ namespace Jellyfin.Api.Controllers
GenreIds = RequestHelpers.GetGuids(genreIds) GenreIds = RequestHelpers.GetGuids(genreIds)
}; };
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
return _liveTvManager.GetRecommendedPrograms(query, dtoOptions, CancellationToken.None); return _liveTvManager.GetRecommendedPrograms(query, dtoOptions, CancellationToken.None);

3
Jellyfin.Api/Controllers/MoviesController.cs
View File

@ -72,8 +72,7 @@ namespace Jellyfin.Api.Controllers
var user = userId.HasValue && !userId.Equals(Guid.Empty) var user = userId.HasValue && !userId.Equals(Guid.Empty)
? _userManager.GetUserById(userId.Value) ? _userManager.GetUserById(userId.Value)
: null; : null;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request); .AddClientFields(Request);
var categories = new List<RecommendationDto>(); var categories = new List<RecommendationDto>();

3
Jellyfin.Api/Controllers/MusicGenresController.cs
View File

@ -113,8 +113,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? enableImages = true, [FromQuery] bool? enableImages = true,
[FromQuery] bool enableTotalRecordCount = true) [FromQuery] bool enableTotalRecordCount = true)
{ {
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

3
Jellyfin.Api/Controllers/PersonsController.cs
View File

@ -113,8 +113,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? enableImages = true, [FromQuery] bool? enableImages = true,
[FromQuery] bool enableTotalRecordCount = true) [FromQuery] bool enableTotalRecordCount = true)
{ {
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

3
Jellyfin.Api/Controllers/PlaylistsController.cs
View File

@ -176,8 +176,7 @@ namespace Jellyfin.Api.Controllers
items = items.Take(limit.Value).ToArray(); items = items.Take(limit.Value).ToArray();
} }
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

3
Jellyfin.Api/Controllers/StudiosController.cs
View File

@ -112,8 +112,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? enableImages = true, [FromQuery] bool? enableImages = true,
[FromQuery] bool enableTotalRecordCount = true) [FromQuery] bool enableTotalRecordCount = true)
{ {
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

12
Jellyfin.Api/Controllers/TvShowsController.cs
View File

@ -82,8 +82,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool? enableUserData, [FromQuery] bool? enableUserData,
[FromQuery] bool enableTotalRecordCount = true) [FromQuery] bool enableTotalRecordCount = true)
{ {
var options = new DtoOptions() var options = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImges, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImges, enableUserData, imageTypeLimit, enableImageTypes!);
@ -146,8 +145,7 @@ namespace Jellyfin.Api.Controllers
var parentIdGuid = string.IsNullOrWhiteSpace(parentId) ? Guid.Empty : new Guid(parentId); var parentIdGuid = string.IsNullOrWhiteSpace(parentId) ? Guid.Empty : new Guid(parentId);
var options = new DtoOptions() var options = new DtoOptions{ Fields = fields }
.AddItemFields(fields!)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImges, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImges, enableUserData, imageTypeLimit, enableImageTypes!);
@ -217,8 +215,7 @@ namespace Jellyfin.Api.Controllers
List<BaseItem> episodes; List<BaseItem> episodes;
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields!)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
@ -345,8 +342,7 @@ namespace Jellyfin.Api.Controllers
AdjacentTo = adjacentTo AdjacentTo = adjacentTo
}); });
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);

3
Jellyfin.Api/Controllers/UserLibraryController.cs
View File

@ -287,8 +287,7 @@ namespace Jellyfin.Api.Controllers
} }
} }
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

3
Jellyfin.Api/Controllers/YearsController.cs
View File

@ -83,8 +83,7 @@ namespace Jellyfin.Api.Controllers
[FromQuery] bool recursive = true, [FromQuery] bool recursive = true,
[FromQuery] bool? enableImages = true) [FromQuery] bool? enableImages = true)
{ {
var dtoOptions = new DtoOptions() var dtoOptions = new DtoOptions{ Fields = fields }
.AddItemFields(fields)
.AddClientFields(Request) .AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes); .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

16
Jellyfin.Api/Extensions/DtoExtensions.cs
View File

@ -13,22 +13,6 @@ namespace Jellyfin.Api.Extensions
/// </summary> /// </summary>
public static class DtoExtensions public static class DtoExtensions
{ {
/// <summary>
/// Add Dto Item fields.
/// </summary>
/// <remarks>
/// Converted from IHasItemFields.
/// Legacy order: 1.
/// </remarks>
/// <param name="dtoOptions">DtoOptions object.</param>
/// <param name="fields">Array of item fields.</param>
/// <returns>Modified DtoOptions object.</returns>
internal static DtoOptions AddItemFields(this DtoOptions dtoOptions, ItemFields[] fields)
{
dtoOptions.Fields = fields;
return dtoOptions;
}
/// <summary> /// <summary>
/// Add additional fields depending on client. /// Add additional fields depending on client.
/// </summary> /// </summary>