fixup! New: (Cardigann) Paging Support

Co-Authored-By: Bogdan <mynameisbogdan@users.noreply.github.com>

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.3.0'
+  majorVersion: '1.3.1'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'

src/NzbDrone.Common/Extensions/StringExtensions.cs

@@ -257,5 +257,18 @@ namespace NzbDrone.Common.Extensions
         {
             return input.Contains(':') ? $"[{input}]" : input;
         }
+
+        public static bool IsAllDigits(this string input)
+        {
+            foreach (var c in input)
+            {
+                if (c < '0' || c > '9')
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListRequestGeneratorFixture.cs

@@ -68,9 +68,9 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
         {
             var results = Subject.GetSearchRequests(new MovieSearchCriteria { Categories = new[] { NewznabStandardCategory.MoviesSD.Id, NewznabStandardCategory.MoviesDVD.Id } });
 
-            results.GetAllTiers().Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetAllTiers().First().First();
+            var page = results.First();
 
             page.Url.Query.Should().Contain("&category=1%2C2");
         }
@@ -81,9 +81,9 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
             _movieSearchCriteria.ImdbId = "0076759";
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
 
-            results.GetAllTiers().Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetAllTiers().First().First();
+            var page = results.First();
 
             page.Url.Query.Should().Contain("type=imdb");
             page.Url.Query.Should().Contain("query=tt0076759");
@@ -96,9 +96,9 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
 
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
 
-            results.GetAllTiers().Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetAllTiers().First().First();
+            var page = results.First();
 
             page.Url.Query.Should().Contain("type=name");
             page.Url.Query.Should().Contain("query=Star+Wars");

src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsRequestGeneratorFixture.cs

@@ -76,9 +76,9 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
             var imdbQuery = int.Parse(_movieSearchCriteria.ImdbId);
 
-            results.GetAllTiers().Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetAllTiers().First().First();
+            var page = results.First();
 
             var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);
 
@@ -95,9 +95,9 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
             var results = Subject.GetSearchRequests(_tvSearchSeasonEpisodeCriteria);
             var tvdbQuery = _tvSearchSeasonEpisodeCriteria.TvdbId;
 
-            results.GetAllTiers().Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetAllTiers().First().First();
+            var page = results.First();
 
             var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);
 
@@ -117,9 +117,9 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
             var results = Subject.GetSearchRequests(_tvSearchDailyEpisodeCriteria);
             var tvdbQuery = _tvSearchDailyEpisodeCriteria.TvdbId;
 
-            results.GetAllTiers().Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetAllTiers().First().First();
+            var page = results.First();
 
             var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);
 

src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs

@@ -51,9 +51,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             _movieSearchCriteria.Offset = 0;
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
 
-            results.GetAllTiers().Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var pages = results.GetAllTiers().First().Take(3).ToList();
+            var pages = results.Take(3).ToList();
 
             pages[0].Url.FullUri.Should().Contain("&offset=0");
         }
@@ -63,9 +63,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
         {
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
 
-            results.GetAllTiers().Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var pages = results.GetAllTiers().First().Take(500).ToList();
+            var pages = results.Take(500).ToList();
 
             pages.Count.Should().BeLessThan(500);
         }
@@ -77,9 +77,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
 
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
 
-            results.GetAllTiers().Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetAllTiers().First().First();
+            var page = results.First();
 
             page.Url.Query.Should().NotContain("imdbid=0076759");
             page.Url.Query.Should().Contain("q=Star");
@@ -92,9 +92,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q, MovieSearchParam.ImdbId };
 
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.GetTier(0).Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetAllTiers().First().First();
+            var page = results.First();
 
             page.Url.Query.Should().Contain("imdbid=0076759");
         }
@@ -106,9 +106,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q, MovieSearchParam.TmdbId };
 
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.GetTier(0).Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetAllTiers().First().First();
+            var page = results.First();
 
             page.Url.Query.Should().Contain("tmdbid=11");
         }
@@ -120,9 +120,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId };
 
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.GetTier(0).Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetAllTiers().First().First();
+            var page = results.First();
 
             page.Url.Query.Should().Contain("tmdbid=11");
             page.Url.Query.Should().NotContain("imdbid=0076759");
@@ -136,9 +136,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId };
 
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.GetTier(0).Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetTier(0).First().First();
+            var page = results.First();
 
             page.Url.Query.Should().Contain("tmdbid=11");
             page.Url.Query.Should().Contain("imdbid=0076759");
@@ -150,10 +150,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q };
 
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.Tiers.Should().Be(1);
-            results.GetTier(0).Should().HaveCount(1);
+            results.Should().HaveCount(1);
 
-            var page = results.GetTier(0).First().First();
+            var page = results.First();
 
             page.Url.Query.Should().Contain("q=");
         }
@@ -167,7 +166,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
 
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
 
-            var page = results.GetTier(0).First().First();
+            var page = results.First();
 
             page.Url.Query.Should().Contain("q=");
         }
@@ -178,9 +177,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             _capabilities.MovieSearchParams = new List<MovieSearchParam> { MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId };
 
             var results = Subject.GetSearchRequests(_movieSearchCriteria);
-            results.Tiers.Should().Be(1);
+            results.Should().HaveCount(1);
 
-            var pageTier2 = results.GetTier(0).First().First();
+            var pageTier2 = results.First();
 
             pageTier2.Url.Query.Should().NotContain("tmdbid=11");
             pageTier2.Url.Query.Should().NotContain("imdbid=0076759");
@@ -193,9 +192,9 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             _capabilities.TvSearchParams = new List<TvSearchParam> { TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep };
 
             var results = Subject.GetSearchRequests(_tvSearchCriteria);
-            results.Tiers.Should().Be(1);
+            results.Should().HaveCount(1);
 
-            var pageTier = results.GetTier(0).First().First();
+            var pageTier = results.First();
 
             pageTier.Url.Query.Should().Contain("season=00");
         }

src/NzbDrone.Core.Test/ParserTests/DateTimeUtilFixture.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Globalization;
+using System.Threading;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Parser;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.ParserTests
+{
+    [TestFixture]
+    public class DateTimeUtilFixture : CoreTest
+    {
+        [TestCase("pt-BR")]
+        [TestCase("en-US")]
+        public void should_format_date_invariant(string culture)
+        {
+            Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
+
+            var dateNow = DateTime.Now;
+
+            DateTimeUtil.FromUnknown(dateNow.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture))
+                .ToString(DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture)
+                .Should().Be(dateNow.ToString("ddd, dd MMM yyyy HH':'mm':'ss z", CultureInfo.InvariantCulture));
+        }
+
+        [TestCase("2022-08-08 02:07:39 -02:00", "2006-01-02 15:04:05 -07:00", "yyyy-MM-dd HH:mm:ss zzz", "2022-08-08 04:07:39 +00:00")]
+        [TestCase("2022-08-08 02:07:39 -02:00", "yyyy-MM-dd HH:mm:ss zzz", "yyyy-MM-dd HH:mm:ss zzz", "2022-08-08 04:07:39 +00:00")]
+        [TestCase("2022-08-08 -02:00", "2006-01-02 -07:00", "yyyy-MM-dd zzz", "2022-08-08 +00:00")]
+        [TestCase("2022-08-08 -02:00", "yyyy-MM-dd zzz", "yyyy-MM-dd zzz", "2022-08-08 +00:00")]
+        [TestCase("02:07:39 -02:00", "15:04:05 -07:00", "HH:mm:ss zzz", "04:07:39 +00:00")]
+        [TestCase("02:07:39 -02:00", "HH:mm:ss zzz", "HH:mm:ss zzz", "04:07:39 +00:00")]
+        [TestCase("-02:00", "zzz", "zzz", "+00:00")]
+        [TestCase("-02:00", "-07:00", "zzz", "+00:00")]
+        public void parse_datetime_golang(string dateInput, string format, string standardFormat, string expectedDate)
+        {
+            DateTimeUtil.ParseDateTimeGoLang(dateInput, format)
+                .ToUniversalTime()
+                .ToString(standardFormat, CultureInfo.InvariantCulture)
+                .Should().Be(expectedDate);
+        }
+    }
+}

src/NzbDrone.Core.Test/ParserTests/ParseUtilFixture.cs

@@ -52,5 +52,16 @@ namespace NzbDrone.Core.Test.ParserTests
         {
             ParseUtil.CoerceDouble(original).Should().Be(parsedInt);
         }
+
+        [TestCase(null, null)]
+        [TestCase("", null)]
+        [TestCase("1", 1)]
+        [TestCase("1000 grabs", 1000)]
+        [TestCase("asdf123asdf", 123)]
+        [TestCase("asdf123asdf456asdf", 123)]
+        public void should_parse_long_from_string(string original, long? parsedInt)
+        {
+            ParseUtil.GetLongFromString(original).Should().Be(parsedInt);
+        }
     }
 }

src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs

@@ -15,12 +15,12 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
         public string SearchTerm { get; set; }
         public int[] Categories { get; set; }
         public string SearchType { get; set; }
-        public int? Limit { get; set; }
-        public int? Offset { get; set; }
+        public int Limit { get; set; }
+        public int Offset { get; set; }
         public string Source { get; set; }
         public string Host { get; set; }
 
-        public override string ToString() => $"{SearchQuery}, Offset: {Offset ?? 0}, Limit: {Limit ?? 0}, Categories: [{string.Join(", ", Categories)}]";
+        public override string ToString() => $"{SearchQuery}, Offset: {Offset}, Limit: {Limit}, Categories: [{string.Join(", ", Categories)}]";
 
         public virtual string SearchQuery => $"Term: [{SearchTerm}]";
 

src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs

@@ -138,8 +138,8 @@ namespace NzbDrone.Core.IndexerSearch
 
             spec.SearchTerm = query.q;
             spec.SearchType = query.t;
-            spec.Limit = query.limit;
-            spec.Offset = query.offset;
+            spec.Limit = query.limit ?? 100;
+            spec.Offset = query.offset ?? 0;
             spec.Source = query.source;
             spec.Host = query.host;
 

src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs

@@ -29,7 +29,7 @@ namespace NzbDrone.Core.IndexerVersions
         /* Update Service will fall back if version # does not exist for an indexer  per Ta */
 
         private const string DEFINITION_BRANCH = "master";
-        private const int DEFINITION_VERSION = 8;
+        private const int DEFINITION_VERSION = 9;
 
         // Used when moving yml to C#
         private readonly List<string> _definitionBlocklist = new ()

src/NzbDrone.Core/Indexers/Definitions/Anidex.cs

@@ -100,45 +100,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             _capabilities = capabilities;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
         private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)

src/NzbDrone.Core/Indexers/Definitions/Anidub.cs

@@ -194,49 +194,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}");
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}"));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}");
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}");
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}");
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}");
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/AnimeBytes.cs

@@ -107,34 +107,30 @@ namespace NzbDrone.Core.Indexers.Definitions
         {
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
             => GetRequestWithSearchType(searchCriteria, "anime");
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
             => GetRequestWithSearchType(searchCriteria, "music");
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
             => GetRequestWithSearchType(searchCriteria, "anime");
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
             => GetRequestWithSearchType(searchCriteria, "anime");
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
             => GetRequestWithSearchType(searchCriteria, "anime");
 
-        private IndexerPageableRequestChain GetRequestWithSearchType(SearchCriteriaBase searchCriteria, string searchType)
+        private IEnumerable<IndexerRequest> GetRequestWithSearchType(SearchCriteriaBase searchCriteria, string searchType)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
             // TODO: Remove this once Prowlarr has proper support for non Pageable Indexers and can tell Sonarr that indexer doesn't support pagination in a proper way, for now just return empty release list on all request containing an offset
             if (searchCriteria.Offset is > 0)
             {
-                return pageableRequests;
+                return new List<IndexerRequest>();
             }
 
-            pageableRequests.Add(GetRequest(searchType, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetRequest(searchType, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
         }
 
         private IEnumerable<IndexerRequest> GetRequest(string searchType, string term, int[] categories)

src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs

@@ -164,49 +164,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Animedia.cs

@@ -99,43 +99,31 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return new IndexerRequest(requestUrl, HttpAccept.Html);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}");
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}"));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}");
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}");
         }
 
         // Animedia doesn't support music, but this function required by interface
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
         // Animedia doesn't support books, but this function required by interface
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Anthelion.cs

@@ -146,45 +146,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/AudioBookBay.cs

@@ -192,37 +192,29 @@ public class AudioBookBayRequestGenerator : IIndexerRequestGenerator
         _capabilities = capabilities;
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}");
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}");
     }
 
     private IEnumerable<IndexerRequest> GetPagedRequests(string term)

src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazRequestGenerator.cs

@@ -76,7 +76,7 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
             var parameters = GetBasicSearchParameters(searchCriteria.Categories, searchCriteria.Genre);
 
@@ -93,23 +93,19 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
                 parameters.Add("search", GetSearchTerm(searchCriteria.SanitizedSearchTerm).Trim());
             }
 
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(parameters));
-            return pageableRequests;
+            return GetRequest(parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
             var parameters = GetBasicSearchParameters(searchCriteria.Categories, null);
 
             parameters.Add("search", GetSearchTerm(searchCriteria.SanitizedSearchTerm).Trim());
 
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(parameters));
-            return pageableRequests;
+            return GetRequest(parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
             var parameters = GetBasicSearchParameters(searchCriteria.Categories, searchCriteria.Genre);
 
@@ -128,12 +124,10 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
                 parameters.Add("search", GetSearchTerm(searchCriteria.SanitizedTvSearchString).Trim());
             }
 
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(parameters));
-            return pageableRequests;
+            return GetRequest(parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
             throw new NotImplementedException();
         }
@@ -141,15 +135,13 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
         // hook to adjust the search term
         protected virtual string GetSearchTerm(string term) => term;
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
             var parameters = GetBasicSearchParameters(searchCriteria.Categories, null);
 
             parameters.Add("search", GetSearchTerm(searchCriteria.SanitizedSearchTerm).Trim());
 
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(parameters));
-            return pageableRequests;
+            return GetRequest(parameters);
         }
     }
 }

src/NzbDrone.Core/Indexers/Definitions/BB.cs

@@ -177,49 +177,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs

@@ -178,49 +178,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm)));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm)));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm)));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm)));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm)));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm));
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/BeyondHD.cs

@@ -120,49 +120,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return indexerRequest;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId, searchCriteria.TmdbId.GetValueOrDefault()));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId, searchCriteria.TmdbId.GetValueOrDefault());
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/BinSearch.cs

@@ -90,7 +90,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                 { "adv_sort", "date" },
                 { "q", term },
                 { "m", searchCriteria.Offset.ToString() },
-                { "max", searchCriteria.Limit?.ToString() ?? "100" }
+                { "max", searchCriteria.Limit.ToString() ?? "100" }
             };
 
             var searchUrl = string.Format("{0}/?{1}", Settings.BaseUrl.TrimEnd('/'), qc.GetQueryString());
