pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7225 from crobibero/query-result

This commit is contained in:
Bond-009 2022-01-21 19:50:08 +01:00 committed by GitHub
parent 34ee6d82fb a60cb280a3
commit cd675475bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 209 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
Emby.Dlna/ContentDirectory/ControlHandler.cs
View File

@ -619,7 +619,7 @@ namespace Emby.Dlna.ContentDirectory
var queryResult = folder.GetItems(query); var queryResult = folder.GetItems(query);
return ToResult(queryResult); return ToResult(startIndex, queryResult);
} }
/// <summary> /// <summary>
@ -642,7 +642,7 @@ namespace Emby.Dlna.ContentDirectory
var result = _libraryManager.GetItemsResult(query); var result = _libraryManager.GetItemsResult(query);
return ToResult(result); return ToResult(startIndex, result);
} }
/// <summary> /// <summary>
@ -707,11 +707,10 @@ namespace Emby.Dlna.ContentDirectory
serverItems = serverItems[..limit.Value]; serverItems = serverItems[..limit.Value];
} }
return new QueryResult<ServerItem> return new QueryResult<ServerItem>(
{ startIndex,
Items = serverItems, serverItems.Length,
TotalRecordCount = serverItems.Length serverItems);
};
} }
/// <summary> /// <summary>
@ -764,11 +763,10 @@ namespace Emby.Dlna.ContentDirectory
array = array[..limit.Value]; array = array[..limit.Value];
} }
return new QueryResult<ServerItem> return new QueryResult<ServerItem>(
{ startIndex,
Items = array, array.Length,
TotalRecordCount = array.Length array);
};
} }
/// <summary> /// <summary>
@ -790,11 +788,10 @@ namespace Emby.Dlna.ContentDirectory
.Select(i => new ServerItem(i, StubType.Folder)) .Select(i => new ServerItem(i, StubType.Folder))
.ToArray(); .ToArray();
return new QueryResult<ServerItem> return new QueryResult<ServerItem>(
{ startIndex,
Items = items, totalRecordCount,
TotalRecordCount = totalRecordCount items);
};
} }
/// <summary> /// <summary>
@ -850,11 +847,10 @@ namespace Emby.Dlna.ContentDirectory
serverItems = serverItems[..limit.Value]; serverItems = serverItems[..limit.Value];
} }
return new QueryResult<ServerItem> return new QueryResult<ServerItem>(
{ startIndex,
Items = serverItems, serverItems.Length,
TotalRecordCount = serverItems.Length serverItems);
};
} }
/// <summary> /// <summary>
@ -879,7 +875,7 @@ namespace Emby.Dlna.ContentDirectory
var result = _libraryManager.GetItemsResult(query); var result = _libraryManager.GetItemsResult(query);
return ToResult(result); return ToResult(query.StartIndex, result);
} }
/// <summary> /// <summary>
@ -894,7 +890,7 @@ namespace Emby.Dlna.ContentDirectory
var result = _libraryManager.GetItemsResult(query); var result = _libraryManager.GetItemsResult(query);
return ToResult(result); return ToResult(query.StartIndex, result);
} }
/// <summary> /// <summary>
@ -914,7 +910,7 @@ namespace Emby.Dlna.ContentDirectory
var result = _libraryManager.GetItemsResult(query); var result = _libraryManager.GetItemsResult(query);
return ToResult(result); return ToResult(query.StartIndex, result);
} }
/// <summary> /// <summary>
@ -931,7 +927,7 @@ namespace Emby.Dlna.ContentDirectory
query.AncestorIds = new[] { parent.Id }; query.AncestorIds = new[] { parent.Id };
var genresResult = _libraryManager.GetGenres(query); var genresResult = _libraryManager.GetGenres(query);
return ToResult(genresResult); return ToResult(query.StartIndex, genresResult);
} }
/// <summary> /// <summary>
@ -947,7 +943,7 @@ namespace Emby.Dlna.ContentDirectory
query.AncestorIds = new[] { parent.Id }; query.AncestorIds = new[] { parent.Id };
var genresResult = _libraryManager.GetMusicGenres(query); var genresResult = _libraryManager.GetMusicGenres(query);
return ToResult(genresResult); return ToResult(query.StartIndex, genresResult);
} }
/// <summary> /// <summary>
@ -963,7 +959,7 @@ namespace Emby.Dlna.ContentDirectory
query.AncestorIds = new[] { parent.Id }; query.AncestorIds = new[] { parent.Id };
var artists = _libraryManager.GetAlbumArtists(query); var artists = _libraryManager.GetAlbumArtists(query);
return ToResult(artists); return ToResult(query.StartIndex, artists);
} }
/// <summary> /// <summary>
@ -978,7 +974,7 @@ namespace Emby.Dlna.ContentDirectory
query.OrderBy = Array.Empty<(string, SortOrder)>(); query.OrderBy = Array.Empty<(string, SortOrder)>();
query.AncestorIds = new[] { parent.Id }; query.AncestorIds = new[] { parent.Id };
var artists = _libraryManager.GetArtists(query); var artists = _libraryManager.GetArtists(query);
return ToResult(artists); return ToResult(query.StartIndex, artists);
} }
/// <summary> /// <summary>
@ -994,7 +990,7 @@ namespace Emby.Dlna.ContentDirectory
query.AncestorIds = new[] { parent.Id }; query.AncestorIds = new[] { parent.Id };
query.IsFavorite = true; query.IsFavorite = true;
var artists = _libraryManager.GetArtists(query); var artists = _libraryManager.GetArtists(query);
return ToResult(artists); return ToResult(query.StartIndex, artists);
} }
/// <summary> /// <summary>
@ -1010,7 +1006,7 @@ namespace Emby.Dlna.ContentDirectory
var result = _libraryManager.GetItemsResult(query); var result = _libraryManager.GetItemsResult(query);
return ToResult(result); return ToResult(query.StartIndex, result);
} }
/// <summary> /// <summary>
@ -1034,7 +1030,7 @@ namespace Emby.Dlna.ContentDirectory
new[] { parent }, new[] { parent },
query.DtoOptions); query.DtoOptions);
return ToResult(result); return ToResult(query.StartIndex, result);
} }
/// <summary> /// <summary>
@ -1060,7 +1056,7 @@ namespace Emby.Dlna.ContentDirectory
}, },
query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToArray(); query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToArray();
return ToResult(items); return ToResult(query.StartIndex, items);
} }
/// <summary> /// <summary>
@ -1087,7 +1083,7 @@ namespace Emby.Dlna.ContentDirectory
var result = _libraryManager.GetItemsResult(query); var result = _libraryManager.GetItemsResult(query);
return ToResult(result); return ToResult(startIndex, result);
} }
/// <summary> /// <summary>
@ -1118,7 +1114,7 @@ namespace Emby.Dlna.ContentDirectory
var result = _libraryManager.GetItemsResult(query); var result = _libraryManager.GetItemsResult(query);
return ToResult(result); return ToResult(startIndex, result);
} }
/// <summary> /// <summary>
@ -1145,33 +1141,34 @@ namespace Emby.Dlna.ContentDirectory
var result = _libraryManager.GetItemsResult(query); var result = _libraryManager.GetItemsResult(query);
return ToResult(result); return ToResult(startIndex, result);
} }
/// <summary> /// <summary>
/// Converts <see cref="IReadOnlyCollection{BaseItem}"/> into a <see cref="QueryResult{ServerItem}"/>. /// Converts <see cref="IReadOnlyCollection{BaseItem}"/> into a <see cref="QueryResult{ServerItem}"/>.
/// </summary> /// </summary>
/// <param name="startIndex">The start index.</param>
/// <param name="result">An array of <see cref="BaseItem"/>.</param> /// <param name="result">An array of <see cref="BaseItem"/>.</param>
/// <returns>A <see cref="QueryResult{ServerItem}"/>.</returns> /// <returns>A <see cref="QueryResult{ServerItem}"/>.</returns>
private static QueryResult<ServerItem> ToResult(IReadOnlyCollection<BaseItem> result) private static QueryResult<ServerItem> ToResult(int? startIndex, IReadOnlyCollection<BaseItem> result)
{ {
var serverItems = result var serverItems = result
.Select(i => new ServerItem(i, null)) .Select(i => new ServerItem(i, null))
.ToArray(); .ToArray();
return new QueryResult<ServerItem> return new QueryResult<ServerItem>(
{ startIndex,
TotalRecordCount = result.Count, result.Count,
Items = serverItems serverItems);
};
} }
/// <summary> /// <summary>
/// Converts a <see cref="QueryResult{BaseItem}"/> to a <see cref="QueryResult{ServerItem}"/>. /// Converts a <see cref="QueryResult{BaseItem}"/> to a <see cref="QueryResult{ServerItem}"/>.
/// </summary> /// </summary>
/// <param name="startIndex">The index the result started at.</param>
/// <param name="result">A <see cref="QueryResult{BaseItem}"/>.</param> /// <param name="result">A <see cref="QueryResult{BaseItem}"/>.</param>
/// <returns>The <see cref="QueryResult{ServerItem}"/>.</returns> /// <returns>The <see cref="QueryResult{ServerItem}"/>.</returns>
private static QueryResult<ServerItem> ToResult(QueryResult<BaseItem> result) private static QueryResult<ServerItem> ToResult(int? startIndex, QueryResult<BaseItem> result)
{ {
var length = result.Items.Count; var length = result.Items.Count;
var serverItems = new ServerItem[length]; var serverItems = new ServerItem[length];
@ -1180,19 +1177,19 @@ namespace Emby.Dlna.ContentDirectory
serverItems[i] = new ServerItem(result.Items[i], null); serverItems[i] = new ServerItem(result.Items[i], null);
} }
return new QueryResult<ServerItem> return new QueryResult<ServerItem>(
{ startIndex,
TotalRecordCount = result.TotalRecordCount, result.TotalRecordCount,
Items = serverItems serverItems);
};
} }
/// <summary> /// <summary>
/// Converts a query result to a <see cref="QueryResult{ServerItem}"/>. /// Converts a query result to a <see cref="QueryResult{ServerItem}"/>.
/// </summary> /// </summary>
/// <param name="startIndex">The start index.</param>
/// <param name="result">A <see cref="QueryResult{BaseItem}"/>.</param> /// <param name="result">A <see cref="QueryResult{BaseItem}"/>.</param>
/// <returns>The <see cref="QueryResult{ServerItem}"/>.</returns> /// <returns>The <see cref="QueryResult{ServerItem}"/>.</returns>
private static QueryResult<ServerItem> ToResult(QueryResult<(BaseItem Item, ItemCounts ItemCounts)> result) private static QueryResult<ServerItem> ToResult(int? startIndex, QueryResult<(BaseItem Item, ItemCounts ItemCounts)> result)
{ {
var length = result.Items.Count; var length = result.Items.Count;
var serverItems = new ServerItem[length]; var serverItems = new ServerItem[length];
@ -1201,11 +1198,10 @@ namespace Emby.Dlna.ContentDirectory
serverItems[i] = new ServerItem(result.Items[i].Item, null); serverItems[i] = new ServerItem(result.Items[i].Item, null);
} }
return new QueryResult<ServerItem> return new QueryResult<ServerItem>(
{ startIndex,
TotalRecordCount = result.TotalRecordCount, result.TotalRecordCount,
Items = serverItems serverItems);
};
} }
/// <summary> /// <summary>

