open-source-mirrors
/
Prowlarr
mirror of https://github.com/Prowlarr/Prowlarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup request paging code

Browse Source
pull/1479/head
Qstick 2 years ago
parent 24f6c937da
commit 712d95e6ce
71 changed files with 681 additions and 1703 deletions
Show Stats Download Patch File Download Diff File

12
src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListRequestGeneratorFixture.cs
Unescape View File

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

12
src/NzbDrone.Core.Test/IndexerTests/HDBitsTests/HDBitsRequestGeneratorFixture.cs
Unescape View File

@ -76,9 +76,9 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
var results = Subject.GetSearchRequests(_movieSearchCriteria); var results = Subject.GetSearchRequests(_movieSearchCriteria);
var imdbQuery = int.Parse(_movieSearchCriteria.ImdbId); 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); var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);
@ -95,9 +95,9 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
var results = Subject.GetSearchRequests(_tvSearchSeasonEpisodeCriteria); var results = Subject.GetSearchRequests(_tvSearchSeasonEpisodeCriteria);
var tvdbQuery = _tvSearchSeasonEpisodeCriteria.TvdbId; 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); var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);
@ -117,9 +117,9 @@ namespace NzbDrone.Core.Test.IndexerTests.HDBitsTests
var results = Subject.GetSearchRequests(_tvSearchDailyEpisodeCriteria); var results = Subject.GetSearchRequests(_tvSearchDailyEpisodeCriteria);
var tvdbQuery = _tvSearchDailyEpisodeCriteria.TvdbId; 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); var encoding = HttpHeader.GetEncodingFromContentType(page.HttpRequest.Headers.ContentType);

43
src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs
Unescape View File

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

6
src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs
Unescape View File

@ -15,12 +15,12 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
public string SearchTerm { get; set; } public string SearchTerm { get; set; }
public int[] Categories { get; set; } public int[] Categories { get; set; }
public string SearchType { get; set; } public string SearchType { get; set; }
public int? Limit { get; set; } public int Limit { get; set; }
public int? Offset { get; set; } public int Offset { get; set; }
public string Source { get; set; } public string Source { get; set; }
public string Host { 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}]"; public virtual string SearchQuery => $"Term: [{SearchTerm}]";

4
src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs
Unescape View File

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

36
src/NzbDrone.Core/Indexers/Definitions/Anidex.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/Anidub.cs
Unescape View File

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

20
src/NzbDrone.Core/Indexers/Definitions/AnimeBytes.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/AnimeTorrents.cs
Unescape View File

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

32
src/NzbDrone.Core/Indexers/Definitions/Animedia.cs
Unescape View File

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

36
src/NzbDrone.Core/Indexers/Definitions/Anthelion.cs
Unescape View File

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

28
src/NzbDrone.Core/Indexers/Definitions/AudioBookBay.cs
Unescape View File

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

26
src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazRequestGenerator.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/BB.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/BakaBT.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/BeyondHD.cs
Unescape View File

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

42
src/NzbDrone.Core/Indexers/Definitions/BinSearch.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/BitHDTV.cs
Unescape View File

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

36
src/NzbDrone.Core/Indexers/Definitions/BroadcastheNet/BroadcastheNetRequestGenerator.cs
Unescape View File

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

48
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
Unescape View File