@@ -100,49 +100,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/BitHDTV.cs

@@ -129,49 +129,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             }
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetRequestGenerator.cs

@@ -34,31 +34,29 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
             yield return new IndexerRequest(builder.Build());
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
             var parameters = new BroadcastheNetTorrentQuery();
 
             var searchString = searchCriteria.SearchTerm != null ? searchCriteria.SearchTerm : "";
 
-            var btnResults = searchCriteria.Limit.GetValueOrDefault();
+            var btnResults = searchCriteria.Limit;
             if (btnResults == 0)
             {
                 btnResults = (int)Capabilities.LimitsDefault;
             }
 
-            var btnOffset = searchCriteria.Offset.GetValueOrDefault();
+            var btnOffset = searchCriteria.Offset;
 
             if (searchCriteria.TvdbId > 0)
             {
@@ -93,25 +91,21 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
             // Neither a season only search nor daily nor standard, fall back to query
             parameters.Search = searchString.Replace(" ", "%");
 
-            pageableRequests.Add(GetPagedRequests(parameters, btnResults, btnOffset));
-
-            return pageableRequests;
+            return GetPagedRequests(parameters, btnResults, btnOffset);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
             var parameters = new BroadcastheNetTorrentQuery();
 
             var searchString = searchCriteria.SearchTerm != null ? searchCriteria.SearchTerm : "";
 
-            var btnResults = searchCriteria.Limit.GetValueOrDefault();
+            var btnResults = searchCriteria.Limit;
             if (btnResults == 0)
             {
                 btnResults = (int)Capabilities.LimitsDefault;
@@ -119,11 +113,9 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
 
             parameters.Search = searchString.Replace(" ", "%");
 
-            var btnOffset = searchCriteria.Offset.GetValueOrDefault();
+            var btnOffset = searchCriteria.Offset;
 
-            pageableRequests.Add(GetPagedRequests(parameters, btnResults, btnOffset));
-
-            return pageableRequests;
+            return GetPagedRequests(parameters, btnResults, btnOffset);
         }
     }
 }

src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs

@@ -28,10 +28,6 @@ namespace NzbDrone.Core.Indexers.Cardigann
         public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
         public override IndexerPrivacy Privacy => IndexerPrivacy.Private;
 
-        // Page size is different per indexer, setting to 1 ensures we don't break out of paging logic
-        // thinking its a partial page and instead all search_path requests are run for each indexer
-        public override int PageSize => 1;
-
         public override TimeSpan RateLimit
         {
             get
@@ -47,6 +43,21 @@ namespace NzbDrone.Core.Indexers.Cardigann
             }
         }
 
+        public override int PageSize
+        {
+            get
+            {
+                var definition = _definitionService.GetCachedDefinition(Settings.DefinitionFile);
+
+                if (definition.Search != null && definition.Search.PageSize > 0)
+                {
+                    return definition.Search.PageSize;
+                }
+
+                return 0;
+            }
+        }
+
         public override IIndexerRequestGenerator GetRequestGenerator()
         {
             var generator = _generatorCache.Get(Settings.DefinitionFile, () =>
@@ -88,6 +99,25 @@ namespace NzbDrone.Core.Indexers.Cardigann
                 cleanReleases = FilterReleasesByQuery(releases, searchCriteria).ToList();
             }
 
+            // Only take the request results using Offset and Limit from the search
+            var pageSize = PageSize;
+
+            if (pageSize > 0)
+            {
+                var minPage = searchCriteria.Offset / pageSize;
+                var firstResult = searchCriteria.Offset - (pageSize * minPage);
+
+                cleanReleases = cleanReleases
+                    .Skip(firstResult)
+                    .Take(searchCriteria.Limit).ToList();
+            }
+            else
+            {
+                cleanReleases = cleanReleases
+                    .Skip(searchCriteria.Offset)
+                    .Take(searchCriteria.Limit).ToList();
+            }
+
             return cleanReleases;
         }
 