36
Emby.Server.Implementations/Channels/ChannelManager.cs
View File

@ -264,11 +264,10 @@ namespace Emby.Server.Implementations.Channels
} }
} }
return new QueryResult<Channel> return new QueryResult<Channel>(
{ query.StartIndex,
Items = all, totalCount,
TotalRecordCount = totalCount all);
};
} }
/// <inheritdoc /> /// <inheritdoc />
@ -285,11 +284,10 @@ namespace Emby.Server.Implementations.Channels
// TODO Fix The co-variant conversion (internalResult.Items) between Folder[] and BaseItem[], this can generate runtime issues. // TODO Fix The co-variant conversion (internalResult.Items) between Folder[] and BaseItem[], this can generate runtime issues.
var returnItems = _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user); var returnItems = _dtoService.GetBaseItemDtos(internalResult.Items, dtoOptions, user);
var result = new QueryResult<BaseItemDto> var result = new QueryResult<BaseItemDto>(
{ query.StartIndex,
Items = returnItems, internalResult.TotalRecordCount,
TotalRecordCount = internalResult.TotalRecordCount returnItems);
};
return result; return result;
} }
@ -620,11 +618,10 @@ namespace Emby.Server.Implementations.Channels
var returnItems = _dtoService.GetBaseItemDtos(items, query.DtoOptions, query.User); var returnItems = _dtoService.GetBaseItemDtos(items, query.DtoOptions, query.User);
var result = new QueryResult<BaseItemDto> var result = new QueryResult<BaseItemDto>(
{ query.StartIndex,
Items = returnItems, totalRecordCount,
TotalRecordCount = totalRecordCount returnItems);
};
return result; return result;
} }
@ -786,11 +783,10 @@ namespace Emby.Server.Implementations.Channels
var returnItems = _dtoService.GetBaseItemDtos(internalResult.Items, query.DtoOptions, query.User); var returnItems = _dtoService.GetBaseItemDtos(internalResult.Items, query.DtoOptions, query.User);
var result = new QueryResult<BaseItemDto> var result = new QueryResult<BaseItemDto>(
{ query.StartIndex,
Items = returnItems, internalResult.TotalRecordCount,
TotalRecordCount = internalResult.TotalRecordCount returnItems);
};
return result; return result;
} }

