diff --git a/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs b/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs index 670baecc9..70d328572 100644 --- a/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs +++ b/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs @@ -10,7 +10,6 @@ namespace NzbDrone.Core.Indexers.Nyaa public override string Name => "Nyaa"; public override DownloadProtocol Protocol => DownloadProtocol.Torrent; - public override int PageSize => 75; public Nyaa(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger) : base(httpClient, indexerStatusService, configService, parsingService, logger) @@ -19,7 +18,7 @@ namespace NzbDrone.Core.Indexers.Nyaa public override IIndexerRequestGenerator GetRequestGenerator() { - return new NyaaRequestGenerator() { Settings = Settings, PageSize = PageSize }; + return new NyaaRequestGenerator() { Settings = Settings }; } public override IParseIndexerResponse GetParser() diff --git a/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs index 0b2d15ceb..7e7b16604 100644 --- a/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs @@ -9,20 +9,11 @@ namespace NzbDrone.Core.Indexers.Nyaa { public NyaaSettings Settings { get; set; } - public int MaxPages { get; set; } - public int PageSize { get; set; } - - public NyaaRequestGenerator() - { - MaxPages = 3; - PageSize = 75; - } - public virtual IndexerPageableRequestChain GetRecentRequests() { var pageableRequests = new IndexerPageableRequestChain(); - pageableRequests.Add(GetPagedRequests(MaxPages, null)); + pageableRequests.Add(GetPagedRequests(null)); return pageableRequests; } @@ -34,7 +25,7 @@ namespace NzbDrone.Core.Indexers.Nyaa var artistQuery = searchCriteria.CleanArtistQuery.Replace("+", " ").Trim(); var albumQuery = searchCriteria.CleanAlbumQuery.Replace("+", " ").Trim(); - pageableRequests.Add(GetPagedRequests(MaxPages, PrepareQuery($"{artistQuery} {albumQuery}"))); + pageableRequests.Add(GetPagedRequests(PrepareQuery($"{artistQuery} {albumQuery}"))); return pageableRequests; } @@ -45,33 +36,21 @@ namespace NzbDrone.Core.Indexers.Nyaa var artistQuery = searchCriteria.CleanArtistQuery.Replace("+", " ").Trim(); - pageableRequests.Add(GetPagedRequests(MaxPages, PrepareQuery(artistQuery))); + pageableRequests.Add(GetPagedRequests(PrepareQuery(artistQuery))); return pageableRequests; } - private IEnumerable GetPagedRequests(int maxPages, string term) + private IEnumerable GetPagedRequests(string term) { - var baseUrl = string.Format("{0}/?page=rss{1}", Settings.BaseUrl.TrimEnd('/'), Settings.AdditionalParameters); + var baseUrl = $"{Settings.BaseUrl.TrimEnd('/')}/?page=rss{Settings.AdditionalParameters}"; if (term != null) { baseUrl += "&term=" + term; } - if (PageSize == 0) - { - yield return new IndexerRequest(baseUrl, HttpAccept.Rss); - } - else - { - yield return new IndexerRequest(baseUrl, HttpAccept.Rss); - - for (var page = 1; page < maxPages; page++) - { - yield return new IndexerRequest($"{baseUrl}&offset={page + 1}", HttpAccept.Rss); - } - } + yield return new IndexerRequest(baseUrl, HttpAccept.Rss); } private string PrepareQuery(string query)