@@ -129,8 +159,8 @@ namespace NzbDrone.Core.Indexers.Cardigann
         {
             var defaultSettings = new List<SettingsField>
             {
-                new SettingsField { Name = "username", Label = "Username", Type = "text" },
-                new SettingsField { Name = "password", Label = "Password", Type = "password" }
+                new () { Name = "username", Label = "Username", Type = "text" },
+                new () { Name = "password", Label = "Password", Type = "password" }
             };
 
             var settings = definition.Settings ?? defaultSettings;

src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Text;
@@ -349,11 +350,13 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
         public string ApplyGoTemplateText(string template, Dictionary<string, object> variables = null, TemplateTextModifier modifier = null)
         {
-            if (variables == null)
+            if (template.IsNullOrWhiteSpace() || !template.Contains("{{"))
             {
-                variables = GetBaseTemplateVariables();
+                return template;
             }
 
+            variables ??= GetBaseTemplateVariables();
+
             // handle re_replace expression
             // Example: {{ re_replace .Query.Keywords "[^a-zA-Z0-9]+" "%" }}
             var reReplaceRegex = new Regex(@"{{\s*re_replace\s+(\..+?)\s+""(.*?)""\s+""(.*?)""\s*}}");
@@ -611,10 +614,11 @@ namespace NzbDrone.Core.Indexers.Cardigann
                     case "timeparse":
                     case "dateparse":
                         var layout = (string)filter.Args;
+
                         try
                         {
                             var date = DateTimeUtil.ParseDateTimeGoLang(data, layout);
-                            data = date.ToString(DateTimeUtil.Rfc1123ZPattern);
+                            data = date.ToString(DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture);
                         }
                         catch (InvalidDateException ex)
                         {
@@ -655,15 +659,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                         break;
                     case "trim":
                         var cutset = (string)filter.Args;
-                        if (cutset != null)
-                        {
-                            data = data.Trim(cutset[0]);
-                        }
-                        else
-                        {
-                            data = data.Trim();
-                        }
-
+                        data = cutset != null ? data.Trim(cutset[0]) : data.Trim();
                         break;
                     case "prepend":
                         var prependstr = (string)filter.Args;
@@ -693,10 +689,10 @@ namespace NzbDrone.Core.Indexers.Cardigann
                         break;
                     case "timeago":
                     case "reltime":
-                        data = DateTimeUtil.FromTimeAgo(data).ToString(DateTimeUtil.Rfc1123ZPattern);
+                        data = DateTimeUtil.FromTimeAgo(data).ToString(DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture);
                         break;
                     case "fuzzytime":
-                        data = DateTimeUtil.FromUnknown(data).ToString(DateTimeUtil.Rfc1123ZPattern);
+                        data = DateTimeUtil.FromUnknown(data).ToString(DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture);
                         break;
                     case "validfilename":
                         data = StringUtil.MakeValidFileName(data, '_', false);
@@ -744,18 +740,20 @@ namespace NzbDrone.Core.Indexers.Cardigann
                         // for debugging
                         var debugData = data.Replace("\r", "\\r").Replace("\n", "\\n").Replace("\xA0", "\\xA0");
                         var strTag = (string)filter.Args;
-                        if (strTag != null)
-                        {
-                            strTag = string.Format("({0}):", strTag);
-                        }
-                        else
-                        {
-                            strTag = ":";
-                        }
+                        strTag = strTag != null ? $"({strTag}):" : ":";
 
-                        _logger.Debug(string.Format("CardigannIndexer ({0}): strdump{1} {2}", _definition.Id, strTag, debugData));
+                        _logger.Debug($"CardigannIndexer ({_definition.Id}): strdump{strTag} {debugData}");
+                        break;
+                    case "validate":
+                        char[] delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']', '"', '|', ':' };
+                        var args = (string)filter.Args;
+                        var argsList = args.ToLower().Split(delimiters, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+                        var validList = argsList.ToList();
+                        var validIntersect = validList.Intersect(data.ToLower().Split(delimiters, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)).ToList();
+                        data = string.Join(", ", validIntersect);
                         break;
                     default:
+                        _logger.Error($"CardigannIndexer ({_definition.Id}): Unsupported field filter: {filter.Name}");
                         break;
                 }
             }

src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannDefinition.cs

@@ -142,6 +142,9 @@ namespace NzbDrone.Core.Indexers.Cardigann
 
     public class SearchBlock
     {
+        public int PageSize { get; set; }
+        public int FirstPageNumber { get; set; }
+        public bool AllowEmptyInputs { get; set; }
         public string Path { get; set; }
         public List<SearchPathBlock> Paths { get; set; }
         public Dictionary<string, List<string>> Headers { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
@@ -72,6 +73,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                 }
 
                 var parsedJson = JToken.Parse(results);
+
                 if (parsedJson == null)
                 {
                     throw new IndexerException(indexerResponse, "Error Parsing Json Response");
@@ -80,12 +82,10 @@ namespace NzbDrone.Core.Indexers.Cardigann
                 if (search.Rows.Count != null)
                 {
                     var countVal = HandleJsonSelector(search.Rows.Count, parsedJson, variables);
-                    if (int.TryParse(countVal, out var count))
+
+                    if (int.TryParse(countVal, out var count) && count < 1)
                     {
-                        if (count < 1)
-                        {
-                            return releases;
-                        }
+                        return releases;
                     }
                 }
 
@@ -165,205 +165,191 @@ namespace NzbDrone.Core.Indexers.Cardigann
             }
             else
             {
-                try
+                IHtmlCollection<IElement> rowsDom;
+
+                if (request.SearchPath.Response != null && request.SearchPath.Response.Type.Equals("xml"))
                 {
-                    IHtmlCollection<IElement> rowsDom;
+                    var searchResultParser = new XmlParser();
+                    var searchResultDocument = searchResultParser.ParseDocument(results);
 
-                    if (request.SearchPath.Response != null && request.SearchPath.Response.Type.Equals("xml"))
+                    if (search.Preprocessingfilters != null)
                     {
-                        var searchResultParser = new XmlParser();
-                        var searchResultDocument = searchResultParser.ParseDocument(results);
-
-                        if (search.Preprocessingfilters != null)
-                        {
-                            results = ApplyFilters(results, search.Preprocessingfilters, variables);
-                            searchResultDocument = searchResultParser.ParseDocument(results);
-                            _logger.Trace(string.Format("CardigannIndexer ({0}): result after preprocessingfilters: {1}", _definition.Id, results));
-                        }
-
-                        var rowsSelector = ApplyGoTemplateText(search.Rows.Selector, variables);
-                        rowsDom = searchResultDocument.QuerySelectorAll(rowsSelector);
-                    }
-                    else
-                    {
-                        var searchResultParser = new HtmlParser();
-                        var searchResultDocument = searchResultParser.ParseDocument(results);
-
-                        if (search.Preprocessingfilters != null)
-                        {
-                            results = ApplyFilters(results, search.Preprocessingfilters, variables);
-                            searchResultDocument = searchResultParser.ParseDocument(results);
-                            _logger.Trace(string.Format("CardigannIndexer ({0}): result after preprocessingfilters: {1}", _definition.Id, results));
-                        }
-
-                        var rowsSelector = ApplyGoTemplateText(search.Rows.Selector, variables);
-                        rowsDom = searchResultDocument.QuerySelectorAll(rowsSelector);
+                        results = ApplyFilters(results, search.Preprocessingfilters, variables);
+                        searchResultDocument = searchResultParser.ParseDocument(results);
+                        _logger.Trace(string.Format("CardigannIndexer ({0}): result after preprocessingfilters: {1}", _definition.Id, results));
                     }
 
-                    var rows = new List<IElement>();
-                    foreach (var rowDom in rowsDom)
+                    var rowsSelector = ApplyGoTemplateText(search.Rows.Selector, variables);
+                    rowsDom = searchResultDocument.QuerySelectorAll(rowsSelector);
+                }
+                else
+                {
+                    var searchResultParser = new HtmlParser();
+                    var searchResultDocument = searchResultParser.ParseDocument(results);
+
+                    if (search.Preprocessingfilters != null)
                     {
-                        rows.Add(rowDom);
+                        results = ApplyFilters(results, search.Preprocessingfilters, variables);
+                        searchResultDocument = searchResultParser.ParseDocument(results);
+                        _logger.Trace(string.Format("CardigannIndexer ({0}): result after preprocessingfilters: {1}", _definition.Id, results));
                     }
 
-                    // merge following rows for After selector
-                    var after = search.Rows.After;
-                    if (after > 0)
+                    var rowsSelector = ApplyGoTemplateText(search.Rows.Selector, variables);
+                    rowsDom = searchResultDocument.QuerySelectorAll(rowsSelector);
+                }
+
+                var rows = new List<IElement>();
+                foreach (var rowDom in rowsDom)
+                {
+                    rows.Add(rowDom);
+                }
+
+                // merge following rows for After selector
+                var after = search.Rows.After;
+                if (after > 0)
+                {
+                    for (var i = 0; i < rows.Count; i += 1)
                     {
-                        for (var i = 0; i < rows.Count; i += 1)
+                        var currentRow = rows[i];
+                        for (var j = 0; j < after; j += 1)
                         {
-                            var currentRow = rows[i];
-                            for (var j = 0; j < after; j += 1)
+                            var mergeRowIndex = i + j + 1;
+                            var mergeRow = rows[mergeRowIndex];
+                            var mergeNodes = new List<INode>();
+                            foreach (var node in mergeRow.ChildNodes)
                             {
-                                var mergeRowIndex = i + j + 1;
-                                var mergeRow = rows[mergeRowIndex];
-                                var mergeNodes = new List<INode>();
-                                foreach (var node in mergeRow.ChildNodes)
-                                {
-                                    mergeNodes.Add(node);
-                                }
-
-                                currentRow.Append(mergeNodes.ToArray());
+                                mergeNodes.Add(node);
                             }
 
-                            rows.RemoveRange(i + 1, after);
+                            currentRow.Append(mergeNodes.ToArray());
                         }
+
+                        rows.RemoveRange(i + 1, after);
                     }
+                }
 
-                    foreach (var row in rows)
+                foreach (var row in rows)
+                {
+                    try
                     {
-                        try
-                        {
-                            var release = new TorrentInfo();
+                        var release = new TorrentInfo();
 
-                            // Parse fields
-                            foreach (var field in search.Fields)
+                        // Parse fields
+                        foreach (var field in search.Fields)
+                        {
+                            var fieldParts = field.Key.Split('|');
+                            var fieldName = fieldParts[0];
+                            var fieldModifiers = new List<string>();
+                            for (var i = 1; i < fieldParts.Length; i++)
                             {
-                                var fieldParts = field.Key.Split('|');
-                                var fieldName = fieldParts[0];
-                                var fieldModifiers = new List<string>();
-                                for (var i = 1; i < fieldParts.Length; i++)
+                                fieldModifiers.Add(fieldParts[i]);
+                            }
+
+                            string value = null;
+                            var variablesKey = ".Result." + fieldName;
+                            var isOptional = OptionalFields.Contains(field.Key) || fieldModifiers.Contains("optional") || field.Value.Optional;
+                            try
+                            {
+                                value = HandleSelector(field.Value, row, variables, !isOptional);
+
+                                if (isOptional && string.IsNullOrWhiteSpace(value))
                                 {
-                                    fieldModifiers.Add(fieldParts[i]);
+                                    variables[variablesKey] = null;
+                                    continue;
                                 }
 
-                                string value = null;
-                                var variablesKey = ".Result." + fieldName;
-                                var isOptional = OptionalFields.Contains(field.Key) || fieldModifiers.Contains("optional") || field.Value.Optional;
+                                variables[variablesKey] = ParseFields(value, fieldName, release, fieldModifiers, searchUrlUri);
+                            }
+                            catch (Exception ex)
+                            {
+                                if (!variables.ContainsKey(variablesKey))
+                                {
+                                    variables[variablesKey] = null;
+                                }
+
+                                if (OptionalFields.Contains(field.Key) || fieldModifiers.Contains("optional") || field.Value.Optional)
+                                {
+                                    variables[variablesKey] = null;
+                                    continue;
+                                }
+
+                                if (indexerLogging)
+                                {
+                                    _logger.Trace("Error while parsing field={0}, selector={1}, value={2}: {3}", field.Key, field.Value.Selector, value == null ? "<null>" : value, ex.Message);
+                                }
+                            }
+                        }
+
+                        var filters = search.Rows.Filters;
+                        var skipRelease = ParseRowFilters(filters, release, variables, row.ToHtmlPretty());
+
+                        if (skipRelease)
+                        {
+                            continue;
+                        }
+
+                        // if DateHeaders is set go through the previous rows and look for the header selector
+                        var dateHeaders = _definition.Search.Rows.Dateheaders;
+                        if (release.PublishDate == DateTime.MinValue && dateHeaders != null)
+                        {
+                            var prevRow = row.PreviousElementSibling;
+                            string value = null;
+                            if (prevRow == null)
+                            {
+                                // continue with parent
+                                var parent = row.ParentElement;
+                                if (parent != null)
+                                {
+                                    prevRow = parent.PreviousElementSibling;
+                                }
+                            }
+
+                            while (prevRow != null)
+                            {
+                                var curRow = prevRow;
+                                _logger.Debug(prevRow.OuterHtml);
                                 try
                                 {
-                                    value = HandleSelector(field.Value, row, variables, !isOptional);
-
-                                    if (isOptional && string.IsNullOrWhiteSpace(value))
-                                    {
-                                        variables[variablesKey] = null;
-                                        continue;
-                                    }
-
-                                    variables[variablesKey] = ParseFields(value, fieldName, release, fieldModifiers, searchUrlUri);
+                                    value = HandleSelector(dateHeaders, curRow);
+                                    break;
                                 }
-                                catch (Exception ex)
+                                catch (Exception)
                                 {
-                                    if (!variables.ContainsKey(variablesKey))
-                                    {
-                                        variables[variablesKey] = null;
-                                    }
-
-                                    if (OptionalFields.Contains(field.Key) || fieldModifiers.Contains("optional") || field.Value.Optional)
-                                    {
-                                        variables[variablesKey] = null;
-                                        continue;
-                                    }
-
-                                    if (indexerLogging)
-                                    {
-                                        _logger.Trace("Error while parsing field={0}, selector={1}, value={2}: {3}", field.Key, field.Value.Selector, value == null ? "<null>" : value, ex.Message);
-                                    }
+                                    // do nothing
                                 }
-                            }
 
-                            var filters = search.Rows.Filters;
-                            var skipRelease = ParseRowFilters(filters, release, variables, row.ToHtmlPretty());
-
-                            if (skipRelease)
-                            {
-                                continue;
-                            }
-
-                            // if DateHeaders is set go through the previous rows and look for the header selector
-                            var dateHeaders = _definition.Search.Rows.Dateheaders;
-                            if (release.PublishDate == DateTime.MinValue && dateHeaders != null)
-                            {
-                                var prevRow = row.PreviousElementSibling;
-                                string value = null;
+                                prevRow = curRow.PreviousElementSibling;
                                 if (prevRow == null)
                                 {
                                     // continue with parent
-                                    var parent = row.ParentElement;
+                                    var parent = curRow.ParentElement;
                                     if (parent != null)
                                     {
                                         prevRow = parent.PreviousElementSibling;
                                     }
                                 }
-
-                                while (prevRow != null)
-                                {
-                                    var curRow = prevRow;
-                                    _logger.Debug(prevRow.OuterHtml);
-                                    try
-                                    {
-                                        value = HandleSelector(dateHeaders, curRow);
-                                        break;
-                                    }
-                                    catch (Exception)
-                                    {
-                                        // do nothing
-                                    }
-
-                                    prevRow = curRow.PreviousElementSibling;
-                                    if (prevRow == null)
-                                    {
-                                        // continue with parent
-                                        var parent = curRow.ParentElement;
-                                        if (parent != null)
-                                        {
-                                            prevRow = parent.PreviousElementSibling;
-                                        }
-                                    }
-                                }
-
-                                if (value == null && dateHeaders.Optional == false)
-                                {
-                                    throw new CardigannException(string.Format("No date header row found for {0}", release.ToString()));
-                                }
-
-                                if (value != null)
-                                {
-                                    release.PublishDate = DateTimeUtil.FromUnknown(value);
-                                }
                             }
 
-                            releases.Add(release);
-                        }
-                        catch (Exception ex)
-                        {
-                            _logger.Error(ex, "CardigannIndexer ({0}): Error while parsing row '{1}':\n\n{2}", _definition.Id, row.ToHtmlPretty());
+                            if (value == null && dateHeaders.Optional == false)
+                            {
+                                throw new CardigannException(string.Format("No date header row found for {0}", release.ToString()));
+                            }
+
+                            if (value != null)
+                            {
+                                release.PublishDate = DateTimeUtil.FromUnknown(value);
+                            }
                         }
+
+                        releases.Add(release);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Error(ex, "CardigannIndexer ({0}): Error while parsing row '{1}':\n\n{2}", _definition.Id, row.ToHtmlPretty());
                     }
                 }
-                catch (Exception)
-                {
-                    // OnParseError(results, ex);
-                    throw;
-                }
             }
 
-            /*
-            if (query.Limit > 0)
-            {
-                releases = releases.Take(query.Limit).ToList();
-            }*/
-
             releases.ForEach(c =>
             {
                 // generate magnet link from info hash (not allowed for private sites)
@@ -425,11 +411,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                     break;
                 case "comments":
                     var commentsUrl = ResolvePath(value, searchUrlUri);
-                    if (release.CommentUrl == null)
-                    {
-                        release.CommentUrl = commentsUrl.AbsoluteUri;
-                    }
-
+                    release.CommentUrl ??= commentsUrl.AbsoluteUri;
                     value = commentsUrl.ToString();
                     break;
                 case "title":
@@ -522,7 +504,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
                     break;
                 case "date":
                     release.PublishDate = DateTimeUtil.FromUnknown(value);
-                    value = release.PublishDate.ToString(DateTimeUtil.Rfc1123ZPattern);
+                    value = release.PublishDate.ToString(DateTimeUtil.Rfc1123ZPattern, CultureInfo.InvariantCulture);
                     break;
                 case "files":
                     release.Files = ParseUtil.CoerceInt(value);
@@ -554,38 +536,23 @@ namespace NzbDrone.Core.Indexers.Cardigann
                     value = release.ImdbId.ToString();
                     break;
                 case "tmdbid":
-                    var tmdbIDRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
-                    var tmdbIDMatch = tmdbIDRegEx.Match(value);
-                    var tmdbID = tmdbIDMatch.Groups[1].Value;
-                    release.TmdbId = (int)ParseUtil.CoerceLong(tmdbID);
+                    release.TmdbId = (int)ParseUtil.GetLongFromString(value);
                     value = release.TmdbId.ToString();
                     break;
                 case "rageid":
-                    var rageIDRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
-                    var rageIDMatch = rageIDRegEx.Match(value);
-                    var rageID = rageIDMatch.Groups[1].Value;
-                    release.TvRageId = (int)ParseUtil.CoerceLong(rageID);
+                    release.TvRageId = (int)ParseUtil.GetLongFromString(value);
                     value = release.TvRageId.ToString();
                     break;
                 case "traktid":
-                    var traktIDRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
-                    var traktIDMatch = traktIDRegEx.Match(value);
-                    var traktID = traktIDMatch.Groups[1].Value;
-                    release.TraktId = (int)ParseUtil.CoerceLong(traktID);
+                    release.TraktId = (int)ParseUtil.GetLongFromString(value);
                     value = release.TraktId.ToString();
                     break;
                 case "tvdbid":
-                    var tvdbIdRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
-                    var tvdbIdMatch = tvdbIdRegEx.Match(value);
-                    var tvdbId = tvdbIdMatch.Groups[1].Value;
-                    release.TvdbId = (int)ParseUtil.CoerceLong(tvdbId);
+                    release.TvdbId = (int)ParseUtil.GetLongFromString(value);
                     value = release.TvdbId.ToString();
                     break;
                 case "doubanid":
-                    var doubanIDRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
-                    var doubanIDMatch = doubanIDRegEx.Match(value);
-                    var doubanID = doubanIDMatch.Groups[1].Value;
-                    release.DoubanId = (int)ParseUtil.CoerceLong(doubanID);
+                    release.DoubanId = (int)ParseUtil.GetLongFromString(value);
                     value = release.DoubanId.ToString();
                     break;
                 case "poster":
@@ -598,8 +565,12 @@ namespace NzbDrone.Core.Indexers.Cardigann
                     value = release.PosterUrl;
                     break;
                 case "genre":
+                    release.Genres ??= new List<string>();
                     char[] delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']', '"', '|', ':' };
-                    release.Genres = release.Genres.Union(value.Split(delimiters, System.StringSplitOptions.RemoveEmptyEntries)).ToList();
+                    release.Genres = release.Genres
+                        .Union(value.Split(delimiters, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
+                        .Select(x => x.Replace("_", " "))
+                        .ToList();
                     value = string.Join(", ", release.Genres);
                     break;
                 case "year":
@@ -645,29 +616,14 @@ namespace NzbDrone.Core.Indexers.Cardigann
                     switch (filter.Name)
                     {
                         case "andmatch":
-                            var characterLimit = -1;
-                            if (filter.Args != null)
-                            {
-                                characterLimit = int.Parse(filter.Args);
-                            }
-
-                            var queryKeywords = variables[".Keywords"] as string;
-
+                            // See IndexerBase.FilterReleasesByQuery
                             break;
                         case "strdump":
                             // for debugging
-                            _logger.Debug(string.Format("CardigannIndexer ({0}): row strdump: {1}", _definition.Id, row.ToString()));
-                            break;
-                        case "validate":
-                            char[] delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']', '"', '|', ':' };
-                            var args = (string)filter.Args;
-                            var argsList = args.ToLower().Split(delimiters, StringSplitOptions.RemoveEmptyEntries);
-                            var validList = argsList.ToList();
-                            var validIntersect = validList.Intersect(row.ToString().ToLower().Split(delimiters, StringSplitOptions.RemoveEmptyEntries)).ToList();
-                            row = string.Join(", ", validIntersect);
+                            _logger.Debug($"CardigannIndexer ({_definition.Id}): row strdump: {row}");
                             break;
                         default:
-                            _logger.Error(string.Format("CardigannIndexer ({0}): Unsupported rows filter: {1}", _definition.Id, filter.Name));
+                            _logger.Error($"CardigannIndexer ({_definition.Id}): Unsupported rows filter: {filter.Name}");
                             break;
                     }
                 }

src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs

@@ -9,6 +9,7 @@ using AngleSharp.Html.Dom;
 using AngleSharp.Html.Parser;
 using Newtonsoft.Json.Linq;
 using NLog;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Indexers.Definitions.Cardigann;
@@ -42,12 +43,10 @@ namespace NzbDrone.Core.Indexers.Cardigann
         public Func<IDictionary<string, string>> GetCookies { get; set; }
         public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
             _logger.Trace("Getting Movie search");
 
-            var pageableRequests = new IndexerPageableRequestChain();
-
             var variables = GetQueryVariableDefaults(searchCriteria);
 
             variables[".Query.Movie"] = null;
@@ -59,17 +58,13 @@ namespace NzbDrone.Core.Indexers.Cardigann
             variables[".Query.TraktID"] = searchCriteria.TraktId?.ToString() ?? null;
             variables[".Query.DoubanID"] = searchCriteria.DoubanId?.ToString() ?? null;
 
-            pageableRequests.Add(GetRequest(variables));
-
-            return pageableRequests;
+            return GetRequest(variables, searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
             _logger.Trace("Getting Music search");
 
-            var pageableRequests = new IndexerPageableRequestChain();
-
             var variables = GetQueryVariableDefaults(searchCriteria);
 
             variables[".Query.Album"] = searchCriteria.Album;
@@ -79,17 +74,13 @@ namespace NzbDrone.Core.Indexers.Cardigann
             variables[".Query.Year"] = searchCriteria.Year?.ToString() ?? null;
             variables[".Query.Track"] = searchCriteria.Track;
 
-            pageableRequests.Add(GetRequest(variables));
-
-            return pageableRequests;
+            return GetRequest(variables, searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
             _logger.Trace("Getting TV search");
 
-            var pageableRequests = new IndexerPageableRequestChain();
-
             var variables = GetQueryVariableDefaults(searchCriteria);
 
             variables[".Query.Series"] = null;
@@ -107,17 +98,13 @@ namespace NzbDrone.Core.Indexers.Cardigann
             variables[".Query.DoubanID"] = searchCriteria.DoubanId?.ToString() ?? null;
             variables[".Query.Episode"] = searchCriteria.EpisodeSearchString;
 
-            pageableRequests.Add(GetRequest(variables));
-
-            return pageableRequests;
+            return GetRequest(variables, searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
             _logger.Trace("Getting Book search");
 
-            var pageableRequests = new IndexerPageableRequestChain();
-
             var variables = GetQueryVariableDefaults(searchCriteria);
 
             variables[".Query.Author"] = searchCriteria.Author;
@@ -126,22 +113,16 @@ namespace NzbDrone.Core.Indexers.Cardigann
             variables[".Query.Publisher"] = searchCriteria.Publisher;
             variables[".Query.Year"] = searchCriteria.Year?.ToString() ?? null;
 
-            pageableRequests.Add(GetRequest(variables));
-
-            return pageableRequests;
+            return GetRequest(variables, searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
             _logger.Trace("Getting Basic search");
 
-            var pageableRequests = new IndexerPageableRequestChain();
-
             var variables = GetQueryVariableDefaults(searchCriteria);
 
-            pageableRequests.Add(GetRequest(variables));
-
-            return pageableRequests;
+            return GetRequest(variables, searchCriteria);
         }
 
         private Dictionary<string, object> GetQueryVariableDefaults(SearchCriteriaBase searchCriteria)
@@ -151,8 +132,8 @@ namespace NzbDrone.Core.Indexers.Cardigann
             variables[".Query.Type"] = searchCriteria.SearchType;
             variables[".Query.Q"] = searchCriteria.SearchTerm;
             variables[".Query.Categories"] = searchCriteria.Categories;
-            variables[".Query.Limit"] = searchCriteria.Limit?.ToString() ?? null;
-            variables[".Query.Offset"] = searchCriteria.Offset?.ToString() ?? null;
+            variables[".Query.Limit"] = searchCriteria.Limit.ToString() ?? null;
+            variables[".Query.Offset"] = searchCriteria.Offset.ToString() ?? null;
             variables[".Query.Extended"] = null;
             variables[".Query.APIKey"] = null;
             variables[".Query.Genre"] = null;
@@ -1015,7 +996,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
             return false;
         }
 
-        private IEnumerable<IndexerRequest> GetRequest(Dictionary<string, object> variables)
+        private IEnumerable<IndexerRequest> GetRequest(Dictionary<string, object> variables, SearchCriteriaBase searchCriteria)
         {
             var search = _definition.Search;
 
@@ -1046,117 +1027,145 @@ namespace NzbDrone.Core.Indexers.Cardigann
             variables[".Query.Keywords"] = string.Join(" ", keywordTokens);
             variables[".Keywords"] = ApplyFilters((string)variables[".Query.Keywords"], search.Keywordsfilters, variables);
 
+            var pageSize = search.PageSize;
+            var minPage = 0;
+            var maxPage = 0;
+
+            if (pageSize > 0)
+            {
+                variables[".PageSize"] = pageSize;
+                minPage = (searchCriteria.Offset / pageSize) + search.FirstPageNumber;
+                maxPage = ((searchCriteria.Offset + searchCriteria.Limit - 1) / pageSize) + search.FirstPageNumber;
+            }
+
+            if (pageSize == 0 && searchCriteria.Offset >= 100)
+            {
+                // Indexer doesn't support pagination
+                yield break;
+            }
+
             // TODO: prepare queries first and then send them parallel
             var searchPaths = search.Paths;
-            foreach (var searchPath in searchPaths)
+
+            // Grab all pages we will need to return user requested limit and offset
+            for (var page = minPage; page <= maxPage; page++)
             {
-                // skip path if categories don't match
-                if (searchPath.Categories != null && mappedCategories.Count > 0)
+                variables[".Query.Page"] = page;
+
+                foreach (var searchPath in searchPaths)
                 {
-                    var invertMatch = searchPath.Categories[0] == "!";
-                    var hasIntersect = mappedCategories.Intersect(searchPath.Categories).Any();
-                    if (invertMatch)
+                    // skip path if categories don't match
+                    if (searchPath.Categories != null && mappedCategories.Count > 0)
                     {
-                        hasIntersect = !hasIntersect;
-                    }
-
-                    if (!hasIntersect)
-                    {
-                        continue;
-                    }
-                }
-
-                // build search URL
-                // HttpUtility.UrlPathEncode seems to only encode spaces, we use UrlEncode and replace + with %20 as a workaround
-                var searchUrl = ResolvePath(ApplyGoTemplateText(searchPath.Path, variables, WebUtility.UrlEncode).Replace("+", "%20")).AbsoluteUri;
-                var queryCollection = new List<KeyValuePair<string, string>>();
-                var method = HttpMethod.Get;
-
-                if (string.Equals(searchPath.Method, "post", StringComparison.OrdinalIgnoreCase))
-                {
-                    method = HttpMethod.Post;
-                }
-
-                var inputsList = new List<Dictionary<string, string>>();
-                if (searchPath.Inheritinputs)
-                {
-                    inputsList.Add(search.Inputs);
-                }
-
-                inputsList.Add(searchPath.Inputs);
-
-                foreach (var inputs in inputsList)
-                {
-                    if (inputs != null)
-                    {
-                        foreach (var input in inputs)
+                        var invertMatch = searchPath.Categories[0] == "!";
+                        var hasIntersect = mappedCategories.Intersect(searchPath.Categories).Any();
+                        if (invertMatch)
                         {
-                            if (input.Key == "$raw")
+                            hasIntersect = !hasIntersect;
+                        }
+
+                        if (!hasIntersect)
+                        {
+                            continue;
+                        }
+                    }
+
+                    // build search URL
+                    // HttpUtility.UrlPathEncode seems to only encode spaces, we use UrlEncode and replace + with %20 as a workaround
+                    var searchUrl = ResolvePath(ApplyGoTemplateText(searchPath.Path, variables, WebUtility.UrlEncode).Replace("+", "%20")).AbsoluteUri;
+                    var queryCollection = new List<KeyValuePair<string, string>>();
+                    var method = HttpMethod.Get;
+
+                    if (string.Equals(searchPath.Method, "post", StringComparison.OrdinalIgnoreCase))
+                    {
+                        method = HttpMethod.Post;
+                    }
+
+                    var inputsList = new List<Dictionary<string, string>>();
+                    if (searchPath.Inheritinputs)
+                    {
+                        inputsList.Add(search.Inputs);
+                    }
+
+                    inputsList.Add(searchPath.Inputs);
+
+                    foreach (var inputs in inputsList)
+                    {
+                        if (inputs != null)
+                        {
+                            foreach (var input in inputs)
                             {
-                                var rawStr = ApplyGoTemplateText(input.Value, variables, WebUtility.UrlEncode);
-                                foreach (var part in rawStr.Split('&'))
+                                if (input.Key == "$raw")
                                 {
-                                    var parts = part.Split(new char[] { '=' }, 2);
-                                    var key = parts[0];
-                                    if (key.Length == 0)
+                                    var rawStr = ApplyGoTemplateText(input.Value, variables, WebUtility.UrlEncode);
+                                    foreach (var part in rawStr.Split('&'))
                                     {
-                                        continue;
-                                    }
+                                        var parts = part.Split(new char[] { '=' }, 2);
+                                        var key = parts[0];
+                                        if (key.Length == 0)
+                                        {
+                                            continue;
+                                        }
 
-                                    var value = "";
-                                    if (parts.Length == 2)
-                                    {
-                                        value = parts[1];
-                                    }
+                                        var value = "";
+                                        if (parts.Length == 2)
+                                        {
+                                            value = parts[1];
+                                        }
 
-                                    queryCollection.Add(key, value);
+                                        queryCollection.Add(key, value);
+                                    }
+                                }
+                                else
+                                {
+                                    var inputValue = ApplyGoTemplateText(input.Value, variables);
+
+                                    if (inputValue.IsNotNullOrWhiteSpace() || search.AllowEmptyInputs)
+                                    {
+                                        queryCollection.Add(input.Key, inputValue);
+                                    }
                                 }
-                            }
-                            else
-                            {
-                                queryCollection.Add(input.Key, ApplyGoTemplateText(input.Value, variables));
                             }
                         }
                     }
-                }
 
-                if (method == HttpMethod.Get)
-                {
-                    if (queryCollection.Count > 0)
+                    if (method == HttpMethod.Get)
                     {
-                        searchUrl += "?" + queryCollection.GetQueryString(_encoding);
+                        if (queryCollection.Count > 0)
+                        {
+                            searchUrl += "?" + queryCollection.GetQueryString(_encoding);
+                        }
                     }
-                }
 
-                _logger.Info($"Adding request: {searchUrl}");
+                    _logger.Info($"Adding request: {searchUrl}");
 
-                var requestBuilder = new HttpRequestBuilder(searchUrl)
-                {
-                    Method = method,
-                    Encoding = _encoding
-                };
-
-                // Add FormData for searchs that POST
-                if (method == HttpMethod.Post)
-                {
-                    foreach (var param in queryCollection)
+                    var requestBuilder = new HttpRequestBuilder(searchUrl)
                     {
-                        requestBuilder.AddFormParameter(param.Key, param.Value);
+                        Method = method,
+                        Encoding = _encoding
+                    };
+
+                    // Add FormData for searchs that POST
+                    if (method == HttpMethod.Post)
+                    {
+                        foreach (var param in queryCollection)
+                        {
+                            requestBuilder.AddFormParameter(param.Key, param.Value);
+                        }
                     }
-                }
 
-                // send HTTP request
-                if (search.Headers != null)
-                {
-                    var headers = ParseCustomHeaders(search.Headers, variables);
-                    requestBuilder.SetHeaders(headers ?? new Dictionary<string, string>());
-                }
+                    // send HTTP request
+                    if (search.Headers != null)
+                    {
+                        var headers = ParseCustomHeaders(search.Headers, variables);
+                        requestBuilder.SetHeaders(headers ?? new Dictionary<string, string>());
+                    }
 
-                var request = requestBuilder
-                    .WithRateLimit(_rateLimit.TotalSeconds)
-                    .Build();
+                    var request = requestBuilder
+                        .WithRateLimit(_rateLimit.TotalSeconds)
+                        .Build();
 
-                var cardigannRequest = new CardigannRequest(request, variables, searchPath)
+                    var cardigannRequest = new CardigannRequest(request, variables, searchPath)
                     {
                         HttpRequest =
                         {
@@ -1164,7 +1173,8 @@ namespace NzbDrone.Core.Indexers.Cardigann
                         }
                     };
 
-                yield return cardigannRequest;
+                    yield return cardigannRequest;
+                }
             }
         }
     }

src/NzbDrone.Core/Indexers/Definitions/FileList/FileListRequestGenerator.cs

@@ -16,9 +16,8 @@ public class FileListRequestGenerator : IIndexerRequestGenerator
     public Func<IDictionary<string, string>> GetCookies { get; set; }
     public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
         var parameters = new NameValueCollection();
 
         if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace() || searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
@@ -47,14 +46,11 @@ public class FileListRequestGenerator : IIndexerRequestGenerator
             }
         }
 
-        pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-        return pageableRequests;
+        return GetPagedRequests(searchCriteria, parameters);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
         var parameters = new NameValueCollection();
 
         if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace())