21
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@ -2810,11 +2810,10 @@ namespace Emby.Server.Implementations.Data
if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0)) if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0))
{ {
var returnList = GetItemList(query); var returnList = GetItemList(query);
return new QueryResult<BaseItem> return new QueryResult<BaseItem>(
{ query.StartIndex,
Items = returnList, returnList.Count,
TotalRecordCount = returnList.Count returnList);
};
} }
var now = DateTime.UtcNow; var now = DateTime.UtcNow;
@ -2978,6 +2977,7 @@ namespace Emby.Server.Implementations.Data
ReadTransactionMode); ReadTransactionMode);
} }
result.StartIndex = query.StartIndex ?? 0;
result.Items = list; result.Items = list;
return result; return result;
} }
@ -3265,11 +3265,10 @@ namespace Emby.Server.Implementations.Data
if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0)) if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0))
{ {
var returnList = GetItemIdsList(query); var returnList = GetItemIdsList(query);
return new QueryResult<Guid> return new QueryResult<Guid>(
{ query.StartIndex,
Items = returnList, returnList.Count,
TotalRecordCount = returnList.Count returnList);
};
} }
var now = DateTime.UtcNow; var now = DateTime.UtcNow;
@ -3395,6 +3394,7 @@ namespace Emby.Server.Implementations.Data
LogQueryTime("GetItemIds", commandText, now); LogQueryTime("GetItemIds", commandText, now);
result.StartIndex = query.StartIndex ?? 0;
result.Items = list; result.Items = list;
return result; return result;
} }
@ -5599,6 +5599,7 @@ AND Type = @InternalPersonType)");
result.TotalRecordCount = list.Count; result.TotalRecordCount = list.Count;
} }
result.StartIndex = query.StartIndex ?? 0;
result.Items = list; result.Items = list;
return result; return result;