@ -42,12 +42,10 @@ namespace NzbDrone.Core.Indexers.Cardigann
public Func<IDictionary<string, string>> GetCookies { get; set; } public Func<IDictionary<string, string>> GetCookies { get; set; }
public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; } public Action<IDictionary<string, string>, DateTime?> CookiesUpdater { get; set; }
public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
{ {
_logger.Trace("Getting Movie search"); _logger.Trace("Getting Movie search");
var pageableRequests = new IndexerPageableRequestChain();
var variables = GetQueryVariableDefaults(searchCriteria); var variables = GetQueryVariableDefaults(searchCriteria);
variables[".Query.Movie"] = null; variables[".Query.Movie"] = null;
@ -59,17 +57,13 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.TraktID"] = searchCriteria.TraktId?.ToString() ?? null; variables[".Query.TraktID"] = searchCriteria.TraktId?.ToString() ?? null;
variables[".Query.DoubanID"] = searchCriteria.DoubanId?.ToString() ?? null; variables[".Query.DoubanID"] = searchCriteria.DoubanId?.ToString() ?? null;
pageableRequests.Add(GetRequest(variables, searchCriteria)); return GetRequest(variables, searchCriteria);
return pageableRequests;
} }
public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
{ {
_logger.Trace("Getting Music search"); _logger.Trace("Getting Music search");
var pageableRequests = new IndexerPageableRequestChain();
var variables = GetQueryVariableDefaults(searchCriteria); var variables = GetQueryVariableDefaults(searchCriteria);
variables[".Query.Album"] = searchCriteria.Album; variables[".Query.Album"] = searchCriteria.Album;
@ -79,17 +73,13 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.Year"] = searchCriteria.Year?.ToString() ?? null; variables[".Query.Year"] = searchCriteria.Year?.ToString() ?? null;
variables[".Query.Track"] = searchCriteria.Track; variables[".Query.Track"] = searchCriteria.Track;
pageableRequests.Add(GetRequest(variables, searchCriteria)); return GetRequest(variables, searchCriteria);
return pageableRequests;
} }
public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
{ {
_logger.Trace("Getting TV search"); _logger.Trace("Getting TV search");
var pageableRequests = new IndexerPageableRequestChain();
var variables = GetQueryVariableDefaults(searchCriteria); var variables = GetQueryVariableDefaults(searchCriteria);
variables[".Query.Series"] = null; variables[".Query.Series"] = null;
@ -107,17 +97,13 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.DoubanID"] = searchCriteria.DoubanId?.ToString() ?? null; variables[".Query.DoubanID"] = searchCriteria.DoubanId?.ToString() ?? null;
variables[".Query.Episode"] = searchCriteria.EpisodeSearchString; variables[".Query.Episode"] = searchCriteria.EpisodeSearchString;
pageableRequests.Add(GetRequest(variables, searchCriteria)); return GetRequest(variables, searchCriteria);
return pageableRequests;
} }
public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
{ {
_logger.Trace("Getting Book search"); _logger.Trace("Getting Book search");
var pageableRequests = new IndexerPageableRequestChain();
var variables = GetQueryVariableDefaults(searchCriteria); var variables = GetQueryVariableDefaults(searchCriteria);
variables[".Query.Author"] = searchCriteria.Author; variables[".Query.Author"] = searchCriteria.Author;
@ -126,22 +112,16 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.Publisher"] = searchCriteria.Publisher; variables[".Query.Publisher"] = searchCriteria.Publisher;
variables[".Query.Year"] = searchCriteria.Year?.ToString() ?? null; variables[".Query.Year"] = searchCriteria.Year?.ToString() ?? null;
pageableRequests.Add(GetRequest(variables, searchCriteria)); return GetRequest(variables, searchCriteria);
return pageableRequests;
} }
public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
{ {
_logger.Trace("Getting Basic search"); _logger.Trace("Getting Basic search");
var pageableRequests = new IndexerPageableRequestChain();
var variables = GetQueryVariableDefaults(searchCriteria); var variables = GetQueryVariableDefaults(searchCriteria);
pageableRequests.Add(GetRequest(variables, searchCriteria)); return GetRequest(variables, searchCriteria);
return pageableRequests;
} }
private Dictionary<string, object> GetQueryVariableDefaults(SearchCriteriaBase searchCriteria) private Dictionary<string, object> GetQueryVariableDefaults(SearchCriteriaBase searchCriteria)
@ -151,8 +131,8 @@ namespace NzbDrone.Core.Indexers.Cardigann
variables[".Query.Type"] = searchCriteria.SearchType; variables[".Query.Type"] = searchCriteria.SearchType;
variables[".Query.Q"] = searchCriteria.SearchTerm; variables[".Query.Q"] = searchCriteria.SearchTerm;
variables[".Query.Categories"] = searchCriteria.Categories; variables[".Query.Categories"] = searchCriteria.Categories;
variables[".Query.Limit"] = searchCriteria.Limit?.ToString() ?? null; variables[".Query.Limit"] = searchCriteria.Limit.ToString() ?? null;
variables[".Query.Offset"] = searchCriteria.Offset?.ToString() ?? null; variables[".Query.Offset"] = searchCriteria.Offset.ToString() ?? null;
variables[".Query.Extended"] = null; variables[".Query.Extended"] = null;
variables[".Query.APIKey"] = null; variables[".Query.APIKey"] = null;
variables[".Query.Genre"] = null; variables[".Query.Genre"] = null;
@ -1017,8 +997,8 @@ namespace NzbDrone.Core.Indexers.Cardigann
private IEnumerable<IndexerRequest> GetRequest(Dictionary<string, object> variables, SearchCriteriaBase searchCriteria) private IEnumerable<IndexerRequest> GetRequest(Dictionary<string, object> variables, SearchCriteriaBase searchCriteria)
{ {
var limit = searchCriteria.Limit ?? 100; var limit = searchCriteria.Limit;
var offset = searchCriteria.Offset ?? 0; var offset = searchCriteria.Offset;
if (offset > 0 && limit > 0 && offset / limit > 0) if (offset > 0 && limit > 0 && offset / limit > 0)
{ {

35
src/NzbDrone.Core/Indexers/Definitions/FileList/FileListRequestGenerator.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/FunFile.cs
Unescape View File

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

38
src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleRequestGenerator.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/GazelleGames.cs
Unescape View File

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

8
src/NzbDrone.Core/Indexers/Definitions/GreatPosterWall.cs
Unescape View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.Linq; using System.Linq;
@ -75,7 +75,7 @@ public class GreatPosterWallRequestGenerator : GazelleRequestGenerator
_settings = settings; _settings = settings;
} }
public override IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) public override IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
{ {
var parameters = GetBasicSearchParameters(searchCriteria.SearchTerm, searchCriteria.Categories); var parameters = GetBasicSearchParameters(searchCriteria.SearchTerm, searchCriteria.Categories);
@ -84,9 +84,7 @@ public class GreatPosterWallRequestGenerator : GazelleRequestGenerator
parameters.Set("searchstr", searchCriteria.FullImdbId); parameters.Set("searchstr", searchCriteria.FullImdbId);
} }
var pageableRequests = new IndexerPageableRequestChain(); return GetRequest(parameters);
pageableRequests.Add(GetRequest(parameters));
return pageableRequests;
} }
protected override NameValueCollection GetBasicSearchParameters(string term, int[] categories) protected override NameValueCollection GetBasicSearchParameters(string term, int[] categories)