@@ -70,14 +66,11 @@ public class FileListRequestGenerator : IIndexerRequestGenerator
             parameters.Set("query", searchCriteria.SanitizedSearchTerm.Trim());
         }
 
-        pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-        return pageableRequests;
+        return GetPagedRequests(searchCriteria, parameters);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
         var parameters = new NameValueCollection();
 
         if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
@@ -87,14 +80,11 @@ public class FileListRequestGenerator : IIndexerRequestGenerator
             parameters.Set("query", searchCriteria.SanitizedSearchTerm.Trim());
         }
 
-        pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-        return pageableRequests;
+        return GetPagedRequests(searchCriteria, parameters);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
         var parameters = new NameValueCollection();
 
         if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
@@ -104,14 +94,11 @@ public class FileListRequestGenerator : IIndexerRequestGenerator
             parameters.Set("query", searchCriteria.SanitizedSearchTerm.Trim());
         }
 
-        pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-        return pageableRequests;
+        return GetPagedRequests(searchCriteria, parameters);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
         var parameters = new NameValueCollection();
 
         if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace())
@@ -121,9 +108,7 @@ public class FileListRequestGenerator : IIndexerRequestGenerator
             parameters.Set("query", searchCriteria.SanitizedSearchTerm.Trim());
         }
 
-        pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-        return pageableRequests;
+        return GetPagedRequests(searchCriteria, parameters);
     }
 
     private IEnumerable<IndexerRequest> GetPagedRequests(SearchCriteriaBase searchCriteria, NameValueCollection parameters)

src/NzbDrone.Core/Indexers/Definitions/FunFile.cs

@@ -137,49 +137,29 @@ public class FunFileRequestGenerator : IIndexerRequestGenerator
         _capabilities = capabilities;
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.FullImdbId));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.FullImdbId);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories, searchCriteria.FullImdbId));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories, searchCriteria.FullImdbId);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
     private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories, string imdbId = null)

src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -106,8 +107,23 @@ public abstract class GazelleBase<TSettings> : TorrentIndexerBase<TSettings>
         return response;
     }
 
+    protected override IDictionary<string, string> GetCookies()
+    {
+        if (Settings is GazelleUserPassOrCookieSettings cookieSettings && !string.IsNullOrWhiteSpace(cookieSettings.Cookie))
+        {
+            return CookieUtil.CookieHeaderToDictionary(cookieSettings.Cookie);
+        }
+
+        return base.GetCookies();
+    }
+
     protected override bool CheckIfLoginNeeded(HttpResponse response)
     {
+        if (Settings is GazelleUserPassOrCookieSettings cookieSettings && !string.IsNullOrWhiteSpace(cookieSettings.Cookie))
+        {
+            return false;
+        }
+
         var invalidResponses = new[] { "\"bad credentials\"", "\"groupName\":\"wrong-creds\"" };
 
         return response.HasHttpRedirect || (response.Content != null && invalidResponses.Any(response.Content.Contains));

src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleRequestGenerator.cs

@@ -42,10 +42,8 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
         yield return request;
     }
 
-    public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public virtual IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
         var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
 
         if (searchCriteria.ImdbId != null)
@@ -53,15 +51,11 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
             parameters.Set(ImdbInTags ? "taglist" : "cataloguenumber", searchCriteria.FullImdbId);
         }
 
-        pageableRequests.Add(GetRequest(parameters));
-
-        return pageableRequests;
+        return GetRequest(parameters);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
         var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
 
         if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && searchCriteria.Artist != "VA")
@@ -79,15 +73,11 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
             parameters.Set("recordlabel", searchCriteria.Label);
         }
 
-        pageableRequests.Add(GetRequest(parameters));
-
-        return pageableRequests;
+        return GetRequest(parameters);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
         var parameters = GetBasicSearchParameters(searchCriteria.SanitizedTvSearchString, searchCriteria.Categories);
 
         if (searchCriteria.ImdbId != null)
@@ -95,29 +85,21 @@ public class GazelleRequestGenerator : IIndexerRequestGenerator
             parameters.Set(ImdbInTags ? "taglist" : "cataloguenumber", searchCriteria.FullImdbId);
         }
 
-        pageableRequests.Add(GetRequest(parameters));
-
-        return pageableRequests;
+        return GetRequest(parameters);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
         var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
-        pageableRequests.Add(GetRequest(parameters));
 
-        return pageableRequests;
+        return GetRequest(parameters);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
         var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
-        pageableRequests.Add(GetRequest(parameters));
 
-        return pageableRequests;
+        return GetRequest(parameters);
     }
 
     // hook to adjust the search term

