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

New: Don't prevent season searches for Newznab/Torznab if supported by the indexer

Browse Source 
Closes #5562
pull/5570/head
Mark McDowall 2 years ago
parent 764c084987
commit 97cf3cee17
2 changed files with 126 additions and 28 deletions
Show Stats Download Patch File Download Diff File

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

@ -12,6 +12,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
public class NewznabRequestGeneratorFixture : CoreTest<NewznabRequestGenerator>
{
private SingleEpisodeSearchCriteria _singleEpisodeSearchCriteria;
private SeasonSearchCriteria _seasonSearchCriteria;
private AnimeEpisodeSearchCriteria _animeSearchCriteria;
private NewznabCapabilities _capabilities;
@ -34,6 +35,13 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
EpisodeNumber = 2
};
_seasonSearchCriteria = new SeasonSearchCriteria
{
Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40" },
SceneTitles = new List<string> { "Monkey Island" },
SeasonNumber = 1,
};
_animeSearchCriteria = new AnimeEpisodeSearchCriteria()
{
Series = new Tv.Series { TvRageId = 10, TvdbId = 20, TvMazeId = 30, ImdbId = "t40" },
@ -378,5 +386,27 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
pageTier.Url.Query.Should().NotContain(" & ");
pageTier.Url.Query.Should().NotContain("%26");
}
[Test]
public void should_allow_season_search_even_if_episode_search_is_not_allowed()
{
_capabilities.SupportedTvSearchParameters = new[] { "q", "tvdbid", "season" };
var results = Subject.GetSearchRequests(_seasonSearchCriteria);
results.GetTier(0).Should().HaveCount(1);
var page = results.GetAllTiers().First().First();
page.Url.Query.Should().Contain("tvdbid=20");
}
[Test]
public void should_not_allow_season_search_if_season_param_is_not_allowed()
{
_capabilities.SupportedTvSearchParameters = new[] { "q", "tvdbid" };
var results = Subject.GetSearchRequests(_seasonSearchCriteria);
results.GetTier(0).Should().HaveCount(0);
}
}
}

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

