fixed count limiters

Author: jensenkd

Source/Plex.Api/Clients/ClientUtilities.cs

@@ -4,6 +4,12 @@ namespace Plex.Api.Clients
 
     public static class ClientUtilities
     {
+        /// <summary>
+        /// Build Client Limit Headers
+        /// </summary>
+        /// <param name="from">Start Record</param>
+        /// <param name="to">Number of records to return</param>
+        /// <returns></returns>
         public static  Dictionary<string, string> GetClientLimitHeaders(int from, int to)
         {
             var plexHeaders = new Dictionary<string, string>
@@ -15,6 +21,11 @@ public static  Dictionary<string, string> GetClientLimitHeaders(int from, int to
             return plexHeaders;
         }
 
+        /// <summary>
+        /// Get Client Identifier Header
+        /// </summary>
+        /// <param name="clientId">Client Id</param>
+        /// <returns></returns>
         public static Dictionary<string, string> GetClientIdentifierHeader(string clientId)
         {
             var plexHeaders = new Dictionary<string, string>
@@ -24,6 +35,11 @@ public static Dictionary<string, string> GetClientIdentifierHeader(string client
             return plexHeaders;
         }
 
+        /// <summary>
+        /// Get Client Options Header
+        /// </summary>
+        /// <param name="clientOptions">Client Options</param>
+        /// <returns></returns>
         public static Dictionary<string, string> GetClientMetaHeaders(ClientOptions clientOptions)
         {
             var plexHeaders = new Dictionary<string, string>

Source/Plex.Api/Clients/PlexLibraryClient.cs

@@ -1,6 +1,7 @@
 namespace Plex.Api.Clients
 {
     using System.Collections.Generic;
+    using System.Net;
     using System.Net.Http;
     using System.Threading.Tasks;
     using Api;
@@ -93,32 +94,47 @@ public async Task<MediaContainer> LibrarySearch(string authToken, string plexSer
             {
                 {"title", title},
                 {"sort", sort},
-                {"libtype", libraryType},
-                {"container_start", start.ToString()},
-                {"max_results", count.ToString()}
+                {"libtype", libraryType}
             };
 
             foreach (var item in filters)
             {
                 queryParams.Add(item.Key, item.Value);
             }
 
-            return await this.FetchWithWrapper<MediaContainer>(plexServerHost, $"library/sections/{libraryKey}/all",
-                authToken, HttpMethod.Get, queryParams);
+            var apiRequest =
+                new ApiRequestBuilder(plexServerHost, $"library/sections/{libraryKey}/all", HttpMethod.Get)
+                    .AddPlexToken(authToken)
+                    .AddQueryParams(queryParams)
+                    .AddQueryParams(ClientUtilities.GetClientIdentifierHeader(this.clientOptions.ClientId))
+                    .AddQueryParams(ClientUtilities.GetClientLimitHeaders(start, count))
+                    .AcceptJson()
+                    .Build();
+
+            var wrapper = await this.apiService.InvokeApiAsync<GenericWrapper<MediaContainer>>(apiRequest);
+            return wrapper.Container;
         }
 
         /// <inheritdoc/>
         public async Task<MediaContainer> GetAll(string authToken, string plexServerHost, string key, string sort, int start, int count)
         {
             var queryParams = new Dictionary<string, string>
             {
-                {"sort", sort},
-                {"container_start", start.ToString()},
-                {"max_results", count.ToString()}
+                {"sort", sort}
             };
 
-            return await this.FetchWithWrapper<MediaContainer>(plexServerHost, $"library/sections/{key}/all",
-                authToken, HttpMethod.Get, queryParams);
+            var apiRequest =
+                new ApiRequestBuilder(plexServerHost, $"library/sections/{key}/all", HttpMethod.Get)
+                    .AddPlexToken(authToken)
+                    .AddQueryParams(queryParams)
+                    .AddQueryParams(ClientUtilities.GetClientIdentifierHeader(this.clientOptions.ClientId))
+                    .AddQueryParams(ClientUtilities.GetClientLimitHeaders(start, count))
+                    .AcceptJson()
+                    .Build();
+
+            var wrapper = await this.apiService.InvokeApiAsync<GenericWrapper<MediaContainer>>(apiRequest);
+
+            return wrapper.Container;
         }
 
         private async Task<T> FetchWithWrapper<T>(string baseUrl, string endpoint, string authToken, HttpMethod method,

Tests/Plex.Api.Test/Tests/LibraryTest.cs

@@ -108,17 +108,19 @@ public async void Test_LibrarySearchByName()
             var library = this.fixture.Server.Libraries().Result.Single(c => c.Title == "Movies");
 
             const string title = "Harry Potter";
+            const int start = 0;
+            const int count = 2;
             var filters = new Dictionary<string, string>();
 
-            var items = await library.Search(title, "audienceRating:desc", string.Empty, filters);
+            var items = await library.Search(title, "audienceRating:desc", string.Empty, filters, start, count);
             foreach (var item in items.Media)
             {
                 this.output.WriteLine("Title: " + item.Title);
                 this.output.WriteLine("Year: " + item.Year);
                 this.output.WriteLine("Rating: " + item.AudienceRating);
             }
             Assert.NotNull(items);
-            Assert.Equal(8, items.Media.Count);
+            Assert.Equal(count, items.Media.Count);
         }
 
         [Fact]