src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleSettings.cs

@@ -4,13 +4,14 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions.Gazelle;
 
-public class GazelleSettingsValidator : UserPassBaseSettingsValidator<GazelleSettings>
+public class GazelleSettingsValidator<T> : UserPassBaseSettingsValidator<T>
+    where T : GazelleSettings
 {
 }
 
 public class GazelleSettings : UserPassTorrentBaseSettings
 {
-    private static readonly GazelleSettingsValidator Validator = new ();
+    private static readonly GazelleSettingsValidator<GazelleSettings> Validator = new ();
 
     public string AuthKey { get; set; }
     public string PassKey { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleUserPassOrCookieSettings.cs

@@ -0,0 +1,31 @@
+using FluentValidation;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Indexers.Settings;
+using NzbDrone.Core.Validation;
+
+namespace NzbDrone.Core.Indexers.Definitions.Gazelle;
+
+public class GazelleUserPassOrCookieValidator<T> : NoAuthSettingsValidator<T>
+    where T : GazelleUserPassOrCookieSettings
+{
+    public GazelleUserPassOrCookieValidator()
+    {
+        RuleFor(c => c.Username).NotEmpty().When(c => c.Cookie.IsNullOrWhiteSpace());
+        RuleFor(c => c.Password).NotEmpty().When(c => c.Cookie.IsNullOrWhiteSpace());
+        RuleFor(c => c.Cookie).NotEmpty().When(c => c.Username.IsNullOrWhiteSpace() && c.Password.IsNullOrWhiteSpace());
+    }
+}
+
+public class GazelleUserPassOrCookieSettings : GazelleSettings
+{
+    private static readonly GazelleUserPassOrCookieValidator<GazelleUserPassOrCookieSettings> Validator = new ();
+
+    [FieldDefinition(4, Label = "Cookie", HelpText = "Use the Cookie field only if 2FA is enabled for your account, leave it empty otherwise.", Privacy = PrivacyLevel.Password)]
+    public string Cookie { get; set; }
+
+    public override NzbDroneValidationResult Validate()
+    {
+        return new NzbDroneValidationResult(Validator.Validate(this));
+    }
+}

src/NzbDrone.Core/Indexers/Definitions/GazelleGames.cs

@@ -203,49 +203,29 @@ namespace NzbDrone.Core.Indexers.Definitions
         {
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetRequest(GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories)));
-
-            return pageableRequests;
+            return GetRequest(GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetRequest(GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories)));
-
-            return pageableRequests;
+            return GetRequest(GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetRequest(GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories)));
-
-            return pageableRequests;
+            return GetRequest(GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetRequest(GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories)));
-
-            return pageableRequests;
+            return GetRequest(GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetRequest(GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories)));
-
-            return pageableRequests;
+            return GetRequest(GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
         }
 
         public void FetchPasskey()

src/NzbDrone.Core/Indexers/Definitions/GreatPosterWall.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
@@ -15,6 +15,7 @@ using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Definitions;
 
@@ -74,7 +75,7 @@ public class GreatPosterWallRequestGenerator : GazelleRequestGenerator
         _settings = settings;
     }
 
-    public override IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public override IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
         var parameters = GetBasicSearchParameters(searchCriteria.SearchTerm, searchCriteria.Categories);
 
@@ -83,9 +84,7 @@ public class GreatPosterWallRequestGenerator : GazelleRequestGenerator
             parameters.Set("searchstr", searchCriteria.FullImdbId);
         }
 
-        var pageableRequests = new IndexerPageableRequestChain();
-        pageableRequests.Add(GetRequest(parameters));
-        return pageableRequests;
+        return GetRequest(parameters);
     }
 
     protected override NameValueCollection GetBasicSearchParameters(string term, int[] categories)
@@ -237,10 +236,17 @@ public class GreatPosterWallParser : GazelleParser
     }
 }
 
-public class GreatPosterWallSettings : GazelleSettings
+public class GreatPosterWallSettings : GazelleUserPassOrCookieSettings
 {
+    private static readonly GazelleUserPassOrCookieValidator<GreatPosterWallSettings> Validator = new ();
+
     [FieldDefinition(6, Label = "Freeleech Only", Type = FieldType.Checkbox, HelpText = "Search freeleech torrents only")]
     public bool FreeleechOnly { get; set; }
+
+    public override NzbDroneValidationResult Validate()
+    {
+        return new NzbDroneValidationResult(Validator.Validate(this));
+    }
 }
 
 public class GreatPosterWallResponse

src/NzbDrone.Core/Indexers/Definitions/HDBits/HDBitsRequestGenerator.cs

@@ -16,9 +16,8 @@ namespace NzbDrone.Core.Indexers.Definitions.HDBits
         public IndexerCapabilities Capabilities { get; set; }
         public HDBitsSettings Settings { get; set; }
 
-        public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public virtual IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
             var query = new TorrentQuery();
             var imdbId = ParseUtil.GetImdbID(searchCriteria.ImdbId).GetValueOrDefault(0);
 
@@ -38,9 +37,7 @@ namespace NzbDrone.Core.Indexers.Definitions.HDBits
                 query.ImdbInfo.Id = imdbId;
             }
 
-            pageableRequests.Add(GetRequest(query));
-
-            return pageableRequests;
+            return GetRequest(query);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }
@@ -68,14 +65,13 @@ namespace NzbDrone.Core.Indexers.Definitions.HDBits
             yield return new IndexerRequest(request);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
             var query = new TorrentQuery();
             var tvdbId = searchCriteria.TvdbId.GetValueOrDefault(0);
             var imdbId = ParseUtil.GetImdbID(searchCriteria.ImdbId).GetValueOrDefault(0);
@@ -112,19 +108,16 @@ namespace NzbDrone.Core.Indexers.Definitions.HDBits
                 query.ImdbInfo.Id = imdbId;
             }
 
-            pageableRequests.Add(GetRequest(query));
-
-            return pageableRequests;
+            return GetRequest(query);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
             var query = new TorrentQuery();
 
             if (searchCriteria.Categories?.Length > 0)
@@ -137,9 +130,7 @@ namespace NzbDrone.Core.Indexers.Definitions.HDBits
                 query.Search = searchCriteria.SanitizedSearchTerm;
             }
 
-            pageableRequests.Add(GetRequest(query));
-
-            return pageableRequests;
+            return GetRequest(query);
         }
     }
 }

src/NzbDrone.Core/Indexers/Definitions/HDSpace.cs

@@ -178,45 +178,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.ImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.ImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.ImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.ImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/HDTorrents.cs

@@ -166,49 +166,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Headphones/HeadphonesRequestGenerator.cs

@@ -25,18 +25,15 @@ namespace NzbDrone.Core.Indexers.Headphones
             PageSize = 100;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
             var capabilities = Capabilities;
 
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
             if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && capabilities.MusicSearchArtistAvailable)
@@ -67,30 +64,22 @@ namespace NzbDrone.Core.Indexers.Headphones
                 }
             }
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria,
-                parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
             var capabilities = Capabilities;
-            var pageableRequests = new IndexerPageableRequestChain();
 
             var parameters = new NameValueCollection();
 
@@ -99,9 +88,7 @@ namespace NzbDrone.Core.Indexers.Headphones
                 parameters.Add("q", NewsnabifyTitle(searchCriteria.SearchTerm));
             }
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, parameters);
         }
 
         private IEnumerable<IndexerRequest> GetPagedRequests(SearchCriteriaBase searchCriteria, NameValueCollection parameters)
@@ -120,15 +107,9 @@ namespace NzbDrone.Core.Indexers.Headphones
                 baseUrl += "&apikey=" + Settings.ApiKey;
             }
 
-            if (searchCriteria.Limit.HasValue)
-            {
-                parameters.Add("limit", searchCriteria.Limit.ToString());
-            }
+            parameters.Add("limit", searchCriteria.Limit.ToString());
 
-            if (searchCriteria.Offset.HasValue)
-            {
-                parameters.Add("offset", searchCriteria.Offset.ToString());
-            }
+            parameters.Add("offset", searchCriteria.Offset.ToString());
 
             var request = new IndexerRequest(string.Format("{0}&{1}", baseUrl, parameters.GetQueryString()), HttpAccept.Rss);
             request.HttpRequest.Credentials = new BasicNetworkCredential(Settings.Username, Settings.Password);

src/NzbDrone.Core/Indexers/Definitions/IPTorrents.cs

@@ -212,49 +212,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories, searchCriteria.Limit ?? 100, searchCriteria.Offset ?? 0, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit ?? 100, searchCriteria.Offset ?? 0));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.Limit ?? 100, searchCriteria.Offset ?? 0, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit ?? 100, searchCriteria.Offset ?? 0));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit ?? 100, searchCriteria.Offset ?? 0));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/ImmortalSeed.cs

@@ -166,49 +166,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             _capabilities = capabilities;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
         private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)

src/NzbDrone.Core/Indexers/Definitions/Libble.cs

@@ -123,9 +123,8 @@ public class LibbleRequestGenerator : IIndexerRequestGenerator
         _capabilities = capabilities;
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
         var parameters = new NameValueCollection();
 
         if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && searchCriteria.Artist != "VA")
@@ -157,34 +156,29 @@ public class LibbleRequestGenerator : IIndexerRequestGenerator
             parameters.Set("tags_type", "0");
         }
 
-        pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-        return pageableRequests;
+        return GetPagedRequests(searchCriteria, parameters);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
         var parameters = new NameValueCollection();
 
-        pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-        return pageableRequests;
+        return GetPagedRequests(searchCriteria, parameters);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
     private IEnumerable<IndexerRequest> GetPagedRequests(SearchCriteriaBase searchCriteria, NameValueCollection parameters)
@@ -206,7 +200,7 @@ public class LibbleRequestGenerator : IIndexerRequestGenerator
             queryCats.ForEach(cat => parameters.Set($"filter_cat[{cat}]", "1"));
         }
 
-        if (searchCriteria.Offset.HasValue && searchCriteria.Limit.HasValue && searchCriteria.Offset > 0 && searchCriteria.Limit > 0)
+        if (searchCriteria.Offset > 0 && searchCriteria.Limit > 0)
         {
             var page = (int)(searchCriteria.Offset / searchCriteria.Limit) + 1;
             parameters.Set("page", page.ToString());

src/NzbDrone.Core/Indexers/Definitions/MoreThanTV.cs

@@ -90,28 +90,26 @@ public class MoreThanTVRequestGenerator : IIndexerRequestGenerator
         };
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         => PerformRequest(searchCriteria);
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         => PerformRequest(searchCriteria);
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         => PerformRequest(searchCriteria);
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         => PerformRequest(searchCriteria);
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         => PerformRequest(searchCriteria);
 
     public Func<IDictionary<string, string>> GetCookies { get; set; }
     public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
 
-    private IndexerPageableRequestChain PerformRequest(SearchCriteriaBase query)
+    private IEnumerable<IndexerRequest> PerformRequest(SearchCriteriaBase query)
     {
-        var chain = new IndexerPageableRequestChain();
-
         var requests = new List<IndexerRequest> { new (new HttpRequest(GetTorrentSearchUrl(query)) { Headers = new HttpHeader(BrowserHeaders), AllowAutoRedirect = true }) };
 
         if (query is TvSearchCriteria tvSearchCriteria)
@@ -127,9 +125,7 @@ public class MoreThanTVRequestGenerator : IIndexerRequestGenerator
             }
         }
 
-        chain.Add(requests);
-
-        return chain;
+        return requests;
     }
 
     private string GetTorrentSearchUrl(SearchCriteriaBase query, string overrideSearchTerm = null)

src/NzbDrone.Core/Indexers/Definitions/MyAnonamouse.cs

@@ -236,8 +236,8 @@ namespace NzbDrone.Core.Indexers.Definitions
                 { "tor[srchIn][narrator]", "true" },
                 { "tor[searchIn]", "torrents" },
                 { "tor[sortType]", "default" },
-                { "tor[perpage]", searchCriteria.Limit?.ToString() ?? "100" },
-                { "tor[startNumber]", searchCriteria.Offset?.ToString() ?? "0" },
+                { "tor[perpage]", searchCriteria.Limit.ToString() },
+                { "tor[startNumber]", searchCriteria.Offset.ToString() },
                 { "thumbnails", "1" }, // gives links for thumbnail sized versions of their posters
                 { "description", "1" } // include the description
             };
@@ -284,37 +284,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(searchCriteria));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(searchCriteria));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Nebulance.cs

@@ -98,20 +98,18 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return new IndexerRequest(builder.Build());
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
             var queryParams = new NebulanceQuery
             {
                 Age = ">0"
@@ -141,20 +139,16 @@ namespace NzbDrone.Core.Indexers.Definitions
                 }
             }
 
-            pageableRequests.Add(GetPagedRequests(queryParams, searchCriteria.Limit, searchCriteria.Offset));
-
-            return pageableRequests;
+            return GetPagedRequests(queryParams, searchCriteria.Limit, searchCriteria.Offset);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
             var queryParams = new NebulanceQuery
             {
                 Age = ">0"
@@ -165,9 +159,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                 queryParams.Name = "%" + Regex.Replace(searchCriteria.SanitizedSearchTerm, @"[ -._]+", "%").Trim() + "%";
             }
 
-            pageableRequests.Add(GetPagedRequests(queryParams, searchCriteria.Limit, searchCriteria.Offset));
-
-            return pageableRequests;
+            return GetPagedRequests(queryParams, searchCriteria.Limit, searchCriteria.Offset);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs

@@ -26,11 +26,10 @@ namespace NzbDrone.Core.Indexers.Newznab
             PageSize = 100;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
             var capabilities = _capabilitiesProvider.GetCapabilities(Settings, Definition);
 
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
             if (searchCriteria.TmdbId.HasValue && capabilities.MovieSearchTmdbAvailable)
@@ -66,18 +65,13 @@ namespace NzbDrone.Core.Indexers.Newznab
                 }
             }
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria,
-                capabilities,
-                parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, capabilities, parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
             var capabilities = _capabilitiesProvider.GetCapabilities(Settings, Definition);
 
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
             if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && capabilities.MusicSearchArtistAvailable)
@@ -108,18 +102,13 @@ namespace NzbDrone.Core.Indexers.Newznab
                 }
             }
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria,
-                capabilities,
-                parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, capabilities, parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
             var capabilities = _capabilitiesProvider.GetCapabilities(Settings, Definition);
 
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
             if (searchCriteria.TvdbId.HasValue && capabilities.TvSearchTvdbAvailable)
@@ -175,18 +164,13 @@ namespace NzbDrone.Core.Indexers.Newznab
                 }
             }
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria,
-                capabilities,
-                parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, capabilities, parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
             var capabilities = _capabilitiesProvider.GetCapabilities(Settings, Definition);
 
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
             if (searchCriteria.Author.IsNotNullOrWhiteSpace() && capabilities.BookSearchAuthorAvailable)