16
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -1360,10 +1360,10 @@ namespace Emby.Server.Implementations.Library
return _itemRepository.GetItems(query); return _itemRepository.GetItems(query);
} }
return new QueryResult<BaseItem> return new QueryResult<BaseItem>(
{ query.StartIndex,
Items = _itemRepository.GetItemList(query) null,
}; _itemRepository.GetItemList(query));
} }
public List<Guid> GetItemIds(InternalItemsQuery query) public List<Guid> GetItemIds(InternalItemsQuery query)
@ -1493,10 +1493,10 @@ namespace Emby.Server.Implementations.Library
return _itemRepository.GetItems(query); return _itemRepository.GetItems(query);
} }
return new QueryResult<BaseItem> return new QueryResult<BaseItem>(
{ query.StartIndex,
Items = _itemRepository.GetItemList(query) null,
}; _itemRepository.GetItemList(query));
} }
private void SetTopParentIdsOrAncestors(InternalItemsQuery query, List<BaseItem> parents) private void SetTopParentIdsOrAncestors(InternalItemsQuery query, List<BaseItem> parents)

10
Emby.Server.Implementations/Library/SearchEngine.cs
View File

@ -48,12 +48,10 @@ namespace Emby.Server.Implementations.Library
results = results.GetRange(0, Math.Min(query.Limit.Value, results.Count)); results = results.GetRange(0, Math.Min(query.Limit.Value, results.Count));
} }
return new QueryResult<SearchHintInfo> return new QueryResult<SearchHintInfo>(
{ query.StartIndex,
TotalRecordCount = totalRecordCount, totalRecordCount,
results);
Items = results
};
} }
private static void AddIfMissing(List<BaseItemKind> list, BaseItemKind value) private static void AddIfMissing(List<BaseItemKind> list, BaseItemKind value)

