diff --git a/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListRequestGeneratorFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListRequestGeneratorFixture.cs index 3003ff6ac08..8e6b55fb641 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListRequestGeneratorFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListRequestGeneratorFixture.cs @@ -68,9 +68,9 @@ public void should_use_categories_for_feed() { 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 @@ public void should_not_search_by_imdbid_if_not_supported() _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 @@ public void should_search_by_name_and_year_if_missing_imdbid() 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"); diff --git a/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsRequestGeneratorFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsRequestGeneratorFixture.cs index 1327b675b62..5cf6dbab0b7 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsRequestGeneratorFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsRequestGeneratorFixture.cs @@ -76,9 +76,9 @@ public void should_search_by_imdbid_if_supported() 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 @@ public void should_search_by_tvdbid_season_episode_if_supported() 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 @@ public void should_search_by_tvdbid_daily_episode_if_supported() 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); diff --git a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs index ead7db168c0..626b441f991 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs @@ -51,9 +51,9 @@ public void should_return_subsequent_pages() _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 @@ public void should_not_get_unlimited_pages() { 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 @@ public void should_not_search_by_imdbid_if_not_supported() 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 @@ public void should_search_by_imdbid_if_supported() _capabilities.MovieSearchParams = new List { 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 @@ public void should_search_by_tmdbid_if_supported() _capabilities.MovieSearchParams = new List { 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 @@ public void should_prefer_search_by_tmdbid_if_rid_supported() _capabilities.MovieSearchParams = new List { 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 @@ public void should_use_aggregrated_id_search_if_supported() _capabilities.MovieSearchParams = new List { 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 @@ public void should_not_use_aggregrated_id_search_if_no_ids_supported() _capabilities.MovieSearchParams = new List { 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 @@ public void should_not_use_aggregrated_id_search_if_no_ids_are_known() 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 @@ public void should_fallback_to_q() _capabilities.MovieSearchParams = new List { 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 @@ public void should_pad_seasons_for_tv_search() _capabilities.TvSearchParams = new List { 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"); } diff --git a/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs b/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs index 339abff862c..704321bed47 100644 --- a/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs +++ b/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs @@ -15,12 +15,12 @@ public abstract class SearchCriteriaBase 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}]"; diff --git a/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs index a760bebba46..7ac75ab2297 100644 --- a/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs @@ -138,8 +138,8 @@ private TSpec Get(NewznabRequest query, List indexerIds, bool intera 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; diff --git a/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs b/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs index 8c8c832247b..d0edcec2598 100644 --- a/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs +++ b/src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs @@ -29,7 +29,7 @@ public class IndexerDefinitionUpdateService : IIndexerDefinitionUpdateService, I /* 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 _definitionBlocklist = new () diff --git a/src/NzbDrone.Core/Indexers/Definitions/Anidex.cs b/src/NzbDrone.Core/Indexers/Definitions/Anidex.cs index cb5b934fc0b..775267044c0 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Anidex.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Anidex.cs @@ -100,45 +100,29 @@ public AnidexRequestGenerator(AnidexSettings settings, IndexerCapabilities capab _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable 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 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 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } private IEnumerable GetPagedRequests(string term, int[] categories) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Anidub.cs b/src/NzbDrone.Core/Indexers/Definitions/Anidub.cs index b52d11b3c4c..98952d60055 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Anidub.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Anidub.cs @@ -194,49 +194,29 @@ private IEnumerable GetPagedRequests(string term) yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 GetSearchRequests(BookSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}")); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/AnimeBytes.cs b/src/NzbDrone.Core/Indexers/Definitions/AnimeBytes.cs index 804cfe848a8..6e2282b6ac6 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/AnimeBytes.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/AnimeBytes.cs @@ -107,34 +107,30 @@ public AnimeBytesRequestGenerator() { } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) => GetRequestWithSearchType(searchCriteria, "anime"); - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) => GetRequestWithSearchType(searchCriteria, "music"); - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) => GetRequestWithSearchType(searchCriteria, "anime"); - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) => GetRequestWithSearchType(searchCriteria, "anime"); - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) => GetRequestWithSearchType(searchCriteria, "anime"); - private IndexerPageableRequestChain GetRequestWithSearchType(SearchCriteriaBase searchCriteria, string searchType) + private IEnumerable 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(); } - pageableRequests.Add(GetRequest(searchType, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories)); - - return pageableRequests; + return GetRequest(searchType, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories); } private IEnumerable GetRequest(string searchType, string term, int[] categories) diff --git a/src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs b/src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs index 8c1557c7b53..a5877d0bb0e 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs @@ -164,49 +164,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Animedia.cs b/src/NzbDrone.Core/Indexers/Definitions/Animedia.cs index eabb933e795..f752cda3bd7 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Animedia.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Animedia.cs @@ -99,43 +99,31 @@ private IEnumerable GetPagedRequests(string term) yield return new IndexerRequest(requestUrl, HttpAccept.Html); } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } // Animedia doesn't support books, but this function required by interface - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Anthelion.cs b/src/NzbDrone.Core/Indexers/Definitions/Anthelion.cs index f49041e6bd5..2a18b409fd2 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Anthelion.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Anthelion.cs @@ -146,45 +146,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(MusicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - return pageableRequests; + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(BookSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - return pageableRequests; + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/AudioBookBay.cs b/src/NzbDrone.Core/Indexers/Definitions/AudioBookBay.cs index 2c0b7eba4b4..3cf5ff34131 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/AudioBookBay.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/AudioBookBay.cs @@ -192,37 +192,29 @@ public AudioBookBayRequestGenerator(NoAuthTorrentBaseSettings settings, IndexerC _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}")); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"); } private IEnumerable GetPagedRequests(string term) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazRequestGenerator.cs index dfa9fc1686a..ca9b3a8b7c2 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazRequestGenerator.cs @@ -76,7 +76,7 @@ private IEnumerable GetRequest(List yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { var parameters = GetBasicSearchParameters(searchCriteria.Categories, searchCriteria.Genre); @@ -93,23 +93,19 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC 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 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 GetSearchRequests(TvSearchCriteria searchCriteria) { var parameters = GetBasicSearchParameters(searchCriteria.Categories, searchCriteria.Genre); @@ -128,12 +124,10 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit 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 GetSearchRequests(BookSearchCriteria searchCriteria) { throw new NotImplementedException(); } @@ -141,15 +135,13 @@ public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCr // hook to adjust the search term protected virtual string GetSearchTerm(string term) => term; - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable 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); } } } diff --git a/src/NzbDrone.Core/Indexers/Definitions/BB.cs b/src/NzbDrone.Core/Indexers/Definitions/BB.cs index 49b730e4040..d723b632f20 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/BB.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/BB.cs @@ -177,49 +177,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs b/src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs index 4481c8fe153..574d53a56d2 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs @@ -178,49 +178,29 @@ private IEnumerable GetPagedRequests(string term) yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/BeyondHD.cs b/src/NzbDrone.Core/Indexers/Definitions/BeyondHD.cs index 2f1acc9a376..88e766ae30b 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/BeyondHD.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/BeyondHD.cs @@ -120,49 +120,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return indexerRequest; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/BinSearch.cs b/src/NzbDrone.Core/Indexers/Definitions/BinSearch.cs index 2fe150edc7e..93bdda440c4 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/BinSearch.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/BinSearch.cs @@ -90,7 +90,7 @@ private IEnumerable GetPagedRequests(string term, SearchCriteria { "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 @@ private IEnumerable GetPagedRequests(string term, SearchCriteria yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/BitHDTV.cs b/src/NzbDrone.Core/Indexers/Definitions/BitHDTV.cs index e3a90251d56..1525102d4ea 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/BitHDTV.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/BitHDTV.cs @@ -129,49 +129,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori } } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetRequestGenerator.cs index c36a9071231..73e1154b8e2 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetRequestGenerator.cs @@ -34,31 +34,29 @@ private IEnumerable GetPagedRequests(BroadcastheNetTorrentQuery yield return new IndexerRequest(builder.Build()); } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable 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 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit // 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 GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable 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 @@ public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchC parameters.Search = searchString.Replace(" ", "%"); - var btnOffset = searchCriteria.Offset.GetValueOrDefault(); - - pageableRequests.Add(GetPagedRequests(parameters, btnResults, btnOffset)); + var btnOffset = searchCriteria.Offset; - return pageableRequests; + return GetPagedRequests(parameters, btnResults, btnOffset); } } } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs index 04552917f54..ccdf574115b 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/Cardigann.cs @@ -28,10 +28,6 @@ public class Cardigann : TorrentIndexerBase 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 @@ public override TimeSpan RateLimit } } + 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 @@ protected override IList CleanupReleases(IEnumerable r 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; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannDefinition.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannDefinition.cs index d3f6019dadb..d098581df04 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannDefinition.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannDefinition.cs @@ -142,6 +142,9 @@ public class RatioBlock : SelectorBlock 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 Paths { get; set; } public Dictionary> Headers { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs index 91374487f4e..f0038dca7aa 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs @@ -350,12 +350,6 @@ public IList ParseResponse(IndexerResponse indexerResponse) } } - /* - if (query.Limit > 0) - { - releases = releases.Take(query.Limit).ToList(); - }*/ - releases.ForEach(c => { // generate magnet link from info hash (not allowed for private sites) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs index f0ab21b4785..4812d12a69c 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs @@ -9,6 +9,7 @@ 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 @@ public class CardigannRequestGenerator : CardigannBase, IIndexerRequestGenerator public Func> GetCookies { get; set; } public Action, DateTime?> CookiesUpdater { get; set; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { _logger.Trace("Getting Movie search"); - var pageableRequests = new IndexerPageableRequestChain(); - var variables = GetQueryVariableDefaults(searchCriteria); variables[".Query.Movie"] = null; @@ -59,17 +58,13 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC variables[".Query.TraktID"] = searchCriteria.TraktId?.ToString() ?? null; variables[".Query.DoubanID"] = searchCriteria.DoubanId?.ToString() ?? null; - pageableRequests.Add(GetRequest(variables, searchCriteria)); - - return pageableRequests; + return GetRequest(variables, searchCriteria); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable 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 @@ public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchC variables[".Query.Year"] = searchCriteria.Year?.ToString() ?? null; variables[".Query.Track"] = searchCriteria.Track; - pageableRequests.Add(GetRequest(variables, searchCriteria)); - - return pageableRequests; + return GetRequest(variables, searchCriteria); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { _logger.Trace("Getting TV search"); - var pageableRequests = new IndexerPageableRequestChain(); - var variables = GetQueryVariableDefaults(searchCriteria); variables[".Query.Series"] = null; @@ -107,17 +98,13 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit variables[".Query.DoubanID"] = searchCriteria.DoubanId?.ToString() ?? null; variables[".Query.Episode"] = searchCriteria.EpisodeSearchString; - pageableRequests.Add(GetRequest(variables, searchCriteria)); - - return pageableRequests; + return GetRequest(variables, searchCriteria); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable 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 @@ public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCr variables[".Query.Publisher"] = searchCriteria.Publisher; variables[".Query.Year"] = searchCriteria.Year?.ToString() ?? null; - pageableRequests.Add(GetRequest(variables, searchCriteria)); - - return pageableRequests; + return GetRequest(variables, searchCriteria); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { _logger.Trace("Getting Basic search"); - var pageableRequests = new IndexerPageableRequestChain(); - var variables = GetQueryVariableDefaults(searchCriteria); - pageableRequests.Add(GetRequest(variables, searchCriteria)); - - return pageableRequests; + return GetRequest(variables, searchCriteria); } private Dictionary GetQueryVariableDefaults(SearchCriteriaBase searchCriteria) @@ -151,8 +132,8 @@ public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchC 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; @@ -1017,15 +998,6 @@ public bool CheckIfLoginIsNeeded(HttpResponse response) private IEnumerable GetRequest(Dictionary variables, SearchCriteriaBase searchCriteria) { - var limit = searchCriteria.Limit ?? 100; - var offset = searchCriteria.Offset ?? 0; - - if (offset > 0 && limit > 0 && offset / limit > 0) - { - // Pagination doesn't work yet, this is to prevent fetching the first page multiple times. - yield break; - } - var search = _definition.Search; var mappedCategories = _categories.MapTorznabCapsToTrackers((int[])variables[".Query.Categories"]); @@ -1055,117 +1027,145 @@ private IEnumerable GetRequest(Dictionary variab 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; - } + var invertMatch = searchPath.Categories[0] == "!"; + var hasIntersect = mappedCategories.Intersect(searchPath.Categories).Any(); + if (invertMatch) + { + hasIntersect = !hasIntersect; + } - if (!hasIntersect) - { - continue; + 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>(); - var method = HttpMethod.Get; + // 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>(); + var method = HttpMethod.Get; - if (string.Equals(searchPath.Method, "post", StringComparison.OrdinalIgnoreCase)) - { - method = HttpMethod.Post; - } + if (string.Equals(searchPath.Method, "post", StringComparison.OrdinalIgnoreCase)) + { + method = HttpMethod.Post; + } - var inputsList = new List>(); - if (searchPath.Inheritinputs) - { - inputsList.Add(search.Inputs); - } + var inputsList = new List>(); + if (searchPath.Inheritinputs) + { + inputsList.Add(search.Inputs); + } - inputsList.Add(searchPath.Inputs); + inputsList.Add(searchPath.Inputs); - foreach (var inputs in inputsList) - { - if (inputs != null) + foreach (var inputs in inputsList) { - foreach (var input in inputs) + if (inputs != null) { - if (input.Key == "$raw") + 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]; + } + + queryCollection.Add(key, value); } + } + else + { + var inputValue = ApplyGoTemplateText(input.Value, variables); - var value = ""; - if (parts.Length == 2) + if (inputValue.IsNotNullOrWhiteSpace() || search.AllowEmptyInputs) { - value = parts[1]; + queryCollection.Add(input.Key, inputValue); } - - queryCollection.Add(key, value); } } - 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 - }; + var requestBuilder = new HttpRequestBuilder(searchUrl) + { + Method = method, + Encoding = _encoding + }; - // Add FormData for searchs that POST - if (method == HttpMethod.Post) - { - foreach (var param in queryCollection) + // Add FormData for searchs that POST + if (method == HttpMethod.Post) { - requestBuilder.AddFormParameter(param.Key, param.Value); + 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()); - } + // send HTTP request + if (search.Headers != null) + { + var headers = ParseCustomHeaders(search.Headers, variables); + requestBuilder.SetHeaders(headers ?? new Dictionary()); + } - 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 = { @@ -1173,7 +1173,8 @@ private IEnumerable GetRequest(Dictionary variab } }; - yield return cardigannRequest; + yield return cardigannRequest; + } } } } diff --git a/src/NzbDrone.Core/Indexers/Definitions/FileList/FileListRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/FileList/FileListRequestGenerator.cs index f422fbf160d..e0a67978e5a 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/FileList/FileListRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/FileList/FileListRequestGenerator.cs @@ -16,9 +16,8 @@ public class FileListRequestGenerator : IIndexerRequestGenerator public Func> GetCookies { get; set; } public Action, DateTime?> CookiesUpdater { get; set; } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace() || searchCriteria.SearchTerm.IsNotNullOrWhiteSpace()) @@ -47,14 +46,11 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit } } - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace()) @@ -70,14 +66,11 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC parameters.Set("query", searchCriteria.SanitizedSearchTerm.Trim()); } - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace()) @@ -87,14 +80,11 @@ public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchC parameters.Set("query", searchCriteria.SanitizedSearchTerm.Trim()); } - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace()) @@ -104,14 +94,11 @@ public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCr parameters.Set("query", searchCriteria.SanitizedSearchTerm.Trim()); } - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); if (searchCriteria.SearchTerm.IsNotNullOrWhiteSpace()) @@ -121,9 +108,7 @@ public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchC parameters.Set("query", searchCriteria.SanitizedSearchTerm.Trim()); } - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } private IEnumerable GetPagedRequests(SearchCriteriaBase searchCriteria, NameValueCollection parameters) diff --git a/src/NzbDrone.Core/Indexers/Definitions/FunFile.cs b/src/NzbDrone.Core/Indexers/Definitions/FunFile.cs index 4d7a8bdc711..9bd9e2ed835 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/FunFile.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/FunFile.cs @@ -137,49 +137,29 @@ public FunFileRequestGenerator(UserPassTorrentBaseSettings settings, IndexerCapa _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } private IEnumerable GetPagedRequests(string term, int[] categories, string imdbId = null) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleRequestGenerator.cs index b21ae489ee6..a6b9ef4ec63 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleRequestGenerator.cs @@ -42,10 +42,8 @@ protected IEnumerable GetRequest(NameValueCollection parameters) yield return request; } - public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public virtual IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories); if (searchCriteria.ImdbId != null) @@ -53,15 +51,11 @@ public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria parameters.Set(ImdbInTags ? "taglist" : "cataloguenumber", searchCriteria.FullImdbId); } - pageableRequests.Add(GetRequest(parameters)); - - return pageableRequests; + return GetRequest(parameters); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable 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 IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchC parameters.Set("recordlabel", searchCriteria.Label); } - pageableRequests.Add(GetRequest(parameters)); - - return pageableRequests; + return GetRequest(parameters); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - var parameters = GetBasicSearchParameters(searchCriteria.SanitizedTvSearchString, searchCriteria.Categories); if (searchCriteria.ImdbId != null) @@ -95,29 +85,21 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit parameters.Set(ImdbInTags ? "taglist" : "cataloguenumber", searchCriteria.FullImdbId); } - pageableRequests.Add(GetRequest(parameters)); - - return pageableRequests; + return GetRequest(parameters); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable 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 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 diff --git a/src/NzbDrone.Core/Indexers/Definitions/GazelleGames.cs b/src/NzbDrone.Core/Indexers/Definitions/GazelleGames.cs index 4d3224a1a65..2090fe6fe06 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/GazelleGames.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/GazelleGames.cs @@ -203,49 +203,29 @@ public GazelleGamesRequestGenerator() { } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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() diff --git a/src/NzbDrone.Core/Indexers/Definitions/GreatPosterWall.cs b/src/NzbDrone.Core/Indexers/Definitions/GreatPosterWall.cs index 5112ee634b1..a220e1bc5bf 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/GreatPosterWall.cs +++ b/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; @@ -75,7 +75,7 @@ public class GreatPosterWallRequestGenerator : GazelleRequestGenerator _settings = settings; } - public override IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public override IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { var parameters = GetBasicSearchParameters(searchCriteria.SearchTerm, searchCriteria.Categories); @@ -84,9 +84,7 @@ public override IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteri 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) diff --git a/src/NzbDrone.Core/Indexers/Definitions/HDBits/HDBitsRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/HDBits/HDBitsRequestGenerator.cs index b3186138114..8072f150b2d 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/HDBits/HDBitsRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/HDBits/HDBitsRequestGenerator.cs @@ -16,9 +16,8 @@ public class HDBitsRequestGenerator : IIndexerRequestGenerator public IndexerCapabilities Capabilities { get; set; } public HDBitsSettings Settings { get; set; } - public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public virtual IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var query = new TorrentQuery(); var imdbId = ParseUtil.GetImdbID(searchCriteria.ImdbId).GetValueOrDefault(0); @@ -38,9 +37,7 @@ public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria query.ImdbInfo.Id = imdbId; } - pageableRequests.Add(GetRequest(query)); - - return pageableRequests; + return GetRequest(query); } public Func> GetCookies { get; set; } @@ -68,14 +65,13 @@ private IEnumerable GetRequest(TorrentQuery query) yield return new IndexerRequest(request); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable 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 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit query.ImdbInfo.Id = imdbId; } - pageableRequests.Add(GetRequest(query)); - - return pageableRequests; + return GetRequest(query); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var query = new TorrentQuery(); if (searchCriteria.Categories?.Length > 0) @@ -137,9 +130,7 @@ public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchC query.Search = searchCriteria.SanitizedSearchTerm; } - pageableRequests.Add(GetRequest(query)); - - return pageableRequests; + return GetRequest(query); } } } diff --git a/src/NzbDrone.Core/Indexers/Definitions/HDSpace.cs b/src/NzbDrone.Core/Indexers/Definitions/HDSpace.cs index 276ccf03351..6e58d01833b 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/HDSpace.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/HDSpace.cs @@ -178,45 +178,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/HDTorrents.cs b/src/NzbDrone.Core/Indexers/Definitions/HDTorrents.cs index dfb0b71aeed..b6347809f2a 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/HDTorrents.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/HDTorrents.cs @@ -166,49 +166,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Headphones/HeadphonesRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Headphones/HeadphonesRequestGenerator.cs index c2169d9cbb7..f82ac099d00 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Headphones/HeadphonesRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Headphones/HeadphonesRequestGenerator.cs @@ -25,18 +25,15 @@ public HeadphonesRequestGenerator() PageSize = 100; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - return pageableRequests; + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { var capabilities = Capabilities; - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && capabilities.MusicSearchArtistAvailable) @@ -67,30 +64,22 @@ public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchC } } - pageableRequests.Add(GetPagedRequests(searchCriteria, - parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - return pageableRequests; + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - return pageableRequests; + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { var capabilities = Capabilities; - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); @@ -99,9 +88,7 @@ public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchC parameters.Add("q", NewsnabifyTitle(searchCriteria.SearchTerm)); } - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } private IEnumerable GetPagedRequests(SearchCriteriaBase searchCriteria, NameValueCollection parameters) @@ -120,15 +107,9 @@ private IEnumerable GetPagedRequests(SearchCriteriaBase searchCr 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); diff --git a/src/NzbDrone.Core/Indexers/Definitions/IPTorrents.cs b/src/NzbDrone.Core/Indexers/Definitions/IPTorrents.cs index 6ab434c9c86..cfadb5c8bc3 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/IPTorrents.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/IPTorrents.cs @@ -212,49 +212,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/ImmortalSeed.cs b/src/NzbDrone.Core/Indexers/Definitions/ImmortalSeed.cs index b4ceb0137c6..ff5d65dd247 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/ImmortalSeed.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/ImmortalSeed.cs @@ -166,49 +166,29 @@ public ImmortalSeedRequestGenerator(UserPassTorrentBaseSettings settings, Indexe _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } private IEnumerable GetPagedRequests(string term, int[] categories) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Libble.cs b/src/NzbDrone.Core/Indexers/Definitions/Libble.cs index e6a80678050..b3ac585365c 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Libble.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Libble.cs @@ -123,9 +123,8 @@ public LibbleRequestGenerator(LibbleSettings settings, IndexerCapabilities capab _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && searchCriteria.Artist != "VA") @@ -157,34 +156,29 @@ public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchC parameters.Set("tags_type", "0"); } - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(MovieSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } private IEnumerable GetPagedRequests(SearchCriteriaBase searchCriteria, NameValueCollection parameters) @@ -206,7 +200,7 @@ private IEnumerable GetPagedRequests(SearchCriteriaBase searchCr 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()); diff --git a/src/NzbDrone.Core/Indexers/Definitions/MoreThanTV.cs b/src/NzbDrone.Core/Indexers/Definitions/MoreThanTV.cs index 29f434c3c05..2c7cf39de04 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/MoreThanTV.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/MoreThanTV.cs @@ -90,28 +90,26 @@ public MoreThanTVRequestGenerator(CookieTorrentBaseSettings settings, IndexerCap }; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) => PerformRequest(searchCriteria); - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) => PerformRequest(searchCriteria); - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) => PerformRequest(searchCriteria); - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) => PerformRequest(searchCriteria); - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) => PerformRequest(searchCriteria); public Func> GetCookies { get; set; } public Action, DateTime?> CookiesUpdater { get; set; } - private IndexerPageableRequestChain PerformRequest(SearchCriteriaBase query) + private IEnumerable PerformRequest(SearchCriteriaBase query) { - var chain = new IndexerPageableRequestChain(); - var requests = new List { new (new HttpRequest(GetTorrentSearchUrl(query)) { Headers = new HttpHeader(BrowserHeaders), AllowAutoRedirect = true }) }; if (query is TvSearchCriteria tvSearchCriteria) @@ -127,9 +125,7 @@ private IndexerPageableRequestChain PerformRequest(SearchCriteriaBase query) } } - chain.Add(requests); - - return chain; + return requests; } private string GetTorrentSearchUrl(SearchCriteriaBase query, string overrideSearchTerm = null) diff --git a/src/NzbDrone.Core/Indexers/Definitions/MyAnonamouse.cs b/src/NzbDrone.Core/Indexers/Definitions/MyAnonamouse.cs index abb3948c64c..48c59770b4e 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/MyAnonamouse.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/MyAnonamouse.cs @@ -236,8 +236,8 @@ private IEnumerable GetPagedRequests(SearchCriteriaBase searchCr { "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 @@ private IEnumerable GetPagedRequests(SearchCriteriaBase searchCr yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests(searchCriteria)); - - return pageableRequests; + return GetPagedRequests(searchCriteria); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests(searchCriteria)); - - return pageableRequests; + return GetPagedRequests(searchCriteria); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Nebulance.cs b/src/NzbDrone.Core/Indexers/Definitions/Nebulance.cs index 2750211b50e..850ebdf2af3 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Nebulance.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Nebulance.cs @@ -98,20 +98,18 @@ private IEnumerable GetPagedRequests(NebulanceQuery parameters, yield return new IndexerRequest(builder.Build()); } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - var queryParams = new NebulanceQuery { Age = ">0" @@ -141,20 +139,16 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit } } - pageableRequests.Add(GetPagedRequests(queryParams, searchCriteria.Limit, searchCriteria.Offset)); - - return pageableRequests; + return GetPagedRequests(queryParams, searchCriteria.Limit, searchCriteria.Offset); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - var queryParams = new NebulanceQuery { Age = ">0" @@ -165,9 +159,7 @@ public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchC 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs index 2974887211e..58dc3cfa526 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs @@ -26,11 +26,10 @@ public NewznabRequestGenerator(INewznabCapabilitiesProvider capabilitiesProvider PageSize = 100; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC } } - pageableRequests.Add(GetPagedRequests(searchCriteria, - capabilities, - parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, capabilities, parameters); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable 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 @@ public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchC } } - pageableRequests.Add(GetPagedRequests(searchCriteria, - capabilities, - parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, capabilities, parameters); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable 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 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit } } - pageableRequests.Add(GetPagedRequests(searchCriteria, - capabilities, - parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, capabilities, parameters); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable 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 @@ public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCr } } - pageableRequests.Add(GetPagedRequests(searchCriteria, - capabilities, - parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, capabilities, parameters); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { var capabilities = _capabilitiesProvider.GetCapabilities(Settings, Definition); - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); @@ -236,9 +215,7 @@ public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchC parameters.Set("q", NewsnabifyTitle(searchCriteria.SearchTerm)); } - pageableRequests.Add(GetPagedRequests(searchCriteria, capabilities, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, capabilities, parameters); } private IEnumerable GetPagedRequests(SearchCriteriaBase searchCriteria, IndexerCapabilities capabilities, NameValueCollection parameters) @@ -262,15 +239,9 @@ private IEnumerable GetPagedRequests(SearchCriteriaBase searchCr 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) { diff --git a/src/NzbDrone.Core/Indexers/Definitions/NorBits.cs b/src/NzbDrone.Core/Indexers/Definitions/NorBits.cs index 877f0459c7b..a438c634599 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/NorBits.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/NorBits.cs @@ -199,49 +199,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/NzbIndex.cs b/src/NzbDrone.Core/Indexers/Definitions/NzbIndex.cs index a9594650e5a..949e3320b78 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/NzbIndex.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/NzbIndex.cs @@ -1054,49 +1054,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Orpheus.cs b/src/NzbDrone.Core/Indexers/Definitions/Orpheus.cs index ecb9108f16a..08ba51f2da5 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Orpheus.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Orpheus.cs @@ -132,9 +132,8 @@ public OrpheusRequestGenerator(OrpheusSettings settings, IndexerCapabilities cap _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && searchCriteria.Artist != "VA") @@ -152,39 +151,31 @@ public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchC parameters.Set("year", searchCriteria.Year.ToString()); } - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(MovieSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } private IEnumerable GetPagedRequests(SearchCriteriaBase searchCriteria, NameValueCollection parameters) diff --git a/src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornRequestGenerator.cs index 348d69a0136..96df03fc845 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornRequestGenerator.cs @@ -18,20 +18,14 @@ public class PassThePopcornRequestGenerator : IIndexerRequestGenerator public IIndexerHttpClient HttpClient { get; set; } public Logger Logger { get; set; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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> GetCookies { get; set; } @@ -72,28 +66,24 @@ private IEnumerable GetRequest(string searchParameters) yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetRequest(string.Format("{0}", searchCriteria.SearchTerm))); - - return pageableRequests; + return GetRequest(string.Format("{0}", searchCriteria.SearchTerm)); } } } diff --git a/src/NzbDrone.Core/Indexers/Definitions/PirateTheNet.cs b/src/NzbDrone.Core/Indexers/Definitions/PirateTheNet.cs index a74823d5d5f..fd3c679ce9a 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/PirateTheNet.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/PirateTheNet.cs @@ -135,37 +135,29 @@ public PirateTheNetRequestGenerator(UserPassTorrentBaseSettings settings, Indexe _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } private IEnumerable GetPagedRequests(string term, int[] categories, string imdbId = null) diff --git a/src/NzbDrone.Core/Indexers/Definitions/PornoLab.cs b/src/NzbDrone.Core/Indexers/Definitions/PornoLab.cs index cc55ed88d98..e07823a6108 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/PornoLab.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/PornoLab.cs @@ -269,49 +269,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/PreToMe.cs b/src/NzbDrone.Core/Indexers/Definitions/PreToMe.cs index 7b0f767f076..3670490462c 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/PreToMe.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/PreToMe.cs @@ -276,49 +276,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs index 31eddb7a993..4557673b946 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs @@ -78,40 +78,29 @@ private IEnumerable GetRequest(bool isRssSearch, string term, in yield return new IndexerRequest(requestBuilder.Build()); } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetRequest(searchCriteria.IsRssSearch, 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 GetSearchRequests(MusicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories)); - return pageableRequests; + return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetRequest(searchCriteria.IsRssSearch, 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 GetSearchRequests(BookSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories)); - return pageableRequests; + return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories)); - - return pageableRequests; + return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Redacted.cs b/src/NzbDrone.Core/Indexers/Definitions/Redacted.cs index e8fba9c9629..f1e66ebd32f 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Redacted.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Redacted.cs @@ -104,9 +104,8 @@ public RedactedRequestGenerator(RedactedSettings settings, IndexerCapabilities c _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); if (searchCriteria.Artist.IsNotNullOrWhiteSpace() && searchCriteria.Artist != "VA") @@ -124,39 +123,31 @@ public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchC parameters.Set("year", searchCriteria.Year.ToString()); } - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(MovieSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); var parameters = new NameValueCollection(); - pageableRequests.Add(GetPagedRequests(searchCriteria, parameters)); - - return pageableRequests; + return GetPagedRequests(searchCriteria, parameters); } private IEnumerable GetPagedRequests(SearchCriteriaBase searchCriteria, NameValueCollection parameters) diff --git a/src/NzbDrone.Core/Indexers/Definitions/RevolutionTT.cs b/src/NzbDrone.Core/Indexers/Definitions/RevolutionTT.cs index 08b0ba57280..fa981266d4c 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/RevolutionTT.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/RevolutionTT.cs @@ -185,49 +185,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/RuTracker.cs b/src/NzbDrone.Core/Indexers/Definitions/RuTracker.cs index 779e8fec047..7aa8be98b82 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/RuTracker.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/RuTracker.cs @@ -1506,54 +1506,34 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/SceneHD.cs b/src/NzbDrone.Core/Indexers/Definitions/SceneHD.cs index 4a67b60ad0d..f747dc7610d 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/SceneHD.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/SceneHD.cs @@ -120,49 +120,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs b/src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs index b4eadc87791..dfbc978d77a 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs @@ -141,49 +141,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/Shazbat.cs b/src/NzbDrone.Core/Indexers/Definitions/Shazbat.cs index 2748810f75a..679deb78e77 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Shazbat.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Shazbat.cs @@ -124,37 +124,29 @@ public ShazbatRequestGenerator(ShazbatSettings settings) _settings = settings; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}")); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}"); } private IEnumerable GetPagedRequests(string term) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Shizaproject.cs b/src/NzbDrone.Core/Indexers/Definitions/Shizaproject.cs index 851c960f5e0..05f54e480bd 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Shizaproject.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Shizaproject.cs @@ -129,43 +129,31 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } // Shizaproject doesn't support books, but this function required by interface - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/SpeedApp/SpeedAppBase.cs b/src/NzbDrone.Core/Indexers/Definitions/SpeedApp/SpeedAppBase.cs index 91f4aa0c565..30f56e70515 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/SpeedApp/SpeedAppBase.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/SpeedApp/SpeedAppBase.cs @@ -140,38 +140,34 @@ public SpeedAppRequestGenerator(IndexerCapabilities capabilities, SpeedAppSettin _pageSize = pageSize; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { return GetSearch(searchCriteria, searchCriteria.FullImdbId); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { return GetSearch(searchCriteria); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { return GetSearch(searchCriteria, searchCriteria.FullImdbId, searchCriteria.Season, searchCriteria.Episode); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { return GetSearch(searchCriteria); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { return GetSearch(searchCriteria); } - private IndexerPageableRequestChain GetSearch(SearchCriteriaBase searchCriteria, string imdbId = null, int? season = null, string episode = null) + private IEnumerable 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 GetPagedRequests(string term, int[] categories, int limit, int offset, string imdbId = null, int? season = null, string episode = null) diff --git a/src/NzbDrone.Core/Indexers/Definitions/SpeedCD.cs b/src/NzbDrone.Core/Indexers/Definitions/SpeedCD.cs index 6498af359e7..bd7b92bb65c 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/SpeedCD.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/SpeedCD.cs @@ -225,10 +225,8 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - var term = $"{searchCriteria.SanitizedSearchTerm}"; if (searchCriteria.FullImdbId.IsNotNullOrWhiteSpace()) @@ -236,24 +234,16 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC 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 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 GetSearchRequests(TvSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - var term = $"{searchCriteria.SanitizedTvSearchString}"; if (searchCriteria.FullImdbId.IsNotNullOrWhiteSpace()) @@ -271,27 +261,17 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit } } - 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 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/SubsPlease.cs b/src/NzbDrone.Core/Indexers/Definitions/SubsPlease.cs index 4b995c7174a..03e51310c6d 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/SubsPlease.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/SubsPlease.cs @@ -111,47 +111,33 @@ private IEnumerable GetRssRequest() yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - return pageableRequests; + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - return pageableRequests; + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(BookSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - return pageableRequests; + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/TVVault.cs b/src/NzbDrone.Core/Indexers/Definitions/TVVault.cs index c9711c59ed2..740b109071c 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/TVVault.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/TVVault.cs @@ -160,41 +160,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable 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) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Toloka.cs b/src/NzbDrone.Core/Indexers/Definitions/Toloka.cs index 4aef0d74481..caae946f127 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Toloka.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Toloka.cs @@ -262,28 +262,18 @@ public TolokaRequestGenerator(TolokaSettings settings, IndexerCapabilities capab _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 GetSearchRequests(TvSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - var term = $"{searchCriteria.SanitizedSearchTerm}"; if (searchCriteria.Season is > 0) @@ -291,27 +281,17 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit term += $" Сезон {searchCriteria.Season}"; } - pageableRequests.Add(GetPagedRequests(term, searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests(term, searchCriteria.Categories); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } private IEnumerable GetPagedRequests(string term, int[] categories) diff --git a/src/NzbDrone.Core/Indexers/Definitions/TorrentBytes.cs b/src/NzbDrone.Core/Indexers/Definitions/TorrentBytes.cs index 0bdd6265f68..b198fb9981e 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/TorrentBytes.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/TorrentBytes.cs @@ -183,47 +183,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 GetSearchRequests(BookSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - return pageableRequests; + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/TorrentDay.cs b/src/NzbDrone.Core/Indexers/Definitions/TorrentDay.cs index 0d48be5fa80..bd2ffec36e8 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/TorrentDay.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/TorrentDay.cs @@ -167,49 +167,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoRequestGenerator.cs index f77e97a6d17..b3c5505f56c 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoRequestGenerator.cs @@ -14,13 +14,9 @@ public TorrentPotatoRequestGenerator() { } - public virtual IndexerPageableRequestChain GetRecentRequests() + public virtual IEnumerable GetRecentRequests() { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests("list", null, null)); - - return pageableRequests; + return GetPagedRequests("list", null, null); } private IEnumerable GetPagedRequests(string mode, int? tvdbId, string query, params object[] args) @@ -72,31 +68,29 @@ private IEnumerable GetMovieRequest(MovieSearchCriteria searchCr yield return new IndexerRequest(requestBuilder.Build()); } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetMovieRequest(searchCriteria)); - return pageableRequests; + return GetMovieRequest(searchCriteria); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } public Func> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/TorrentSyndikat.cs b/src/NzbDrone.Core/Indexers/Definitions/TorrentSyndikat.cs index e2b899f3442..bca024cb34d 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/TorrentSyndikat.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/TorrentSyndikat.cs @@ -162,49 +162,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/TorrentsCSV.cs b/src/NzbDrone.Core/Indexers/Definitions/TorrentsCSV.cs index 9daddda0ce1..dbb1304aa5b 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/TorrentsCSV.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/TorrentsCSV.cs @@ -95,41 +95,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable 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 GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/Definitions/UNIT3D/Unit3dRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/UNIT3D/Unit3dRequestGenerator.cs index 5957534f2ae..5055c36859d 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/UNIT3D/Unit3dRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/UNIT3D/Unit3dRequestGenerator.cs @@ -22,7 +22,7 @@ public class Unit3dRequestGenerator : IIndexerRequestGenerator public Func> GetCookies { get; set; } public Action, DateTime?> CookiesUpdater { get; set; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { var parameters = GetBasicSearchParameters(searchCriteria.SanitizedSearchTerm, searchCriteria.Categories); @@ -38,21 +38,17 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC 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 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 GetSearchRequests(TvSearchCriteria searchCriteria) { var parameters = GetBasicSearchParameters(searchCriteria.SanitizedTvSearchString, searchCriteria.Categories); @@ -68,27 +64,21 @@ public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCrit 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 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 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 GetRequest(List> searchParameters) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Uniotaku.cs b/src/NzbDrone.Core/Indexers/Definitions/Uniotaku.cs index d2ee6c4051c..17f5122b539 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Uniotaku.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/Uniotaku.cs @@ -154,49 +154,29 @@ public UniotakuRequestGenerator(UniotakuSettings settings, IndexerCapabilities c _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } private IEnumerable GetPagedRequests(string term, int[] categories) diff --git a/src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs b/src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs index b3e09090f03..8831190390c 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs @@ -173,49 +173,29 @@ public XSpeedsRequestGenerator(UserPassTorrentBaseSettings settings, IndexerCapa _capabilities = capabilities; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 GetSearchRequests(BasicSearchCriteria searchCriteria) { - var pageableRequests = new IndexerPageableRequestChain(); - - pageableRequests.Add(GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories)); - - return pageableRequests; + return GetPagedRequests($"{searchCriteria.SanitizedSearchTerm}", searchCriteria.Categories); } private IEnumerable GetPagedRequests(string term, int[] categories) diff --git a/src/NzbDrone.Core/Indexers/Definitions/Xthor/XthorRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Xthor/XthorRequestGenerator.cs index ea991d83ddb..c07fc28889f 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/Xthor/XthorRequestGenerator.cs +++ b/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 @@ public XthorRequestGenerator() yield return request; } - public IndexerPageableRequestChain GetSearchRequestsCommon(SearchCriteriaBase searchCriteria, - string searchTerm, - string tmdbid = null) + public IEnumerable GetSearchRequestsCommon(SearchCriteriaBase searchCriteria, string searchTerm, string tmdbid = null) { - var pageableRequests = new IndexerPageableRequestChain(); var actualPage = 0; + var requests = new List(); + 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 @@ public XthorRequestGenerator() ++actualPage; } - return pageableRequests; + return requests; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MovieSearchCriteria searchCriteria) { return GetSearchRequestsCommon(searchCriteria, string.Format("{0}", searchCriteria.SanitizedSearchTerm), searchCriteria.TmdbId.ToString()); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { return GetSearchRequestsCommon(searchCriteria, string.Format("{0}", searchCriteria.SanitizedSearchTerm)); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { return GetSearchRequestsCommon(searchCriteria, string.Format("{0}", searchCriteria.SanitizedTvSearchString)); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { return GetSearchRequestsCommon(searchCriteria, string.Format("{0}", searchCriteria.SanitizedSearchTerm)); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { return GetSearchRequestsCommon(searchCriteria, string.Format("{0}", searchCriteria.SanitizedSearchTerm)); } diff --git a/src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs b/src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs index 4e810411636..d076632a2be 100644 --- a/src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs +++ b/src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs @@ -251,49 +251,29 @@ private IEnumerable GetPagedRequests(string term, int[] categori yield return request; } - public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) + public IEnumerable 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 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 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 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 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> GetCookies { get; set; } diff --git a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs index 29f819c99c4..6d952cd2226 100644 --- a/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs +++ b/src/NzbDrone.Core/Indexers/HttpIndexerBase.cs @@ -233,7 +233,7 @@ protected void UpdateCookies(IDictionary cookies, DateTime? expi _indexerStatusService.UpdateCookies(Definition.Id, cookies, expiration); } - protected virtual async Task FetchReleases(Func pageableRequestChainSelector, SearchCriteriaBase searchCriteria, bool isRecent = false) + protected virtual async Task FetchReleases(Func> pageableRequestChainSelector, SearchCriteriaBase searchCriteria, bool isRecent = false) { var releases = new List(); var result = new IndexerPageableQueryResult(); @@ -250,41 +250,19 @@ protected virtual async Task FetchReleases(Func(); + 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 @@ public override IndexerCapabilities GetCapabilities() return Capabilities ?? ((IndexerDefinition)Definition).Capabilities; } - protected virtual bool IsFullPage(IList page, int pageSize) - { - return pageSize != 0 && page.Count >= pageSize; - } - protected virtual async Task FetchPage(IndexerRequest request, IParseIndexerResponse parser) { var response = await FetchIndexerResponse(request); @@ -549,7 +522,7 @@ protected virtual async Task TestConnection() testCriteria.SearchTerm = "test"; } - var firstRequest = generator.GetSearchRequests(testCriteria).GetAllTiers().FirstOrDefault()?.FirstOrDefault(); + var firstRequest = generator.GetSearchRequests(testCriteria).FirstOrDefault(); if (firstRequest == null) { diff --git a/src/NzbDrone.Core/Indexers/IIndexerRequestGenerator.cs b/src/NzbDrone.Core/Indexers/IIndexerRequestGenerator.cs index 450412aafbc..5a7f348a81e 100644 --- a/src/NzbDrone.Core/Indexers/IIndexerRequestGenerator.cs +++ b/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 GetSearchRequests(MovieSearchCriteria searchCriteria); + IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria); + IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria); + IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria); + IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria); Func> GetCookies { get; set; } Action, DateTime?> CookiesUpdater { get; set; } } diff --git a/src/NzbDrone.Core/Indexers/IndexerPageableRequest.cs b/src/NzbDrone.Core/Indexers/IndexerPageableRequest.cs deleted file mode 100644 index dff34143e4b..00000000000 --- a/src/NzbDrone.Core/Indexers/IndexerPageableRequest.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Collections; -using System.Collections.Generic; - -namespace NzbDrone.Core.Indexers -{ - public class IndexerPageableRequest : IEnumerable - { - private readonly IEnumerable _enumerable; - - public IndexerPageableRequest(IEnumerable enumerable) - { - _enumerable = enumerable; - } - - public IEnumerator GetEnumerator() - { - return _enumerable.GetEnumerator(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return _enumerable.GetEnumerator(); - } - } -} diff --git a/src/NzbDrone.Core/Indexers/IndexerPageableRequestChain.cs b/src/NzbDrone.Core/Indexers/IndexerPageableRequestChain.cs deleted file mode 100644 index 1671ff1c101..00000000000 --- a/src/NzbDrone.Core/Indexers/IndexerPageableRequestChain.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.Collections.Generic; -using System.Linq; - -namespace NzbDrone.Core.Indexers -{ - public class IndexerPageableRequestChain - { - private List> _chains; - - public IndexerPageableRequestChain() - { - _chains = new List>(); - _chains.Add(new List()); - } - - public int Tiers => _chains.Count; - - public IEnumerable GetAllTiers() - { - return _chains.SelectMany(v => v); - } - - public IEnumerable GetTier(int index) - { - return _chains[index]; - } - - public void Add(IEnumerable request) - { - if (request == null) - { - return; - } - - _chains.Last().Add(new IndexerPageableRequest(request)); - } - - public void AddTier(IEnumerable request) - { - AddTier(); - Add(request); - } - - public void AddTier() - { - if (_chains.Last().Count == 0) - { - return; - } - - _chains.Add(new List()); - } - } -} diff --git a/src/NzbDrone.Core/Indexers/RssIndexerRequestGenerator.cs b/src/NzbDrone.Core/Indexers/RssIndexerRequestGenerator.cs index eead099444f..0a25e5b444f 100644 --- a/src/NzbDrone.Core/Indexers/RssIndexerRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/RssIndexerRequestGenerator.cs @@ -14,38 +14,34 @@ public RssIndexerRequestGenerator(string baseUrl) _baseUrl = baseUrl; } - public virtual IndexerPageableRequestChain GetRecentRequests() + public virtual IEnumerable 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 GetSearchRequests(MovieSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(MusicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(TvSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BookSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } - public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) + public IEnumerable GetSearchRequests(BasicSearchCriteria searchCriteria) { - return new IndexerPageableRequestChain(); + return new List(); } public Func> GetCookies { get; set; }