@@ -217,17 +201,12 @@ namespace NzbDrone.Core.Indexers.Newznab
                 }
             }
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria,
-                capabilities,
-                parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, capabilities, parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
             var capabilities = _capabilitiesProvider.GetCapabilities(Settings, Definition);
-            var pageableRequests = new IndexerPageableRequestChain();
 
             var parameters = new NameValueCollection();
 
@@ -236,9 +215,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                 parameters.Set("q", NewsnabifyTitle(searchCriteria.SearchTerm));
             }
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria, capabilities, parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, capabilities, parameters);
         }
 
         private IEnumerable<IndexerRequest> GetPagedRequests(SearchCriteriaBase searchCriteria, IndexerCapabilities capabilities, NameValueCollection parameters)
@@ -262,15 +239,9 @@ namespace NzbDrone.Core.Indexers.Newznab
                 searchUrl += "&apikey=" + Settings.ApiKey;
             }
 
-            if (searchCriteria.Limit.HasValue)
-            {
-                parameters.Set("limit", searchCriteria.Limit.ToString());
-            }
+            parameters.Set("limit", searchCriteria.Limit.ToString());
 
-            if (searchCriteria.Offset.HasValue)
-            {
-                parameters.Set("offset", searchCriteria.Offset.ToString());
-            }
+            parameters.Set("offset", searchCriteria.Offset.ToString());
 
             if (parameters.Count > 0)
             {

src/NzbDrone.Core/Indexers/Definitions/NorBits.cs

@@ -199,49 +199,29 @@ public class NorBitsRequestGenerator : IIndexerRequestGenerator
         yield return request;
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.FullImdbId));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.FullImdbId);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories, searchCriteria.FullImdbId));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories, searchCriteria.FullImdbId);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
     public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/NzbIndex.cs

@@ -1054,49 +1054,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit ?? 100, searchCriteria.Offset ?? 0));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit ?? 100, searchCriteria.Offset ?? 0));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.Limit ?? 100, searchCriteria.Offset ?? 0));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit ?? 100, searchCriteria.Offset ?? 0));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit ?? 100, searchCriteria.Offset ?? 0));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Orpheus.cs

@@ -132,9 +132,8 @@ namespace NzbDrone.Core.Indexers.Definitions
             _capabilities = capabilities;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
             if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && searchCriteria.Artist != "VA")
@@ -152,39 +151,31 @@ namespace NzbDrone.Core.Indexers.Definitions
                 parameters.Set("year", searchCriteria.Year.ToString());
             }
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, parameters);
         }
 
         private IEnumerable<IndexerRequest> GetPagedRequests(SearchCriteriaBase searchCriteria, NameValueCollection parameters)

src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornRequestGenerator.cs

@@ -18,20 +18,14 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
         public IIndexerHttpClient HttpClient { get; set; }
         public Logger Logger { get; set; }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
             if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace())
             {
-                pageableRequests.Add(GetRequest(searchCriteria.FullImdbId));
-            }
-            else
-            {
-                pageableRequests.Add(GetRequest(string.Format("{0}", searchCriteria.SearchTerm)));
+                return GetRequest(searchCriteria.FullImdbId);
             }
 
-            return pageableRequests;
+            return GetRequest(string.Format("{0}", searchCriteria.SearchTerm));
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }
@@ -72,28 +66,24 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetRequest(string.Format("{0}", searchCriteria.SearchTerm)));
-
-            return pageableRequests;
+            return GetRequest(string.Format("{0}", searchCriteria.SearchTerm));
         }
     }
 }

src/NzbDrone.Core/Indexers/Definitions/PirateTheNet.cs

@@ -135,37 +135,29 @@ public class PirateTheNetRequestGenerator : IIndexerRequestGenerator
         _capabilities = capabilities;
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.FullImdbId));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.FullImdbId);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
     private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories, string imdbId = null)

src/NzbDrone.Core/Indexers/Definitions/PornoLab.cs

@@ -269,49 +269,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/PreToMe.cs

@@ -276,49 +276,29 @@ public class PreToMeRequestGenerator : IIndexerRequestGenerator
         yield return request;
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.FullImdbId));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.FullImdbId);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories, searchCriteria.FullImdbId));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories, searchCriteria.FullImdbId);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
     public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs

@@ -22,29 +22,43 @@ namespace NzbDrone.Core.Indexers.Definitions.Rarbg
             _rateLimit = rateLimit;
         }
 
-        private IEnumerable<IndexerRequest> GetRequest(string term, int[] categories, string imdbId = null, int? tmdbId = null, int? tvdbId = null)
+        private IEnumerable<IndexerRequest> GetRequest(bool isRssSearch, string term, int[] categories, string imdbId = null, int? tmdbId = null, int? tvdbId = null)
         {
             var requestBuilder = new HttpRequestBuilder(Settings.BaseUrl.Trim('/'))
                 .Resource("/pubapi_v2.php")
-                .AddQueryParam("mode", "search")
+                .AddQueryParam("limit", "100")
+                .AddQueryParam("token", _tokenProvider.GetToken(Settings, _rateLimit))
+                .AddQueryParam("format", "json_extended")
+                .AddQueryParam("app_id", $"rralworP_{BuildInfo.Version}")
                 .Accept(HttpAccept.Json);
 
-            if (imdbId.IsNotNullOrWhiteSpace())
+            if (isRssSearch)
             {
-                requestBuilder.AddQueryParam("search_imdb", imdbId);
+                requestBuilder
+                    .AddQueryParam("mode", "list")
+                    .WithRateLimit(31);
             }
-            else if (tmdbId.HasValue && tmdbId > 0)
+            else
             {
-                requestBuilder.AddQueryParam("search_themoviedb", tmdbId);
-            }
-            else if (tvdbId.HasValue && tvdbId > 0)
-            {
-                requestBuilder.AddQueryParam("search_tvdb", tvdbId);
-            }
+                requestBuilder.AddQueryParam("mode", "search");
 
-            if (term.IsNotNullOrWhiteSpace())
-            {
-                requestBuilder.AddQueryParam("search_string", $"{term}");
+                if (imdbId.IsNotNullOrWhiteSpace())
+                {
+                    requestBuilder.AddQueryParam("search_imdb", imdbId);
+                }
+                else if (tmdbId.HasValue && tmdbId > 0)
+                {
+                    requestBuilder.AddQueryParam("search_themoviedb", tmdbId);
+                }
+                else if (tvdbId.HasValue && tvdbId > 0)
+                {
+                    requestBuilder.AddQueryParam("search_tvdb", tvdbId);
+                }
+
+                if (term.IsNotNullOrWhiteSpace())
+                {
+                    requestBuilder.AddQueryParam("search_string", $"{term}");
+                }
             }
 
             if (!Settings.RankedOnly)
@@ -53,55 +67,40 @@ namespace NzbDrone.Core.Indexers.Definitions.Rarbg
             }
 
             var cats = Categories.MapTorznabCapsToTrackers(categories);
-
-            if (cats != null && cats.Count > 0)
+            if (cats == null || !cats.Any())
             {
-                var categoryParam = string.Join(";", cats.Distinct());
-                requestBuilder.AddQueryParam("category", categoryParam);
+                // default to all, without specifying it some categories are missing (e.g. games), see #4146
+                cats = Categories.GetTrackerCategories();
             }
 
-            requestBuilder.AddQueryParam("limit", "100");
-            requestBuilder.AddQueryParam("token", _tokenProvider.GetToken(Settings, _rateLimit));
-            requestBuilder.AddQueryParam("format", "json_extended");
-            requestBuilder.AddQueryParam("app_id", $"rralworP_{BuildInfo.Version}");
+            requestBuilder.AddQueryParam("category", string.Join(";", cats.Distinct()));
 
             yield return new IndexerRequest(requestBuilder.Build());
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories, searchCriteria.FullImdbId, searchCriteria.TmdbId));
-            return pageableRequests;
+            return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories, searchCriteria.FullImdbId, searchCriteria.TmdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-            return pageableRequests;
+            return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedTvSearchString, searchCriteria.Categories, searchCriteria.FullImdbId, tvdbId: searchCriteria.TvdbId));
-            return pageableRequests;
+            return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedTvSearchString, searchCriteria.Categories, searchCriteria.FullImdbId, tvdbId: searchCriteria.TvdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-            return pageableRequests;
+            return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Redacted.cs

@@ -104,9 +104,8 @@ namespace NzbDrone.Core.Indexers.Definitions
             _capabilities = capabilities;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
             if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && searchCriteria.Artist != "VA")
@@ -124,39 +123,31 @@ namespace NzbDrone.Core.Indexers.Definitions
                 parameters.Set("year", searchCriteria.Year.ToString());
             }
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
             var parameters = new NameValueCollection();
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria, parameters));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria, parameters);
         }
 
         private IEnumerable<IndexerRequest> GetPagedRequests(SearchCriteriaBase searchCriteria, NameValueCollection parameters)

src/NzbDrone.Core/Indexers/Definitions/RevolutionTT.cs

@@ -185,49 +185,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/RuTracker.cs

@@ -1506,54 +1506,34 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
             if (searchCriteria.Season == null)
             {
                 searchCriteria.Season = 0;
             }
 
-            pageableRequests.Add(GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/SceneHD.cs

@@ -120,49 +120,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs

@@ -141,49 +141,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Shazbat.cs

@@ -124,37 +124,29 @@ public class ShazbatRequestGenerator : IIndexerRequestGenerator
         _settings = settings;
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}");
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        return new IndexerPageableRequestChain();
+        return new List<IndexerRequest>();
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}");
     }
 
     private IEnumerable<IndexerRequest> GetPagedRequests(string term)

src/NzbDrone.Core/Indexers/Definitions/Shizaproject.cs

@@ -129,43 +129,31 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         // Shizaproject doesn't support music, but this function required by interface
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
         // Shizaproject doesn't support books, but this function required by interface
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/SpeedApp/SpeedAppBase.cs

@@ -140,38 +140,34 @@ namespace NzbDrone.Core.Indexers.Definitions
             _pageSize = pageSize;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
             return GetSearch(searchCriteria, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
             return GetSearch(searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
             return GetSearch(searchCriteria, searchCriteria.FullImdbId, searchCriteria.Season, searchCriteria.Episode);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
             return GetSearch(searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
             return GetSearch(searchCriteria);
         }
 
-        private IndexerPageableRequestChain GetSearch(SearchCriteriaBase searchCriteria, string imdbId = null, int? season = null, string episode = null)
+        private IEnumerable<IndexerRequest> GetSearch(SearchCriteriaBase searchCriteria, string imdbId = null, int? season = null, string episode = null)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.Limit ?? _pageSize, searchCriteria.Offset ?? 0, imdbId, season, episode));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories, searchCriteria.Limit, searchCriteria.Offset, imdbId, season, episode);
         }
 
         private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories, int limit, int offset, string imdbId = null, int? season = null, string episode = null)

src/NzbDrone.Core/Indexers/Definitions/SpeedCD.cs

@@ -225,10 +225,8 @@ public class SpeedCDRequestGenerator : IIndexerRequestGenerator
         yield return request;
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
         var term = $"{searchCriteria.SanitizedSearchTerm}";
 
         if (searchCriteria.FullImdbId.IsNotNullOrWhiteSpace())
@@ -236,24 +234,16 @@ public class SpeedCDRequestGenerator : IIndexerRequestGenerator
             term = $"{searchCriteria.FullImdbId}";
         }
 
-        pageableRequests.Add(GetPagedRequests(term.Trim(), searchCriteria.Categories, searchCriteria.FullImdbId.IsNotNullOrWhiteSpace()));
-
-        return pageableRequests;
+        return GetPagedRequests(term.Trim(), searchCriteria.Categories, searchCriteria.FullImdbId.IsNotNullOrWhiteSpace());
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
         var term = $"{searchCriteria.SanitizedTvSearchString}";
 
         if (searchCriteria.FullImdbId.IsNotNullOrWhiteSpace())
@@ -271,27 +261,17 @@ public class SpeedCDRequestGenerator : IIndexerRequestGenerator
             }
         }
 
-        pageableRequests.Add(GetPagedRequests(term.Trim(), searchCriteria.Categories, searchCriteria.FullImdbId.IsNotNullOrWhiteSpace()));
-
-        return pageableRequests;
+        return GetPagedRequests(term.Trim(), searchCriteria.Categories, searchCriteria.FullImdbId.IsNotNullOrWhiteSpace());
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
     public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/SubsPlease.cs

@@ -111,47 +111,33 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(searchCriteria.IsRssSearch
+            return searchCriteria.IsRssSearch
                 ? GetRssRequest()
-                : GetSearchRequests(searchCriteria.SanitizedTvSearchString));
-
-            return pageableRequests;
+                : GetSearchRequests(searchCriteria.SanitizedTvSearchString);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(searchCriteria.IsRssSearch
+            return searchCriteria.IsRssSearch
                 ? GetRssRequest()
-                : GetSearchRequests(searchCriteria.SanitizedSearchTerm));
-
-            return pageableRequests;
+                : GetSearchRequests(searchCriteria.SanitizedSearchTerm);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/TVVault.cs

@@ -160,41 +160,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         private string StripSearchString(string term)

src/NzbDrone.Core/Indexers/Definitions/Toloka.cs

@@ -262,28 +262,18 @@ namespace NzbDrone.Core.Indexers.Definitions
             _capabilities = capabilities;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
             var term = $"{searchCriteria.SanitizedSearchTerm}";
 
             if (searchCriteria.Season is > 0)
@@ -291,27 +281,17 @@ namespace NzbDrone.Core.Indexers.Definitions
                 term += $" Сезон {searchCriteria.Season}";
             }
 
-            pageableRequests.Add(GetPagedRequests(term, searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(term, searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
         }
 
         private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)

src/NzbDrone.Core/Indexers/Definitions/TorrentBytes.cs

@@ -183,47 +183,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            return pageableRequests;
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/TorrentDay.cs

@@ -167,49 +167,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.FullImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoRequestGenerator.cs

@@ -14,13 +14,9 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
         {
         }
 
-        public virtual IndexerPageableRequestChain GetRecentRequests()
+        public virtual IEnumerable<IndexerRequest> GetRecentRequests()
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests("list", null, null));
-
-            return pageableRequests;
+            return GetPagedRequests("list", null, null);
         }
 
         private IEnumerable<IndexerRequest> GetPagedRequests(string mode, int? tvdbId, string query, params object[] args)
@@ -72,31 +68,29 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
             yield return new IndexerRequest(requestBuilder.Build());
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetMovieRequest(searchCriteria));
-            return pageableRequests;
+            return GetMovieRequest(searchCriteria);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/TorrentSyndikat.cs

