From b18daebc8a1da3a5fc19eacd490df4a6fcff1ad3 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 5 Oct 2021 12:00:59 -0700 Subject: [PATCH] Rename QueryTitles to CleanSceneTitles in SearchCriteriaBase (cherry picked from commit 747a4164e24e9861cacad39cf7d94db398747b38) --- .../IndexerSearchTests/SearchDefinitionFixture.cs | 2 +- .../IndexerSearch/Definitions/SearchCriteriaBase.cs | 4 ++-- .../Indexers/FileList/FileListRequestGenerator.cs | 2 +- src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs | 2 +- src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs | 2 +- .../Indexers/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs | 2 +- .../Indexers/PassThePopcorn/PassThePopcornRequestGenerator.cs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/NzbDrone.Core.Test/IndexerSearchTests/SearchDefinitionFixture.cs b/src/NzbDrone.Core.Test/IndexerSearchTests/SearchDefinitionFixture.cs index 4e1f4db6db..6ec88ac3d9 100644 --- a/src/NzbDrone.Core.Test/IndexerSearchTests/SearchDefinitionFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerSearchTests/SearchDefinitionFixture.cs @@ -18,7 +18,7 @@ public class SearchDefinitionFixture : CoreTest public void should_replace_some_special_characters(string input, string expected) { Subject.SceneTitles = new List { input }; - Subject.QueryTitles.First().Should().Be(expected); + Subject.CleanSceneTitles.First().Should().Be(expected); } } } diff --git a/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs b/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs index da55ef55f9..b132f3740e 100644 --- a/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs +++ b/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs @@ -19,9 +19,9 @@ public abstract class SearchCriteriaBase public virtual bool UserInvokedSearch { get; set; } public virtual bool InteractiveSearch { get; set; } - public List QueryTitles => SceneTitles.Select(GetQueryTitle).ToList(); + public List CleanSceneTitles => SceneTitles.Select(GetCleanSceneTitle).Distinct().ToList(); - public static string GetQueryTitle(string title) + public static string GetCleanSceneTitle(string title) { Ensure.That(title, () => title).IsNotNullOrWhiteSpace(); diff --git a/src/NzbDrone.Core/Indexers/FileList/FileListRequestGenerator.cs b/src/NzbDrone.Core/Indexers/FileList/FileListRequestGenerator.cs index 1d6ac14457..ca47a146a4 100644 --- a/src/NzbDrone.Core/Indexers/FileList/FileListRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/FileList/FileListRequestGenerator.cs @@ -30,7 +30,7 @@ public virtual IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria } else { - foreach (var queryTitle in searchCriteria.QueryTitles) + foreach (var queryTitle in searchCriteria.CleanSceneTitles) { var titleYearSearchQuery = string.Format("{0}+{1}", queryTitle, searchCriteria.Movie.Year); pageableRequests.Add(GetRequest("search-torrents", string.Format("&type=name&query={0}", titleYearSearchQuery.Trim()))); diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs index a725a9756b..9486b019a8 100644 --- a/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs @@ -155,7 +155,7 @@ private void AddMovieIdPageableRequests(IndexerPageableRequestChain chain, int m if (SupportsSearch) { chain.AddTier(); - var queryTitles = TextSearchEngine == "raw" ? searchCriteria.SceneTitles : searchCriteria.QueryTitles; + var queryTitles = TextSearchEngine == "raw" ? searchCriteria.SceneTitles : searchCriteria.CleanSceneTitles; foreach (var queryTitle in queryTitles) { var searchQuery = queryTitle; diff --git a/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs index 103e872b49..7760f08a85 100644 --- a/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs @@ -60,7 +60,7 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC { var pageableRequests = new IndexerPageableRequestChain(); - foreach (var queryTitle in searchCriteria.QueryTitles) + foreach (var queryTitle in searchCriteria.CleanSceneTitles) { pageableRequests.Add(GetPagedRequests(MaxPages, PrepareQuery(string.Format("{0} {1}", queryTitle, searchCriteria.Movie.Year)))); } diff --git a/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs index b2bf7d5aa4..665044281d 100644 --- a/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs @@ -30,7 +30,7 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC { var pageableRequests = new IndexerPageableRequestChain(); - foreach (var queryTitle in searchCriteria.QueryTitles) + foreach (var queryTitle in searchCriteria.CleanSceneTitles) { pageableRequests.Add(GetPagedRequests(string.Format("{0}", queryTitle))); diff --git a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornRequestGenerator.cs b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornRequestGenerator.cs index 9a93c76735..f5d62c4fdf 100644 --- a/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornRequestGenerator.cs @@ -35,7 +35,7 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC } else if (searchCriteria.Movie.Year > 0) { - foreach (var queryTitle in searchCriteria.QueryTitles) + foreach (var queryTitle in searchCriteria.CleanSceneTitles) { pageableRequests.Add(GetRequest(string.Format("{0}&year={1}", queryTitle, searchCriteria.Movie.Year))); }