60
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -857,11 +857,10 @@ namespace Emby.Server.Implementations.LiveTv
var returnArray = _dtoService.GetBaseItemDtos(queryResult.Items, options, user); var returnArray = _dtoService.GetBaseItemDtos(queryResult.Items, options, user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ query.StartIndex,
Items = returnArray, queryResult.TotalRecordCount,
TotalRecordCount = queryResult.TotalRecordCount returnArray);
};
} }
public QueryResult<BaseItem> GetRecommendedProgramsInternal(InternalItemsQuery query, DtoOptions options, CancellationToken cancellationToken) public QueryResult<BaseItem> GetRecommendedProgramsInternal(InternalItemsQuery query, DtoOptions options, CancellationToken cancellationToken)
@ -910,11 +909,10 @@ namespace Emby.Server.Implementations.LiveTv
programs = programs.Take(query.Limit.Value); programs = programs.Take(query.Limit.Value);
} }
return new QueryResult<BaseItem> return new QueryResult<BaseItem>(
{ query.StartIndex,
Items = programs.ToArray(), totalCount,
TotalRecordCount = totalCount programs.ToArray());
};
} }
public QueryResult<BaseItemDto> GetRecommendedPrograms(InternalItemsQuery query, DtoOptions options, CancellationToken cancellationToken) public QueryResult<BaseItemDto> GetRecommendedPrograms(InternalItemsQuery query, DtoOptions options, CancellationToken cancellationToken)
@ -928,11 +926,10 @@ namespace Emby.Server.Implementations.LiveTv
var internalResult = GetRecommendedProgramsInternal(query, options, cancellationToken); var internalResult = GetRecommendedProgramsInternal(query, options, cancellationToken);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ query.StartIndex,
Items = _dtoService.GetBaseItemDtos(internalResult.Items, options, query.User), internalResult.TotalRecordCount,
TotalRecordCount = internalResult.TotalRecordCount _dtoService.GetBaseItemDtos(internalResult.Items, options, query.User));
};
} }
private int GetRecommendationScore(LiveTvProgram program, User user, bool factorChannelWatchCount) private int GetRecommendationScore(LiveTvProgram program, User user, bool factorChannelWatchCount)
@ -1541,11 +1538,10 @@ namespace Emby.Server.Implementations.LiveTv
var returnArray = _dtoService.GetBaseItemDtos(internalResult.Items, options, user); var returnArray = _dtoService.GetBaseItemDtos(internalResult.Items, options, user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ query.StartIndex,
Items = returnArray, internalResult.TotalRecordCount,
TotalRecordCount = internalResult.TotalRecordCount returnArray);
};
} }
private async Task<QueryResult<TimerInfo>> GetTimersInternal(TimerQuery query, CancellationToken cancellationToken) private async Task<QueryResult<TimerInfo>> GetTimersInternal(TimerQuery query, CancellationToken cancellationToken)
@ -1615,11 +1611,7 @@ namespace Emby.Server.Implementations.LiveTv
.OrderBy(i => i.StartDate) .OrderBy(i => i.StartDate)
.ToArray(); .ToArray();
return new QueryResult<TimerInfo> return new QueryResult<TimerInfo>(returnArray);
{
Items = returnArray,
TotalRecordCount = returnArray.Length
};
} }
public async Task<QueryResult<TimerInfoDto>> GetTimers(TimerQuery query, CancellationToken cancellationToken) public async Task<QueryResult<TimerInfoDto>> GetTimers(TimerQuery query, CancellationToken cancellationToken)
@ -1701,11 +1693,7 @@ namespace Emby.Server.Implementations.LiveTv
.OrderBy(i => i.StartDate) .OrderBy(i => i.StartDate)
.ToArray(); .ToArray();
return new QueryResult<TimerInfoDto> return new QueryResult<TimerInfoDto>(returnArray);
{
Items = returnArray,
TotalRecordCount = returnArray.Length
};
} }
public async Task CancelTimer(string id) public async Task CancelTimer(string id)
@ -1801,11 +1789,7 @@ namespace Emby.Server.Implementations.LiveTv
.Select(i => i.Item1) .Select(i => i.Item1)
.ToArray(); .ToArray();
return new QueryResult<SeriesTimerInfo> return new QueryResult<SeriesTimerInfo>(returnArray);
{
Items = returnArray,
TotalRecordCount = returnArray.Length
};
} }
public async Task<QueryResult<SeriesTimerInfoDto>> GetSeriesTimers(SeriesTimerQuery query, CancellationToken cancellationToken) public async Task<QueryResult<SeriesTimerInfoDto>> GetSeriesTimers(SeriesTimerQuery query, CancellationToken cancellationToken)
@ -1855,11 +1839,7 @@ namespace Emby.Server.Implementations.LiveTv
}) })
.ToArray(); .ToArray();
return new QueryResult<SeriesTimerInfoDto> return new QueryResult<SeriesTimerInfoDto>(returnArray);
{
Items = returnArray,
TotalRecordCount = returnArray.Length
};
} }
public BaseItem GetLiveTvChannel(TimerInfo timer, ILiveTvService service) public BaseItem GetLiveTvChannel(TimerInfo timer, ILiveTvService service)

9
Emby.Server.Implementations/TV/TVSeriesManager.cs
View File

@ -304,11 +304,10 @@ namespace Emby.Server.Implementations.TV
items = items.Take(query.Limit.Value); items = items.Take(query.Limit.Value);
} }
return new QueryResult<BaseItem> return new QueryResult<BaseItem>(
{ query.StartIndex,
TotalRecordCount = totalCount, totalCount,
Items = items.ToArray() items.ToArray());
};
} }
} }
} }

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

@ -38,11 +38,7 @@ namespace Jellyfin.Api.Controllers
{ {
var keys = await _authenticationManager.GetApiKeys(); var keys = await _authenticationManager.GetApiKeys();
return new QueryResult<AuthenticationInfo> return new QueryResult<AuthenticationInfo>(keys);
{
Items = keys,
TotalRecordCount = keys.Count
};
} }
/// <summary> /// <summary>

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

@ -243,11 +243,10 @@ namespace Jellyfin.Api.Controllers
return dto; return dto;
}); });
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ query.StartIndex,
Items = dtos.ToArray(), result.TotalRecordCount,
TotalRecordCount = result.TotalRecordCount dtos.ToArray());
};
} }
/// <summary> /// <summary>
@ -447,11 +446,10 @@ namespace Jellyfin.Api.Controllers
return dto; return dto;
}); });
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ query.StartIndex,
Items = dtos.ToArray(), result.TotalRecordCount,
TotalRecordCount = result.TotalRecordCount dtos.ToArray());
};
} }
/// <summary> /// <summary>

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