@@ -162,49 +162,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.ImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories, searchCriteria.ImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.ImdbId));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories, searchCriteria.ImdbId);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/TorrentsCSV.cs

@@ -95,41 +95,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Definitions/UNIT3D/Unit3dRequestGenerator.cs

@@ -22,7 +22,7 @@ namespace NzbDrone.Core.Indexers.Definitions.UNIT3D
         public Func<IDictionary<string, string>> GetCookies { get; set; }
         public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
             var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
 
@@ -38,21 +38,17 @@ namespace NzbDrone.Core.Indexers.Definitions.UNIT3D
                 parameters.Add("tmdbId", searchCriteria.TmdbId.ToString());
             }
 
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(parameters));
-            return pageableRequests;
+            return GetRequest(parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
             var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
 
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(parameters));
-            return pageableRequests;
+            return GetRequest(parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
             var parameters = GetBasicSearchParameters(searchCriteria.SanitizedTvSearchString, searchCriteria.Categories);
 
@@ -68,27 +64,21 @@ namespace NzbDrone.Core.Indexers.Definitions.UNIT3D
                 parameters.Add("tvdbId", searchCriteria.TvdbId.ToString());
             }
 
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(parameters));
-            return pageableRequests;
+            return GetRequest(parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
             var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
 
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(parameters));
-            return pageableRequests;
+            return GetRequest(parameters);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
             var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
 
-            var pageableRequests = new IndexerPageableRequestChain();
-            pageableRequests.Add(GetRequest(parameters));
-            return pageableRequests;
+            return GetRequest(parameters);
         }
 
         private IEnumerable<IndexerRequest> GetRequest(List<KeyValuePair<string, string>> searchParameters)

src/NzbDrone.Core/Indexers/Definitions/Uniotaku.cs

@@ -154,49 +154,29 @@ public class UniotakuRequestGenerator : IIndexerRequestGenerator
         _capabilities = capabilities;
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
     private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)

src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs

@@ -173,49 +173,29 @@ public class XSpeedsRequestGenerator : IIndexerRequestGenerator
         _capabilities = capabilities;
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedTvSearchString}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
-    public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+    public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
     {
-        var pageableRequests = new IndexerPageableRequestChain();
-
-        pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories));
-
-        return pageableRequests;
+        return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories);
     }
 
     private IEnumerable<IndexerRequest> GetPagedRequests(string term, int[] categories)

src/NzbDrone.Core/Indexers/Definitions/Xthor/XthorRequestGenerator.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Text.RegularExpressions;
@@ -83,21 +83,19 @@ namespace NzbDrone.Core.Indexers.Definitions.Xthor
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequestsCommon(SearchCriteriaBase searchCriteria,
-            string searchTerm,
-            string tmdbid = null)
+        public IEnumerable<IndexerRequest> GetSearchRequestsCommon(SearchCriteriaBase searchCriteria, string searchTerm, string tmdbid = null)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
             var actualPage = 0;
 
+            var requests = new List<IndexerRequest>();
+
             while (actualPage < Settings.MaxPages)
             {
-                pageableRequests.Add(GetPagedRequests(searchTerm, searchCriteria.Categories, actualPage, tmdbid));
+                requests.AddRange(GetPagedRequests(searchTerm, searchCriteria.Categories, actualPage, tmdbid));
 
                 if (Settings.EnhancedFrenchAccent && (Settings.Accent == 1 || Settings.Accent == 2))
                 {
-                    pageableRequests.Add(
-                        GetPagedRequests(searchTerm, searchCriteria.Categories, actualPage, tmdbid, 47));
+                    requests.AddRange(GetPagedRequests(searchTerm, searchCriteria.Categories, actualPage, tmdbid, 47));
                 }
 
                 if (tmdbid.IsNotNullOrWhiteSpace() && Settings.ByPassPageForTmDbid)
@@ -108,33 +106,33 @@ namespace NzbDrone.Core.Indexers.Definitions.Xthor
                 ++actualPage;
             }
 
-            return pageableRequests;
+            return requests;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
             return GetSearchRequestsCommon(searchCriteria,
                 string.Format("{0}", searchCriteria.SanitizedSearchTerm),
                 searchCriteria.TmdbId.ToString());
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
             return GetSearchRequestsCommon(searchCriteria, string.Format("{0}", searchCriteria.SanitizedSearchTerm));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
             return GetSearchRequestsCommon(searchCriteria,
                 string.Format("{0}", searchCriteria.SanitizedTvSearchString));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
             return GetSearchRequestsCommon(searchCriteria, string.Format("{0}", searchCriteria.SanitizedSearchTerm));
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
             return GetSearchRequestsCommon(searchCriteria, string.Format("{0}", searchCriteria.SanitizedSearchTerm));
         }

src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs

@@ -251,49 +251,29 @@ namespace NzbDrone.Core.Indexers.Definitions
             yield return request;
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedTvSearchString), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories));
-
-            return pageableRequests;
+            return GetPagedRequests(string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.Categories);
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/HttpIndexerBase.cs

@@ -233,7 +233,7 @@ namespace NzbDrone.Core.Indexers
             _indexerStatusService.UpdateCookies(Definition.Id, cookies, expiration);
         }
 
-        protected virtual async Task<IndexerPageableQueryResult> FetchReleases(Func<IIndexerRequestGenerator, IndexerPageableRequestChain> pageableRequestChainSelector, SearchCriteriaBase searchCriteria, bool isRecent = false)
+        protected virtual async Task<IndexerPageableQueryResult> FetchReleases(Func<IIndexerRequestGenerator, IEnumerable<IndexerRequest>> pageableRequestChainSelector, SearchCriteriaBase searchCriteria, bool isRecent = false)
         {
             var releases = new List<ReleaseInfo>();
             var result = new IndexerPageableQueryResult();
@@ -250,41 +250,19 @@ namespace NzbDrone.Core.Indexers
 
                 var pageableRequestChain = pageableRequestChainSelector(generator);
 
-                for (int i = 0; i < pageableRequestChain.Tiers; i++)
+                foreach (var pageableRequest in pageableRequestChain)
                 {
-                    var pageableRequests = pageableRequestChain.GetTier(i);
+                    var pageSize = PageSize;
 
-                    foreach (var pageableRequest in pageableRequests)
-                    {
-                        var pagedReleases = new List<ReleaseInfo>();
+                    url = pageableRequest.Url.FullUri;
 
-                        var pageSize = PageSize;
+                    var page = await FetchPage(pageableRequest, parser);
 
-                        foreach (var request in pageableRequest)
-                        {
-                            url = request.Url.FullUri;
+                    pageSize = pageSize == 1 ? page.Releases.Count : pageSize;
 
-                            var page = await FetchPage(request, parser);
+                    result.Queries.Add(page);
 
-                            pageSize = pageSize == 1 ? page.Releases.Count : pageSize;
-
-                            result.Queries.Add(page);
-
-                            pagedReleases.AddRange(page.Releases);
-
-                            if (!IsFullPage(page.Releases, pageSize))
-                            {
-                                break;
-                            }
-                        }
-
-                        releases.AddRange(pagedReleases);
-                    }
-
-                    if (releases.Any())
-                    {
-                        break;
-                    }
+                    releases.AddRange(page.Releases);
                 }
 
                 _indexerStatusService.RecordSuccess(Definition.Id);
@@ -377,11 +355,6 @@ namespace NzbDrone.Core.Indexers
             return Capabilities ?? ((IndexerDefinition)Definition).Capabilities;
         }
 
-        protected virtual bool IsFullPage(IList<ReleaseInfo> page, int pageSize)
-        {
-            return pageSize != 0 && page.Count >= pageSize;
-        }
-
         protected virtual async Task<IndexerQueryResult> FetchPage(IndexerRequest request, IParseIndexerResponse parser)
         {
             var response = await FetchIndexerResponse(request);
@@ -549,7 +522,7 @@ namespace NzbDrone.Core.Indexers
                     testCriteria.SearchTerm = "test";
                 }
 
-                var firstRequest = generator.GetSearchRequests(testCriteria).GetAllTiers().FirstOrDefault()?.FirstOrDefault();
+                var firstRequest = generator.GetSearchRequests(testCriteria).FirstOrDefault();
 
                 if (firstRequest == null)
                 {

src/NzbDrone.Core/Indexers/IIndexerRequestGenerator.cs

@@ -6,11 +6,11 @@ namespace NzbDrone.Core.Indexers
 {
     public interface IIndexerRequestGenerator
     {
-        IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria);
-        IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria);
-        IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria);
-        IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria);
-        IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria);
+        IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria);
+        IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria);
+        IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria);
+        IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria);
+        IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria);
         Func<IDictionary<string, string>> GetCookies { get; set; }
         Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
     }

src/NzbDrone.Core/Indexers/IndexerPageableRequest.cs

@@ -1,25 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-
-namespace NzbDrone.Core.Indexers
-{
-    public class IndexerPageableRequest : IEnumerable<IndexerRequest>
-    {
-        private readonly IEnumerable<IndexerRequest> _enumerable;
-
-        public IndexerPageableRequest(IEnumerable<IndexerRequest> enumerable)
-        {
-            _enumerable = enumerable;
-        }
-
-        public IEnumerator<IndexerRequest> GetEnumerator()
-        {
-            return _enumerable.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return _enumerable.GetEnumerator();
-        }
-    }
-}

src/NzbDrone.Core/Indexers/IndexerPageableRequestChain.cs

@@ -1,54 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace NzbDrone.Core.Indexers
-{
-    public class IndexerPageableRequestChain
-    {
-        private List<List<IndexerPageableRequest>> _chains;
-
-        public IndexerPageableRequestChain()
-        {
-            _chains = new List<List<IndexerPageableRequest>>();
-            _chains.Add(new List<IndexerPageableRequest>());
-        }
-
-        public int Tiers => _chains.Count;
-
-        public IEnumerable<IndexerPageableRequest> GetAllTiers()
-        {
-            return _chains.SelectMany(v => v);
-        }
-
-        public IEnumerable<IndexerPageableRequest> GetTier(int index)
-        {
-            return _chains[index];
-        }
-
-        public void Add(IEnumerable<IndexerRequest> request)
-        {
-            if (request == null)
-            {
-                return;
-            }
-
-            _chains.Last().Add(new IndexerPageableRequest(request));
-        }
-
-        public void AddTier(IEnumerable<IndexerRequest> request)
-        {
-            AddTier();
-            Add(request);
-        }
-
-        public void AddTier()
-        {
-            if (_chains.Last().Count == 0)
-            {
-                return;
-            }
-
-            _chains.Add(new List<IndexerPageableRequest>());
-        }
-    }
-}

src/NzbDrone.Core/Indexers/RssIndexerRequestGenerator.cs

@@ -14,38 +14,34 @@ namespace NzbDrone.Core.Indexers
             _baseUrl = baseUrl;
         }
 
-        public virtual IndexerPageableRequestChain GetRecentRequests()
+        public virtual IEnumerable<IndexerRequest> GetRecentRequests()
         {
-            var pageableRequests = new IndexerPageableRequestChain();
-
-            pageableRequests.Add(new[] { new IndexerRequest(_baseUrl, HttpAccept.Rss) });
-
-            return pageableRequests;
+            return new[] { new IndexerRequest(_baseUrl, HttpAccept.Rss) };
         }
 
-        public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria)
+        public virtual IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
-        public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria)
+        public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
         {
-            return new IndexerPageableRequestChain();
+            return new List<IndexerRequest>();
         }
 
         public Func<IDictionary<string, string>> GetCookies { get; set; }

src/NzbDrone.Core/Indexers/Settings/CookieTorrentBaseSettings.cs

@@ -4,38 +4,28 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Settings
 {
-    public class CookieBaseSettingsValidator : AbstractValidator<CookieTorrentBaseSettings>
+    public class CookieBaseSettingsValidator<T> : NoAuthSettingsValidator<T>
+        where T : CookieTorrentBaseSettings
     {
         public CookieBaseSettingsValidator()
         {
             RuleFor(c => c.Cookie).NotEmpty();
-            RuleFor(x => x.BaseSettings).SetValidator(new IndexerCommonSettingsValidator());
-            RuleFor(x => x.TorrentBaseSettings).SetValidator(new IndexerTorrentSettingsValidator());
         }
     }
 
-    public class CookieTorrentBaseSettings : ITorrentIndexerSettings
+    public class CookieTorrentBaseSettings : NoAuthTorrentBaseSettings
     {
-        private static readonly CookieBaseSettingsValidator Validator = new ();
+        private static readonly CookieBaseSettingsValidator<CookieTorrentBaseSettings> Validator = new ();
 
         public CookieTorrentBaseSettings()
         {
             Cookie = "";
         }
 
-        [FieldDefinition(1, Label = "Base Url", HelpText = "Select which baseurl Prowlarr will use for requests to the site", Type = FieldType.Select, SelectOptionsProviderAction = "getUrls")]
-        public string BaseUrl { get; set; }
-
-        [FieldDefinition(2, Label = "Cookie", HelpText = "Site Cookie", Privacy = PrivacyLevel.Password, Type = FieldType.Password)]
+        [FieldDefinition(2, Label = "Cookie", HelpText = "Site Cookie", Privacy = PrivacyLevel.Password)]
         public string Cookie { get; set; }
 
-        [FieldDefinition(10)]
-        public IndexerBaseSettings BaseSettings { get; set; } = new ();
-
-        [FieldDefinition(11)]
-        public IndexerTorrentBaseSettings TorrentBaseSettings { get; set; } = new ();
-
-        public virtual NzbDroneValidationResult Validate()
+        public override NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));
         }

src/NzbDrone.Core/Indexers/Settings/NoAuthTorrentBaseSettings.cs

@@ -9,8 +9,8 @@ namespace NzbDrone.Core.Indexers.Settings
     {
         public NoAuthSettingsValidator()
         {
-            RuleFor(x => x.BaseSettings).SetValidator(new IndexerCommonSettingsValidator());
-            RuleFor(x => x.TorrentBaseSettings).SetValidator(new IndexerTorrentSettingsValidator());
+            RuleFor(c => c.BaseSettings).SetValidator(new IndexerCommonSettingsValidator());
+            RuleFor(c => c.TorrentBaseSettings).SetValidator(new IndexerTorrentSettingsValidator());
         }
     }
 
@@ -21,10 +21,10 @@ namespace NzbDrone.Core.Indexers.Settings
         [FieldDefinition(1, Label = "Base Url", Type = FieldType.Select, SelectOptionsProviderAction = "getUrls", HelpText = "Select which baseurl Prowlarr will use for requests to the site")]
         public string BaseUrl { get; set; }
 
-        [FieldDefinition(10)]
+        [FieldDefinition(20)]
         public IndexerBaseSettings BaseSettings { get; set; } = new ();
 
