From ad7b110a0b1e8910fb8e04d12accf2c0932a4261 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Sun, 12 Feb 2023 16:34:04 -0600 Subject: [PATCH] New: Use better page size for Newznab/Torznab (up to 100) when supported by the indexer (cherry picked from commit ddb25b109575cc378462a1c3a64705f2003f01f0) Closes #2181 --- .../IndexerTests/NewznabTests/NewznabFixture.cs | 13 +++++++++++-- .../IndexerTests/TorznabTests/TorznabFixture.cs | 13 +++++++++++-- src/NzbDrone.Core/Indexers/Newznab/Newznab.cs | 2 +- src/NzbDrone.Core/Indexers/Torznab/Torznab.cs | 2 +- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs index b0b8ecd8bb..8dfa3fccb9 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs @@ -65,12 +65,21 @@ public void should_parse_recent_feed_from_newznab_nzb_su() } [Test] - public void should_use_pagesize_reported_by_caps() + public void should_use_best_pagesize_reported_by_caps() { _caps.MaxPageSize = 30; _caps.DefaultPageSize = 25; - Subject.PageSize.Should().Be(25); + Subject.PageSize.Should().Be(30); + } + + [Test] + public void should_not_use_pagesize_over_100_even_if_reported_in_caps() + { + _caps.MaxPageSize = 250; + _caps.DefaultPageSize = 25; + + Subject.PageSize.Should().Be(100); } [Test] diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs index 48715ef21d..91b5c38ade 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs @@ -103,12 +103,21 @@ public void should_parse_recent_feed_from_torznab_tpb() } [Test] - public void should_use_pagesize_reported_by_caps() + public void should_use_best_pagesize_reported_by_caps() { _caps.MaxPageSize = 30; _caps.DefaultPageSize = 25; - Subject.PageSize.Should().Be(25); + Subject.PageSize.Should().Be(30); + } + + [Test] + public void should_not_use_pagesize_over_100_even_if_reported_in_caps() + { + _caps.MaxPageSize = 250; + _caps.DefaultPageSize = 25; + + Subject.PageSize.Should().Be(100); } [TestCase("http://localhost:9117/", "/api")] diff --git a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs index 948eb3e1c8..2a0e56e89a 100644 --- a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs +++ b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs @@ -20,7 +20,7 @@ public class Newznab : HttpIndexerBase public override DownloadProtocol Protocol => DownloadProtocol.Usenet; - public override int PageSize => _capabilitiesProvider.GetCapabilities(Settings).DefaultPageSize; + public override int PageSize => Math.Min(100, Math.Max(_capabilitiesProvider.GetCapabilities(Settings).DefaultPageSize, _capabilitiesProvider.GetCapabilities(Settings).MaxPageSize)); public override IIndexerRequestGenerator GetRequestGenerator() { diff --git a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs index 70ab6beb3e..b663a62545 100644 --- a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs +++ b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs @@ -19,7 +19,7 @@ public class Torznab : HttpIndexerBase public override string Name => "Torznab"; public override DownloadProtocol Protocol => DownloadProtocol.Torrent; - public override int PageSize => _capabilitiesProvider.GetCapabilities(Settings).DefaultPageSize; + public override int PageSize => Math.Min(100, Math.Max(_capabilitiesProvider.GetCapabilities(Settings).DefaultPageSize, _capabilitiesProvider.GetCapabilities(Settings).MaxPageSize)); public override IIndexerRequestGenerator GetRequestGenerator() {