@ -341,10 +341,7 @@ namespace Jellyfin.Api.Controllers
{ {
var list = items; var list = items;
var result = new QueryResult<BaseItemDto> var totalCount = list.Count;
{
TotalRecordCount = list.Count
};
if (limit.HasValue && limit < list.Count) if (limit.HasValue && limit < list.Count)
{ {
@ -353,7 +350,10 @@ namespace Jellyfin.Api.Controllers
var returnList = _dtoService.GetBaseItemDtos(list, dtoOptions, user); var returnList = _dtoService.GetBaseItemDtos(list, dtoOptions, user);
result.Items = returnList; var result = new QueryResult<BaseItemDto>(
0,
totalCount,
returnList);
return result; return result;
} }

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

@ -491,10 +491,13 @@ namespace Jellyfin.Api.Controllers
else else
{ {
var itemsArray = folder.GetChildren(user, true); var itemsArray = folder.GetChildren(user, true);
result = new QueryResult<BaseItem> { Items = itemsArray, TotalRecordCount = itemsArray.Count, StartIndex = 0 }; result = new QueryResult<BaseItem>(itemsArray);
} }
return new QueryResult<BaseItemDto> { StartIndex = startIndex.GetValueOrDefault(), TotalRecordCount = result.TotalRecordCount, Items = _dtoService.GetBaseItemDtos(result.Items, dtoOptions, user) }; return new QueryResult<BaseItemDto>(
startIndex,
result.TotalRecordCount,
_dtoService.GetBaseItemDtos(result.Items, dtoOptions, user));
} }
/// <summary> /// <summary>
@ -836,12 +839,10 @@ namespace Jellyfin.Api.Controllers
var returnItems = _dtoService.GetBaseItemDtos(itemsResult.Items, dtoOptions, user); var returnItems = _dtoService.GetBaseItemDtos(itemsResult.Items, dtoOptions, user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ startIndex,
StartIndex = startIndex.GetValueOrDefault(), itemsResult.TotalRecordCount,
TotalRecordCount = itemsResult.TotalRecordCount, returnItems);
Items = returnItems
};
} }
} }
} }

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

@ -506,13 +506,8 @@ namespace Jellyfin.Api.Controllers
} }
var dtoOptions = new DtoOptions().AddClientFields(Request); var dtoOptions = new DtoOptions().AddClientFields(Request);
var result = new QueryResult<BaseItemDto> var resultArray = _dtoService.GetBaseItemDtos(items, dtoOptions);
{ return new QueryResult<BaseItemDto>(resultArray);
TotalRecordCount = items.Count,
Items = items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions)).ToArray()
};
return result;
} }
/// <summary> /// <summary>
@ -759,11 +754,10 @@ namespace Jellyfin.Api.Controllers
var returnList = _dtoService.GetBaseItemDtos(itemsResult, dtoOptions, user); var returnList = _dtoService.GetBaseItemDtos(itemsResult, dtoOptions, user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ query.StartIndex,
Items = returnList, itemsResult.Count,
TotalRecordCount = itemsResult.Count returnList);
};
} }
/// <summary> /// <summary>

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

@ -193,11 +193,10 @@ namespace Jellyfin.Api.Controllers
dtoOptions.AddCurrentProgram = addCurrentProgram; dtoOptions.AddCurrentProgram = addCurrentProgram;
var returnArray = _dtoService.GetBaseItemDtos(channelResult.Items, dtoOptions, user); var returnArray = _dtoService.GetBaseItemDtos(channelResult.Items, dtoOptions, user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ startIndex,
Items = returnArray, channelResult.TotalRecordCount,
TotalRecordCount = channelResult.TotalRecordCount returnArray);
};
} }
/// <summary> /// <summary>
@ -390,11 +389,7 @@ namespace Jellyfin.Api.Controllers
var returnArray = _dtoService.GetBaseItemDtos(folders, new DtoOptions(), user); var returnArray = _dtoService.GetBaseItemDtos(folders, new DtoOptions(), user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(returnArray);
{
Items = returnArray,
TotalRecordCount = returnArray.Count
};
} }
/// <summary> /// <summary>

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

@ -101,11 +101,7 @@ namespace Jellyfin.Api.Controllers
Limit = limit ?? 0 Limit = limit ?? 0
}); });
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(peopleItems.Select(person => _dtoService.GetItemByNameDto(person, dtoOptions, null, user)).ToArray());
{
Items = peopleItems.Select(person => _dtoService.GetItemByNameDto(person, dtoOptions, null, user)).ToArray(),
TotalRecordCount = peopleItems.Count
};
} }
/// <summary> /// <summary>

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

@ -208,11 +208,10 @@ namespace Jellyfin.Api.Controllers
dtos[index].PlaylistItemId = items[index].Item1.Id; dtos[index].PlaylistItemId = items[index].Item1.Id;
} }
var result = new QueryResult<BaseItemDto> var result = new QueryResult<BaseItemDto>(
{ startIndex,
Items = dtos, count,
TotalRecordCount = count dtos);
};
return result; return result;
} }

9
Jellyfin.Api/Controllers/SuggestionsController.cs
View File

@ -81,11 +81,10 @@ namespace Jellyfin.Api.Controllers
var dtoList = _dtoService.GetBaseItemDtos(result.Items, dtoOptions, user); var dtoList = _dtoService.GetBaseItemDtos(result.Items, dtoOptions, user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ startIndex,
TotalRecordCount = result.TotalRecordCount, result.TotalRecordCount,
Items = dtoList dtoList);
};
} }
} }
} }

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

