Merge pull request #5095 from Bond-009/sortorder

(cherry picked from commit 98a4e1b8402c37703344113e302167b5e2721d5f)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>

1 files changed, 13 insertions, 8 deletions

diff --git a/Jellyfin.Api/Helpers/RequestHelpers.cs b/Jellyfin.Api/Helpers/RequestHelpers.cs
index 056ad83da..cd1e31e80 100644
--- a/Jellyfin.Api/Helpers/RequestHelpers.cs
+++ b/Jellyfin.Api/Helpers/RequestHelpers.cs
@@ -25,22 +25,27 @@ 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 first specified SortOrder
+            // or the default one if no SortOrders are specified
+            var order = requestedSortOrder.Count > 0 ? requestedSortOrder[0] : SortOrder.Ascending;
+            for (; i < sortBy.Count; i++)
+            {
+                result[i] = (sortBy[i], order);
             }
 
             return result;