From a60cb280a3d31ba19ffb3a94cf83ef300a7473b7 Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Thu, 20 Jan 2022 08:46:17 -0700
Subject: Properly populate QueryResult

---
 MediaBrowser.Controller/Entities/Folder.cs         |  9 ++++----
 .../Entities/UserViewBuilder.cs                    | 26 +++++-----------------
 2 files changed, 9 insertions(+), 26 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 55551e70ee..79ffddc005 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -783,11 +783,10 @@ namespace MediaBrowser.Controller.Entities
                 returnItems = returnItems.Skip(startIndex.Value);
             }
 
-            return new QueryResult<BaseItem>
-            {
-                TotalRecordCount = totalCount,
-                Items = returnItems.ToArray()
-            };
+            return new QueryResult<BaseItem>(
+                query.StartIndex,
+                totalCount,
+                returnItems.ToArray());
         }
 
         private bool RequiresPostFiltering2(InternalItemsQuery query)
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index fe44f1169e..279206da48 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -238,12 +238,7 @@ namespace MediaBrowser.Controller.Entities
 
         private QueryResult<BaseItem> ConvertToResult(List<BaseItem> items)
         {
-            var arr = items.ToArray();
-            return new QueryResult<BaseItem>
-            {
-                Items = arr,
-                TotalRecordCount = arr.Length
-            };
+            return new QueryResult<BaseItem>(items);
         }
 
         private QueryResult<BaseItem> GetMovieGenres(Folder parent, User user, InternalItemsQuery query)
@@ -414,16 +409,6 @@ namespace MediaBrowser.Controller.Entities
             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>(
             IEnumerable<T> items,
             InternalItemsQuery query)
@@ -483,11 +468,10 @@ namespace MediaBrowser.Controller.Entities
                 itemsArray = itemsArray.Skip(query.StartIndex.Value).ToArray();
             }
 
-            return new QueryResult<BaseItem>
-            {
-                TotalRecordCount = totalCount,
-                Items = itemsArray
-            };
+            return new QueryResult<BaseItem>(
+                query.StartIndex,
+                totalCount,
+                itemsArray);
         }
 
         public static bool Filter(BaseItem item, User user, InternalItemsQuery query, IUserDataManager userDataManager, ILibraryManager libraryManager)
-- 
cgit v1.2.3