Merge pull request #1864 from MediaBrowser/dev

Dev

1 files changed, 21 insertions, 1 deletions

diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 006cb2edf..e98bb49d6 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -1742,7 +1742,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             return " from TypedBaseItems A";
         }
 
-        public IEnumerable<BaseItem> GetItemList(InternalItemsQuery query)
+        public List<BaseItem> GetItemList(InternalItemsQuery query)
         {
             if (query == null)
             {
@@ -1842,6 +1842,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             CheckDisposed();
 
+            if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0))
+            {
+                var list = GetItemList(query);
+                return new QueryResult<BaseItem>
+                {
+                    Items = list.ToArray(),
+                    TotalRecordCount = list.Count
+                };
+            }
+
             var now = DateTime.UtcNow;
 
             using (var cmd = _connection.CreateCommand())
@@ -2196,6 +2206,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             CheckDisposed();
 
+            if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0))
+            {
+                var list = GetItemIdsList(query);
+                return new QueryResult<Guid>
+                {
+                    Items = list.ToArray(),
+                    TotalRecordCount = list.Count
+                };
+            }
+
             var now = DateTime.UtcNow;
 
             using (var cmd = _connection.CreateCommand())