@ -28,6 +28,7 @@ namespace NzbDrone.Core.Indexers.Newznab
PageSize = 100;
}
// Used for anime
private bool SupportsSearch
{
get
@ -39,19 +40,19 @@ namespace NzbDrone.Core.Indexers.Newznab
}
}
private bool SupportsTvSearch
// Used for standard/daily
private bool SupportsTvQuerySearch
{
get
{
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
return capabilities.SupportedTvSearchParameters != null &&
capabilities.SupportedTvSearchParameters.Contains("q") &&
capabilities.SupportedTvSearchParameters.Contains("season") &&
capabilities.SupportedTvSearchParameters.Contains("ep");
capabilities.SupportedTvSearchParameters.Contains("q");
}
}
// Used for standard/daily
private bool SupportsTvTitleSearch
{
get
@ -59,9 +60,16 @@ namespace NzbDrone.Core.Indexers.Newznab
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
return capabilities.SupportedTvSearchParameters != null &&
capabilities.SupportedTvSearchParameters.Contains("title") &&
capabilities.SupportedTvSearchParameters.Contains("season") &&
capabilities.SupportedTvSearchParameters.Contains("ep");
capabilities.SupportedTvSearchParameters.Contains("title");
}
}
// Combines 'SupportsTvQuerySearch' and 'SupportsTvTitleSearch'
private bool SupportsTvTextSearches
{
get
{
return SupportsTvQuerySearch || SupportsTvTitleSearch;
}
}
@ -72,9 +80,7 @@ namespace NzbDrone.Core.Indexers.Newznab
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
return capabilities.SupportedTvSearchParameters != null &&
capabilities.SupportedTvSearchParameters.Contains("tvdbid") &&
capabilities.SupportedTvSearchParameters.Contains("season") &&
capabilities.SupportedTvSearchParameters.Contains("ep");
capabilities.SupportedTvSearchParameters.Contains("tvdbid");
}
}
@ -85,9 +91,7 @@ namespace NzbDrone.Core.Indexers.Newznab
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
return capabilities.SupportedTvSearchParameters != null &&
capabilities.SupportedTvSearchParameters.Contains("imdbid") &&
capabilities.SupportedTvSearchParameters.Contains("season") &&
capabilities.SupportedTvSearchParameters.Contains("ep");
capabilities.SupportedTvSearchParameters.Contains("imdbid");
}
}
@ -98,9 +102,7 @@ namespace NzbDrone.Core.Indexers.Newznab
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
return capabilities.SupportedTvSearchParameters != null &&
capabilities.SupportedTvSearchParameters.Contains("rid") &&
capabilities.SupportedTvSearchParameters.Contains("season") &&
capabilities.SupportedTvSearchParameters.Contains("ep");
capabilities.SupportedTvSearchParameters.Contains("rid");
}
}
@ -111,7 +113,37 @@ namespace NzbDrone.Core.Indexers.Newznab
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
return capabilities.SupportedTvSearchParameters != null &&
capabilities.SupportedTvSearchParameters.Contains("tvmazeid") &&
capabilities.SupportedTvSearchParameters.Contains("tvmazeid");
}
}
// Combines all ID based searches
private bool SupportsTvIdSearches
{
get
{
return SupportsTvdbSearch || SupportsImdbSearch || SupportsTvRageSearch || SupportsTvMazeSearch;
}
}
private bool SupportsSeasonSearch
{
get
{
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
return capabilities.SupportedTvSearchParameters != null &&
capabilities.SupportedTvSearchParameters.Contains("season");
}
}
private bool SupportsEpisodeSearch
{
get
{
var capabilities = _capabilitiesProvider.GetCapabilities(Settings);
return capabilities.SupportedTvSearchParameters != null &&
capabilities.SupportedTvSearchParameters.Contains("season") &&
capabilities.SupportedTvSearchParameters.Contains("ep");
}
@ -167,12 +199,21 @@ namespace NzbDrone.Core.Indexers.Newznab
public virtual IndexerPageableRequestChain GetSearchRequests(SingleEpisodeSearchCriteria searchCriteria)
{
if (!SupportsTvdbSearch && !SupportsTvSearch && !SupportsTvTitleSearch)
var pageableRequests = new IndexerPageableRequestChain();
if (!SupportsEpisodeSearch)
{
_logger.Debug("Indexer capabilities lacking season & ep query parameters, no Standard series search possible.");
return pageableRequests;
}
var pageableRequests = new IndexerPageableRequestChain();
if (!SupportsTvTextSearches && !SupportsTvIdSearches)
{
_logger.Debug("Indexer capabilities lacking q, title, tvdbid, imdbid, rid and tvmazeid parameters, no Standard series search possible.");
return pageableRequests;
}
if (searchCriteria.SearchMode.HasFlag(SearchMode.SearchID) || searchCriteria.SearchMode == SearchMode.Default)
{
@ -205,12 +246,21 @@ namespace NzbDrone.Core.Indexers.Newznab
public virtual IndexerPageableRequestChain GetSearchRequests(SeasonSearchCriteria searchCriteria)
{
if (!SupportsTvdbSearch && !SupportsTvSearch && !SupportsTvTitleSearch)
var pageableRequests = new IndexerPageableRequestChain();
if (!SupportsSeasonSearch)
{
_logger.Debug("Indexer capabilities lacking season & ep query parameters, no Standard series search possible.");
_logger.Debug("Indexer capabilities lacking season query parameter, no Standard series search possible.");
return pageableRequests;
}
var pageableRequests = new IndexerPageableRequestChain();
if (!SupportsTvTextSearches && !SupportsTvIdSearches)
{
_logger.Debug("Indexer capabilities lacking q, title, tvdbid, imdbid, rid and tvmazeid parameters, no Standard series search possible.");
return pageableRequests;
}
if (searchCriteria.SearchMode.HasFlag(SearchMode.SearchID) || searchCriteria.SearchMode == SearchMode.Default)
{
@ -243,12 +293,21 @@ namespace NzbDrone.Core.Indexers.Newznab
public virtual IndexerPageableRequestChain GetSearchRequests(DailyEpisodeSearchCriteria searchCriteria)
{
if (!SupportsTvdbSearch && !SupportsTvSearch && !SupportsTvTitleSearch)
var pageableRequests = new IndexerPageableRequestChain();
if (!SupportsEpisodeSearch)
{
_logger.Debug("Indexer capabilities lacking season & ep query parameters, no Daily series search possible.");
return pageableRequests;
}
var pageableRequests = new IndexerPageableRequestChain();
if (!SupportsTvTextSearches && !SupportsTvIdSearches)
{
_logger.Debug("Indexer capabilities lacking q, title, tvdbid, imdbid, rid and tvmazeid parameters, no Daily series search possible.");
return pageableRequests;
}
if (searchCriteria.SearchMode.HasFlag(SearchMode.SearchID) || searchCriteria.SearchMode == SearchMode.Default)
{
@ -281,12 +340,21 @@ namespace NzbDrone.Core.Indexers.Newznab
public virtual IndexerPageableRequestChain GetSearchRequests(DailySeasonSearchCriteria searchCriteria)
{
if (!SupportsTvdbSearch && !SupportsTvSearch && !SupportsTvTitleSearch)
var pageableRequests = new IndexerPageableRequestChain();
if (!SupportsEpisodeSearch)
{
_logger.Debug("Indexer capabilities lacking season & ep query parameters, no Daily series search possible.");
_logger.Debug("Indexer capabilities lacking season query parameter, no Daily series search possible.");
return pageableRequests;
}
var pageableRequests = new IndexerPageableRequestChain();
if (!SupportsTvTextSearches && !SupportsTvIdSearches)
{
_logger.Debug("Indexer capabilities lacking q, title, tvdbid, imdbid, rid and tvmazeid parameters, no Daily series search possible.");
return pageableRequests;
}
if (searchCriteria.SearchMode.HasFlag(SearchMode.SearchID) || searchCriteria.SearchMode == SearchMode.Default)
{
@ -453,7 +521,7 @@ namespace NzbDrone.Core.Indexers.Newznab
$"&title={Uri.EscapeDataString(searchTerm)}{parameters}"));
}
}
else if (SupportsTvSearch)
else if (SupportsTvQuerySearch)
{
var queryTitles = TvTextSearchEngine == "raw" ? searchCriteria.SceneTitles : searchCriteria.CleanSceneTitles;
foreach (var queryTitle in queryTitles)

Write Preview
Loading…
Cancel
Save