starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-26 18:54:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix GetOrderBy and add tests

Browse Source
This commit is contained in:
Bond_009
2021-01-24 11:43:05 +01:00
parent b4d04f9ca5
commit d24e7f60c7
2 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,22 +25,25 @@ namespace Jellyfin.Api.Helpers
/// <param name="sortBy">Sort By. Comma delimited string.</param>
/// <param name="requestedSortOrder">Sort Order. Comma delimited string.</param>
/// <returns>Order By.</returns>
public static ValueTuple<string, SortOrder>[] GetOrderBy(IReadOnlyList<string> sortBy, IReadOnlyList<SortOrder> requestedSortOrder)
public static (string, SortOrder)[] GetOrderBy(IReadOnlyList<string> sortBy, IReadOnlyList<SortOrder> requestedSortOrder)
{
if (sortBy.Count == 0)
{
return Array.Empty<ValueTuple<string, SortOrder>>();
}
var result = new ValueTuple<string, SortOrder>[sortBy.Count];
for (var i = 0; i < sortBy.Count; i++)
var result = new (string, SortOrder)[sortBy.Count];
var i = 0;
// Add elements which have a SortOrder specified
for (; i < requestedSortOrder.Count; i++)
{
var sortOrderIndex = requestedSortOrder.Count > i ? i : 0;
result[i] = (sortBy[i], requestedSortOrder[i]);
}
var sortOrder = requestedSortOrder.Count > sortOrderIndex
? requestedSortOrder[sortOrderIndex]
: SortOrder.Ascending;
result[i] = new ValueTuple<string, SortOrder>(sortBy[i], sortOrder);
// Add remaining elements with the default SortOrder
for (; i < sortBy.Count; i++)
{
result[i] = (sortBy[i], SortOrder.Ascending);
}
return result;