-        [FieldDefinition(11)]
+        [FieldDefinition(21)]
         public IndexerTorrentBaseSettings TorrentBaseSettings { get; set; } = new ();
 
         public virtual NzbDroneValidationResult Validate()

src/NzbDrone.Core/Indexers/Settings/UserPassTorrentBaseSettings.cs

@@ -4,19 +4,17 @@ using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Indexers.Settings
 {
-    public class UserPassBaseSettingsValidator<T> : AbstractValidator<T>
+    public class UserPassBaseSettingsValidator<T> : NoAuthSettingsValidator<T>
         where T : UserPassTorrentBaseSettings
     {
         public UserPassBaseSettingsValidator()
         {
             RuleFor(c => c.Username).NotEmpty();
             RuleFor(c => c.Password).NotEmpty();
-            RuleFor(x => x.BaseSettings).SetValidator(new IndexerCommonSettingsValidator());
-            RuleFor(x => x.TorrentBaseSettings).SetValidator(new IndexerTorrentSettingsValidator());
         }
     }
 
-    public class UserPassTorrentBaseSettings : ITorrentIndexerSettings
+    public class UserPassTorrentBaseSettings : NoAuthTorrentBaseSettings
     {
         private static readonly UserPassBaseSettingsValidator<UserPassTorrentBaseSettings> Validator = new ();
 
@@ -26,22 +24,13 @@ namespace NzbDrone.Core.Indexers.Settings
             Password = "";
         }
 
-        [FieldDefinition(1, Label = "Base Url", HelpText = "Select which baseurl Prowlarr will use for requests to the site", Type = FieldType.Select, SelectOptionsProviderAction = "getUrls")]
-        public string BaseUrl { get; set; }
-
         [FieldDefinition(2, Label = "Username", HelpText = "Site Username", Privacy = PrivacyLevel.UserName)]
         public string Username { get; set; }
 
         [FieldDefinition(3, Label = "Password", HelpText = "Site Password", Privacy = PrivacyLevel.Password, Type = FieldType.Password)]
         public string Password { get; set; }
 
-        [FieldDefinition(10)]
-        public IndexerBaseSettings BaseSettings { get; set; } = new ();
-
-        [FieldDefinition(11)]
-        public IndexerTorrentBaseSettings TorrentBaseSettings { get; set; } = new ();
-
-        public virtual NzbDroneValidationResult Validate()
+        public override NzbDroneValidationResult Validate()
         {
             return new NzbDroneValidationResult(Validator.Validate(this));
         }

src/NzbDrone.Core/Parser/DateTimeUtil.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Globalization;
+using System.Linq;
 using System.Text.RegularExpressions;
+using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Core.Parser
 {
@@ -120,6 +122,18 @@ namespace NzbDrone.Core.Parser
             try
             {
                 str = str.Trim();
+
+                if (DateTime.TryParseExact(str, Rfc1123ZPattern, CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsedDate))
+                {
+                    return parsedDate;
+                }
+
+                // try parsing the str as an unix timestamp
+                if (str.IsAllDigits() && long.TryParse(str, out var unixTimeStamp))
+                {
+                    return UnixTimestampToDateTime(unixTimeStamp);
+                }
+
                 if (str.ToLower().Contains("now"))
                 {
                     return DateTime.UtcNow;
@@ -212,14 +226,6 @@ namespace NzbDrone.Core.Parser
                     return dt;
                 }
 
-                // try parsing the str as an unix timestamp
-                if (long.TryParse(str, out var unixTimeStamp))
-                {
-                    return UnixTimestampToDateTime(unixTimeStamp);
-                }
-
-                // it wasn't a timestamp, continue....
-
                 // add missing year
                 match = _MissingYearRegexp.Match(str);
                 if (match.Success)
@@ -250,69 +256,73 @@ namespace NzbDrone.Core.Parser
         public static DateTime ParseDateTimeGoLang(string date, string layout)
         {
             date = date.Trim();
-            var pattern = layout;
 
-            // year
-            pattern = pattern.Replace("2006", "yyyy");
-            pattern = pattern.Replace("06", "yy");
+            var commonStandardFormats = new[] { "y", "h", "d" };
 
-            // month
-            pattern = pattern.Replace("January", "MMMM");
-            pattern = pattern.Replace("Jan", "MMM");
-            pattern = pattern.Replace("01", "MM");
+            if (commonStandardFormats.Any(layout.ContainsIgnoreCase) && DateTime.TryParseExact(date, layout, CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsedDate))
+            {
+                return parsedDate;
+            }
 
-            // day
-            pattern = pattern.Replace("Monday", "dddd");
-            pattern = pattern.Replace("Mon", "ddd");
-            pattern = pattern.Replace("02", "dd");
-            pattern = pattern.Replace("2", "d");
+            var format = layout
 
-            // hours/minutes/seconds
-            pattern = pattern.Replace("05", "ss");
+                // year
+                .Replace("2006", "yyyy")
+                .Replace("06", "yy")
 
-            pattern = pattern.Replace("15", "HH");
-            pattern = pattern.Replace("03", "hh");
-            pattern = pattern.Replace("3", "h");
+                // month
+                .Replace("January", "MMMM")
+                .Replace("Jan", "MMM")
+                .Replace("01", "MM")
 
-            pattern = pattern.Replace("04", "mm");
-            pattern = pattern.Replace("4", "m");
+                // day
+                .Replace("Monday", "dddd")
+                .Replace("Mon", "ddd")
+                .Replace("02", "dd")
+                .Replace("2", "d")
 
-            pattern = pattern.Replace("5", "s");
+                // hours/minutes/seconds
+                .Replace("05", "ss")
+                .Replace("15", "HH")
+                .Replace("03", "hh")
+                .Replace("3", "h")
+                .Replace("04", "mm")
+                .Replace("4", "m")
+                .Replace("5", "s")
 
-            // month again
-            pattern = pattern.Replace("1", "M");
+                // month again
+                .Replace("1", "M")
 
-            // fractional seconds
-            pattern = pattern.Replace(".0000", "ffff");
-            pattern = pattern.Replace(".000", "fff");
-            pattern = pattern.Replace(".00", "ff");
-            pattern = pattern.Replace(".0", "f");
+                // fractional seconds
+                .Replace(".0000", "ffff")
+                .Replace(".000", "fff")
+                .Replace(".00", "ff")
+                .Replace(".0", "f")
+                .Replace(".9999", "FFFF")
+                .Replace(".999", "FFF")
+                .Replace(".99", "FF")
+                .Replace(".9", "F")
 
-            pattern = pattern.Replace(".9999", "FFFF");
-            pattern = pattern.Replace(".999", "FFF");
-            pattern = pattern.Replace(".99", "FF");
-            pattern = pattern.Replace(".9", "F");
+                // AM/PM
+                .Replace("PM", "tt")
+                .Replace("pm", "tt") // not sure if this works
 
-            // AM/PM
-            pattern = pattern.Replace("PM", "tt");
-            pattern = pattern.Replace("pm", "tt"); // not sure if this works
-
-            // timezones
-            // these might need further tuning
-            pattern = pattern.Replace("Z07:00", "'Z'zzz");
-            pattern = pattern.Replace("Z07", "'Z'zz");
-            pattern = pattern.Replace("Z07:00", "'Z'zzz");
-            pattern = pattern.Replace("Z07", "'Z'zz");
-            pattern = pattern.Replace("-07:00", "zzz");
-            pattern = pattern.Replace("-07", "zz");
+                // timezones
+                // these might need further tuning
+                .Replace("Z07:00", "'Z'zzz")
+                .Replace("Z07", "'Z'zz")
+                .Replace("Z07:00", "'Z'zzz")
+                .Replace("Z07", "'Z'zz")
+                .Replace("-07:00", "zzz")
+                .Replace("-07", "zz");
 
             try
             {
-                return DateTime.ParseExact(date, pattern, CultureInfo.InvariantCulture);
+                return DateTime.ParseExact(date, format, CultureInfo.InvariantCulture);
             }
             catch (FormatException ex)
             {
-                throw new InvalidDateException($"Error while parsing DateTime \"{date}\", using layout \"{layout}\" ({pattern}): {ex.Message}");
+                throw new InvalidDateException($"Error while parsing DateTime \"{date}\", using layout \"{layout}\" ({format}): {ex.Message}", ex);
             }
         }
 

src/NzbDrone.Core/Parser/ParseUtil.cs

@@ -2,6 +2,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.AspNetCore.WebUtilities;
+using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Core.Parser
 {
@@ -65,20 +66,29 @@ namespace NzbDrone.Core.Parser
 
         public static long? GetLongFromString(string str)
         {
-            if (str == null)
+            if (str.IsNullOrWhiteSpace())
             {
                 return null;
             }
 
-            var idRegEx = new Regex(@"(\d+)", RegexOptions.Compiled);
-            var idMatch = idRegEx.Match(str);
-            if (!idMatch.Success)
+            var extractedLong = string.Empty;
+
+            foreach (var c in str)
             {
-                return null;
+                if (c < '0' || c > '9')
+                {
+                    if (extractedLong.Length > 0)
+                    {
+                        break;
+                    }
+
+                    continue;
+                }
+
+                extractedLong += c;
             }
 
-            var id = idMatch.Groups[1].Value;
-            return CoerceLong(id);
+            return CoerceLong(extractedLong);
         }
 
         public static int? GetImdbID(string imdbstr)

src/Prowlarr.Benchmark.Test/ParserTests/DateTimeUtilFixture.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Globalization;
+using BenchmarkDotNet.Attributes;
+using NzbDrone.Core.Parser;
+
+namespace NzbDrone.Benchmark.Test.ParserTests
+{
+    [InProcess]
+    public class DateTimeUtilFixture
+    {
+        [Benchmark]
+        [Arguments("2022-08-08 02:07:39")]
+        public void parse_fuzzy_date(string dateInput)
+        {
+            DateTimeUtil.FromFuzzyTime(dateInput);
+        }
+
+        [Benchmark]
+        [Arguments("18 hours ago")]
+        public void parse_time_ago(string dateInput)
+        {
+            DateTimeUtil.FromTimeAgo(dateInput);
+        }
+
+        [Benchmark]
+        [Arguments("2022-08-08 02:07:39")]
+        [Arguments("1677173189")]
+        public void parse_unknown_date(string dateInput)
+        {
+            DateTimeUtil.FromUnknown(dateInput);
+        }
+
+        [Benchmark]
+        [Arguments("2022-08-08 02:07:39 -02:00", "2006-01-02 15:04:05 -07:00")]
+        [Arguments("2022-08-08 02:07:39 -02:00", "yyyy-MM-dd HH:mm:ss zzz")]
+        public void parse_datetime_golang(string dateInput, string format)
+        {
+            DateTimeUtil.ParseDateTimeGoLang(dateInput, format);
+        }
+
+        [Benchmark]
+        [Arguments("2022-08-08 02:07:39 -02:00", "yyyy-MM-dd HH:mm:ss zzz")]
+        public void parse_datetime_exact(string dateInput, string format)
+        {
+            DateTime.ParseExact(dateInput, format, CultureInfo.InvariantCulture);
+        }
+    }
+}

src/Prowlarr.Benchmark.Test/ParserTests/ParseUtilFixture.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+using NzbDrone.Core.Parser;
+
+namespace NzbDrone.Benchmark.Test.ParserTests
+{
+    [InProcess]
+    public class ParseUtilFixture
+    {
+        [Benchmark]
+        [Arguments("123456789")]
+        [Arguments("")]
+        [Arguments("asd8f7asdf")]
+        [Arguments("sdf")]
+        public void parse_long_from_string(string dateInput)
+        {
+            ParseUtil.GetLongFromString(dateInput);
+        }
+    }
+}

src/Prowlarr.Benchmark.Test/Program.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Security.Cryptography;
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Running;
+
+namespace NzbDrone.Benchmark.Test
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
+        }
+    }
+}

src/Prowlarr.Benchmark.Test/Prowlarr.Benchmark.Test.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <GenerateProgramFile>false</GenerateProgramFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\NzbDrone.Core\Prowlarr.Core.csproj" />
+  </ItemGroup>
+
+</Project>

src/Prowlarr.sln

@@ -70,6 +70,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prowlarr.Api.V1", "Prowlarr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prowlarr.Api.V1.Test", "Prowlarr.Api.V1.Test\Prowlarr.Api.V1.Test.csproj", "{4EB5FDB5-5908-4415-8DFD-E5740A480D92}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prowlarr.Benchmark.Test", "Prowlarr.Benchmark.Test\Prowlarr.Benchmark.Test.csproj", "{56B0D244-4791-40EE-8C01-08C34E3733B7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Posix = Debug|Posix
@@ -276,6 +278,14 @@ Global
 		{4EB5FDB5-5908-4415-8DFD-E5740A480D92}.Release|Posix.Build.0 = Release|Any CPU
 		{4EB5FDB5-5908-4415-8DFD-E5740A480D92}.Release|Windows.ActiveCfg = Release|Any CPU
 		{4EB5FDB5-5908-4415-8DFD-E5740A480D92}.Release|Windows.Build.0 = Release|Any CPU
+		{56B0D244-4791-40EE-8C01-08C34E3733B7}.Debug|Posix.ActiveCfg = Debug|Any CPU
+		{56B0D244-4791-40EE-8C01-08C34E3733B7}.Debug|Posix.Build.0 = Debug|Any CPU
+		{56B0D244-4791-40EE-8C01-08C34E3733B7}.Debug|Windows.ActiveCfg = Debug|Any CPU
+		{56B0D244-4791-40EE-8C01-08C34E3733B7}.Debug|Windows.Build.0 = Debug|Any CPU
+		{56B0D244-4791-40EE-8C01-08C34E3733B7}.Release|Posix.ActiveCfg = Release|Any CPU
+		{56B0D244-4791-40EE-8C01-08C34E3733B7}.Release|Posix.Build.0 = Release|Any CPU
+		{56B0D244-4791-40EE-8C01-08C34E3733B7}.Release|Windows.ActiveCfg = Release|Any CPU
+		{56B0D244-4791-40EE-8C01-08C34E3733B7}.Release|Windows.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -302,6 +312,7 @@ Global
 		{7DA231E8-A31D-4F53-8760-820861B6CE65} = {F9E67978-5CD6-4A5F-827B-4249711C0B02}
 		{0E2B067C-4A97-430C-8767-D19ACB09A63A} = {F9E67978-5CD6-4A5F-827B-4249711C0B02}
 		{4EB5FDB5-5908-4415-8DFD-E5740A480D92} = {57A04B72-8088-4F75-A582-1158CF8291F7}
+		{56B0D244-4791-40EE-8C01-08C34E3733B7} = {57A04B72-8088-4F75-A582-1158CF8291F7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0D6944ED-0602-492F-9E11-0513294A4DA3}