29
src/NzbDrone.Core/Indexers/Definitions/HDBits/HDBitsRequestGenerator.cs
Unescape View File

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

36
src/NzbDrone.Core/Indexers/Definitions/HDSpace.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/HDTorrents.cs
Unescape View File

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

43
src/NzbDrone.Core/Indexers/Definitions/Headphones/HeadphonesRequestGenerator.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/IPTorrents.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/ImmortalSeed.cs
Unescape View File

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

28
src/NzbDrone.Core/Indexers/Definitions/Libble.cs
Unescape View File

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

18
src/NzbDrone.Core/Indexers/Definitions/MoreThanTV.cs
Unescape View File

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

32
src/NzbDrone.Core/Indexers/Definitions/MyAnonamouse.cs
Unescape View File

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

28
src/NzbDrone.Core/Indexers/Definitions/Nebulance.cs
Unescape View File

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

53
src/NzbDrone.Core/Indexers/Definitions/Newznab/NewznabRequestGenerator.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/NorBits.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/NzbIndex.cs
Unescape View File

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

29
src/NzbDrone.Core/Indexers/Definitions/Orpheus.cs
Unescape View File

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

32
src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcornRequestGenerator.cs
Unescape View File

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

28
src/NzbDrone.Core/Indexers/Definitions/PirateTheNet.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/PornoLab.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/PreToMe.cs
Unescape View File

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

31
src/NzbDrone.Core/Indexers/Definitions/Rarbg/RarbgRequestGenerator.cs
Unescape View File