@ -110,11 +110,10 @@ namespace Jellyfin.Api.Controllers
var returnItems = _dtoService.GetBaseItemDtos(result.Items, options, user); var returnItems = _dtoService.GetBaseItemDtos(result.Items, options, user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ startIndex,
TotalRecordCount = result.TotalRecordCount, result.TotalRecordCount,
Items = returnItems returnItems);
};
} }
/// <summary> /// <summary>
@ -169,11 +168,10 @@ namespace Jellyfin.Api.Controllers
var returnItems = _dtoService.GetBaseItemDtos(itemsResult, options, user); var returnItems = _dtoService.GetBaseItemDtos(itemsResult, options, user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ startIndex,
TotalRecordCount = itemsResult.Count, itemsResult.Count,
Items = returnItems returnItems);
};
} }
/// <summary> /// <summary>
@ -296,11 +294,10 @@ namespace Jellyfin.Api.Controllers
var dtos = _dtoService.GetBaseItemDtos(returnItems, dtoOptions, user); var dtos = _dtoService.GetBaseItemDtos(returnItems, dtoOptions, user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ startIndex,
TotalRecordCount = episodes.Count, episodes.Count,
Items = dtos dtos);
};
} }
/// <summary> /// <summary>
@ -354,11 +351,7 @@ namespace Jellyfin.Api.Controllers
var returnItems = _dtoService.GetBaseItemDtos(seasons, dtoOptions, user); var returnItems = _dtoService.GetBaseItemDtos(seasons, dtoOptions, user);
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(returnItems);
{
TotalRecordCount = returnItems.Count,
Items = returnItems
};
} }
/// <summary> /// <summary>

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

@ -124,11 +124,7 @@ namespace Jellyfin.Api.Controllers
var dtoOptions = new DtoOptions().AddClientFields(Request); var dtoOptions = new DtoOptions().AddClientFields(Request);
var dtos = items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user)).ToArray(); var dtos = items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user)).ToArray();
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(dtos);
{
Items = dtos,
TotalRecordCount = dtos.Length
};
} }
/// <summary> /// <summary>

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

@ -108,11 +108,7 @@ namespace Jellyfin.Api.Controllers
var dtos = folders.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user)) var dtos = folders.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user))
.ToArray(); .ToArray();
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(dtos);
{
Items = dtos,
TotalRecordCount = dtos.Length
};
} }
/// <summary> /// <summary>

7
Jellyfin.Api/Controllers/VideosController.cs
View File

@ -134,12 +134,7 @@ namespace Jellyfin.Api.Controllers
items = Array.Empty<BaseItemDto>(); items = Array.Empty<BaseItemDto>();
} }
var result = new QueryResult<BaseItemDto> var result = new QueryResult<BaseItemDto>(items);
{
Items = items,
TotalRecordCount = items.Length
};
return result; return result;
} }

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

@ -136,8 +136,6 @@ namespace Jellyfin.Api.Controllers
IEnumerable<BaseItem> ibnItems = ibnItemsArray; IEnumerable<BaseItem> ibnItems = ibnItemsArray;
var result = new QueryResult<BaseItemDto> { TotalRecordCount = ibnItemsArray.Count };
if (startIndex.HasValue || limit.HasValue) if (startIndex.HasValue || limit.HasValue)
{ {
if (startIndex.HasValue) if (startIndex.HasValue)
@ -155,8 +153,10 @@ namespace Jellyfin.Api.Controllers
var dtos = tuples.Select(i => _dtoService.GetItemByNameDto(i.Item1, dtoOptions, i.Item2, user)); var dtos = tuples.Select(i => _dtoService.GetItemByNameDto(i.Item1, dtoOptions, i.Item2, user));
result.Items = dtos.Where(i => i != null).ToArray(); var result = new QueryResult<BaseItemDto>(
startIndex,
ibnItemsArray.Count,
dtos.Where(i => i != null).ToArray());
return result; return result;
} }

9
Jellyfin.Api/Helpers/RequestHelpers.cs
View File

@ -131,11 +131,10 @@ namespace Jellyfin.Api.Helpers
return dto; return dto;
}); });
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>(
{ result.StartIndex,
Items = dtos.ToArray(), result.TotalRecordCount,
TotalRecordCount = result.TotalRecordCount dtos.ToArray());
};
} }
} }
} }

11
Jellyfin.Server.Implementations/Activity/ActivityManager.cs
View File

@ -59,17 +59,16 @@ namespace Jellyfin.Server.Implementations.Activity
entries = entries.Where(entry => entry.UserId != Guid.Empty == query.HasUserId.Value ); entries = entries.Where(entry => entry.UserId != Guid.Empty == query.HasUserId.Value );
} }
return new QueryResult<ActivityLogEntry> return new QueryResult<ActivityLogEntry>(
{ query.Skip,
Items = await entries await entries.CountAsync().ConfigureAwait(false),
await entries
.Skip(query.Skip ?? 0) .Skip(query.Skip ?? 0)
.Take(query.Limit ?? 100) .Take(query.Limit ?? 100)
.AsAsyncEnumerable() .AsAsyncEnumerable()
.Select(ConvertToOldModel) .Select(ConvertToOldModel)
.ToListAsync() .ToListAsync()
.ConfigureAwait(false), .ConfigureAwait(false));
TotalRecordCount = await entries.CountAsync().ConfigureAwait(false)
};
} }
/// <inheritdoc /> /// <inheritdoc />