@ -78,40 +78,29 @@ namespace NzbDrone.Core.Indexers.Definitions.Rarbg
yield return new IndexerRequest(requestBuilder.Build()); yield return new IndexerRequest(requestBuilder.Build());
} }
public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchCriteria) public IEnumerable<IndexerRequest> GetSearchRequests(MovieSearchCriteria searchCriteria)
{ {
var pageableRequests = new IndexerPageableRequestChain(); return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories, searchCriteria.FullImdbId, searchCriteria.TmdbId);
pageableRequests.Add(GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories, searchCriteria.FullImdbId, searchCriteria.TmdbId));
return pageableRequests;
} }
public IndexerPageableRequestChain GetSearchRequests(MusicSearchCriteria searchCriteria) public IEnumerable<IndexerRequest> GetSearchRequests(MusicSearchCriteria searchCriteria)
{ {
var pageableRequests = new IndexerPageableRequestChain(); return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
pageableRequests.Add(GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
return pageableRequests;
} }
public IndexerPageableRequestChain GetSearchRequests(TvSearchCriteria searchCriteria) public IEnumerable<IndexerRequest> GetSearchRequests(TvSearchCriteria searchCriteria)
{ {
var pageableRequests = new IndexerPageableRequestChain(); return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedTvSearchString, searchCriteria.Categories, searchCriteria.FullImdbId, tvdbId: searchCriteria.TvdbId);
pageableRequests.Add(GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedTvSearchString, searchCriteria.Categories, searchCriteria.FullImdbId, tvdbId: searchCriteria.TvdbId));
return pageableRequests;
} }
public IndexerPageableRequestChain GetSearchRequests(BookSearchCriteria searchCriteria) public IEnumerable<IndexerRequest> GetSearchRequests(BookSearchCriteria searchCriteria)
{ {
var pageableRequests = new IndexerPageableRequestChain(); return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
pageableRequests.Add(GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
return pageableRequests;
} }
public IndexerPageableRequestChain GetSearchRequests(BasicSearchCriteria searchCriteria) public IEnumerable<IndexerRequest> GetSearchRequests(BasicSearchCriteria searchCriteria)
{ {
var pageableRequests = new IndexerPageableRequestChain(); return GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories);
pageableRequests.Add(GetRequest(searchCriteria.IsRssSearch, searchCriteria.SanitizedSearchTerm, searchCriteria.Categories));
return pageableRequests;
} }
public Func<IDictionary<string, string>> GetCookies { get; set; } public Func<IDictionary<string, string>> GetCookies { get; set; }

29
src/NzbDrone.Core/Indexers/Definitions/Redacted.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/RevolutionTT.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/RuTracker.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/SceneHD.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/SceneTime.cs
Unescape View File

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

28
src/NzbDrone.Core/Indexers/Definitions/Shazbat.cs
Unescape View File

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

32
src/NzbDrone.Core/Indexers/Definitions/Shizaproject.cs
Unescape View File

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

18
src/NzbDrone.Core/Indexers/Definitions/SpeedApp/SpeedAppBase.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/SpeedCD.cs
Unescape View File

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

38
src/NzbDrone.Core/Indexers/Definitions/SubsPlease.cs
Unescape View File

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

32
src/NzbDrone.Core/Indexers/Definitions/TVVault.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/Toloka.cs
Unescape View File

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

38
src/NzbDrone.Core/Indexers/Definitions/TorrentBytes.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/TorrentDay.cs
Unescape View File

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

30
src/NzbDrone.Core/Indexers/Definitions/TorrentPotato/TorrentPotatoRequestGenerator.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/TorrentSyndikat.cs
Unescape View File

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

32
src/NzbDrone.Core/Indexers/Definitions/TorrentsCSV.cs
Unescape View File

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

30
src/NzbDrone.Core/Indexers/Definitions/UNIT3D/Unit3dRequestGenerator.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/Uniotaku.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs
Unescape View File

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

26
src/NzbDrone.Core/Indexers/Definitions/Xthor/XthorRequestGenerator.cs
Unescape View File

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

40
src/NzbDrone.Core/Indexers/Definitions/ZonaQ.cs
Unescape View File

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

45
src/NzbDrone.Core/Indexers/HttpIndexerBase.cs
Unescape View File

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

10
src/NzbDrone.Core/Indexers/IIndexerRequestGenerator.cs
Unescape View File

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

25
src/NzbDrone.Core/Indexers/IndexerPageableRequest.cs
Unescape View File

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

54
src/NzbDrone.Core/Indexers/IndexerPageableRequestChain.cs
Unescape View File

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

28
src/NzbDrone.Core/Indexers/RssIndexerRequestGenerator.cs
Unescape View File

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

Write Preview
Loading…
Cancel
Save