20
Jellyfin.Server.Implementations/Devices/DeviceManager.cs
View File

@ -145,12 +145,10 @@ namespace Jellyfin.Server.Implementations.Devices
devices = devices.Take(query.Limit.Value); devices = devices.Take(query.Limit.Value);
} }
return new QueryResult<Device> return new QueryResult<Device>(
{ query.Skip,
Items = await devices.ToListAsync().ConfigureAwait(false), count,
StartIndex = query.Skip ?? 0, await devices.ToListAsync().ConfigureAwait(false));
TotalRecordCount = count
};
} }
/// <inheritdoc /> /// <inheritdoc />
@ -158,12 +156,10 @@ namespace Jellyfin.Server.Implementations.Devices
{ {
var devices = await GetDevices(query).ConfigureAwait(false); var devices = await GetDevices(query).ConfigureAwait(false);
return new QueryResult<DeviceInfo> return new QueryResult<DeviceInfo>(
{ devices.StartIndex,
Items = devices.Items.Select(device => ToDeviceInfo(device)).ToList(), devices.TotalRecordCount,
StartIndex = devices.StartIndex, devices.Items.Select(device => ToDeviceInfo(device)).ToList());
TotalRecordCount = devices.TotalRecordCount
};
} }
/// <inheritdoc /> /// <inheritdoc />

9
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -783,11 +783,10 @@ namespace MediaBrowser.Controller.Entities
returnItems = returnItems.Skip(startIndex.Value); returnItems = returnItems.Skip(startIndex.Value);
} }
return new QueryResult<BaseItem> return new QueryResult<BaseItem>(
{ query.StartIndex,
TotalRecordCount = totalCount, totalCount,
Items = returnItems.ToArray() returnItems.ToArray());
};
} }
private bool RequiresPostFiltering2(InternalItemsQuery query) private bool RequiresPostFiltering2(InternalItemsQuery query)

26
MediaBrowser.Controller/Entities/UserViewBuilder.cs
View File

@ -238,12 +238,7 @@ namespace MediaBrowser.Controller.Entities
private QueryResult<BaseItem> ConvertToResult(List<BaseItem> items) private QueryResult<BaseItem> ConvertToResult(List<BaseItem> items)
{ {
var arr = items.ToArray(); return new QueryResult<BaseItem>(items);
return new QueryResult<BaseItem>
{
Items = arr,
TotalRecordCount = arr.Length
};
} }
private QueryResult<BaseItem> GetMovieGenres(Folder parent, User user, InternalItemsQuery query) private QueryResult<BaseItem> GetMovieGenres(Folder parent, User user, InternalItemsQuery query)
@ -414,16 +409,6 @@ namespace MediaBrowser.Controller.Entities
return _libraryManager.GetItemsResult(query); return _libraryManager.GetItemsResult(query);
} }
private QueryResult<BaseItem> GetResult<T>(QueryResult<T> result)
where T : BaseItem
{
return new QueryResult<BaseItem>
{
Items = result.Items, // TODO Fix The co-variant conversion between T[] and BaseItem[], this can generate runtime issues if T is not BaseItem.
TotalRecordCount = result.TotalRecordCount
};
}
private QueryResult<BaseItem> GetResult<T>( private QueryResult<BaseItem> GetResult<T>(
IEnumerable<T> items, IEnumerable<T> items,
InternalItemsQuery query) InternalItemsQuery query)
@ -483,11 +468,10 @@ namespace MediaBrowser.Controller.Entities
itemsArray = itemsArray.Skip(query.StartIndex.Value).ToArray(); itemsArray = itemsArray.Skip(query.StartIndex.Value).ToArray();
} }
return new QueryResult<BaseItem> return new QueryResult<BaseItem>(
{ query.StartIndex,
TotalRecordCount = totalCount, totalCount,
Items = itemsArray itemsArray);
};
} }
public static bool Filter(BaseItem item, User user, InternalItemsQuery query, IUserDataManager userDataManager, ILibraryManager libraryManager) public static bool Filter(BaseItem item, User user, InternalItemsQuery query, IUserDataManager userDataManager, ILibraryManager libraryManager)

7
MediaBrowser.Model/Querying/QueryResult.cs
View File

@ -19,6 +19,13 @@ namespace MediaBrowser.Model.Querying
TotalRecordCount = items.Count; TotalRecordCount = items.Count;
} }
public QueryResult(int? startIndex, int? totalRecordCount, IReadOnlyList<T> items)
{
StartIndex = startIndex ?? 0;
TotalRecordCount = totalRecordCount ?? items.Count;
Items = items;
}
/// <summary> /// <summary>
/// Gets or sets the items. /// Gets or sets the items.
/// </summary> /// </summary>