From 747a4164e24e9861cacad39cf7d94db398747b38 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 --- .../IndexerSearchTests/SearchDefinitionFixture.cs | 2 +- .../IndexerSearchTests/SeriesSearchServiceFixture.cs | 6 +++--- .../IndexerSearch/Definitions/SearchCriteriaBase.cs | 4 ++-- .../BroadcastheNet/BroadcastheNetRequestGenerator.cs | 2 +- .../Indexers/Fanzub/FanzubRequestGenerator.cs | 2 +- .../Indexers/Newznab/NewznabRequestGenerator.cs | 4 ++-- src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs | 2 +- .../Indexers/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs | 8 ++++---- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/NzbDrone.Core.Test/IndexerSearchTests/SearchDefinitionFixture.cs b/src/NzbDrone.Core.Test/IndexerSearchTests/SearchDefinitionFixture.cs index 02c4db4bb..5885de408 100644 --- a/src/NzbDrone.Core.Test/IndexerSearchTests/SearchDefinitionFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerSearchTests/SearchDefinitionFixture.cs @@ -18,7 +18,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests 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.Test/IndexerSearchTests/SeriesSearchServiceFixture.cs b/src/NzbDrone.Core.Test/IndexerSearchTests/SeriesSearchServiceFixture.cs index 591a5d546..c1aa202c2 100644 --- a/src/NzbDrone.Core.Test/IndexerSearchTests/SeriesSearchServiceFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerSearchTests/SeriesSearchServiceFixture.cs @@ -31,7 +31,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests .Setup(s => s.GetSeries(It.IsAny())) .Returns(_series); - Mocker.GetMock() + Mocker.GetMock() .Setup(s => s.SeasonSearch(_series.Id, It.IsAny(), false, false, true, false)) .Returns(new List()); @@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests Subject.Execute(new SeriesSearchCommand { SeriesId = _series.Id, Trigger = CommandTrigger.Manual }); - Mocker.GetMock() + Mocker.GetMock() .Verify(v => v.SeasonSearch(_series.Id, It.IsAny(), false, true, true, false), Times.Exactly(_series.Seasons.Count(s => s.Monitored))); } @@ -67,7 +67,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests new Season { SeasonNumber = 2, Monitored = true } }; - Mocker.GetMock() + Mocker.GetMock() .Setup(s => s.SeasonSearch(_series.Id, It.IsAny(), false, true, true, false)) .Returns(new List()) .Callback((seriesId, seasonNumber, missingOnly, monitoredOnly, userInvokedSearch, interactiveSearch) => seasonOrder.Add(seasonNumber)); diff --git a/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs b/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs index ab3063f82..1f64f41be 100644 --- a/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs +++ b/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs @@ -22,9 +22,9 @@ namespace NzbDrone.Core.IndexerSearch.Definitions public virtual bool UserInvokedSearch { get; set; } public virtual bool InteractiveSearch { get; set; } - public List QueryTitles => SceneTitles.Select(GetQueryTitle).Distinct().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/BroadcastheNet/BroadcastheNetRequestGenerator.cs b/src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetRequestGenerator.cs index 438f86f62..8df7c7132 100644 --- a/src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/BroadcastheNet/BroadcastheNetRequestGenerator.cs @@ -181,7 +181,7 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet if (AddSeriesSearchParameters(parameters, searchCriteria)) { var episodeQueryTitle = searchCriteria.Episodes.Where(e => !string.IsNullOrWhiteSpace(e.Title)) - .Select(e => SearchCriteriaBase.GetQueryTitle(e.Title)) + .Select(e => SearchCriteriaBase.GetCleanSceneTitle(e.Title)) .ToArray(); foreach (var queryTitle in episodeQueryTitle) diff --git a/src/NzbDrone.Core/Indexers/Fanzub/FanzubRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Fanzub/FanzubRequestGenerator.cs index 47a96b334..7c8ce1feb 100644 --- a/src/NzbDrone.Core/Indexers/Fanzub/FanzubRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Fanzub/FanzubRequestGenerator.cs @@ -53,7 +53,7 @@ namespace NzbDrone.Core.Indexers.Fanzub { var pageableRequests = new IndexerPageableRequestChain(); - var searchTitles = searchCriteria.QueryTitles.SelectMany(v => GetTitleSearchStrings(v, searchCriteria.AbsoluteEpisodeNumber)).ToList(); + var searchTitles = searchCriteria.CleanSceneTitles.SelectMany(v => GetTitleSearchStrings(v, searchCriteria.AbsoluteEpisodeNumber)).ToList(); pageableRequests.Add(GetPagedRequests(string.Join("|", searchTitles))); diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs index efadb6445..620195e34 100644 --- a/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs @@ -314,7 +314,7 @@ namespace NzbDrone.Core.Indexers.Newznab if (SupportsSearch) { - var queryTitles = (TextSearchEngine == "raw" ? searchCriteria.SceneTitles : searchCriteria.QueryTitles); + var queryTitles = (TextSearchEngine == "raw" ? searchCriteria.SceneTitles : searchCriteria.CleanSceneTitles); foreach (var queryTitle in queryTitles) { pageableRequests.Add(GetPagedRequests(MaxPages, Settings.AnimeCategories, "search", @@ -419,7 +419,7 @@ namespace NzbDrone.Core.Indexers.Newznab } else if (SupportsTvSearch) { - var queryTitles = TvTextSearchEngine == "raw" ? searchCriteria.SceneTitles : searchCriteria.QueryTitles; + var queryTitles = TvTextSearchEngine == "raw" ? searchCriteria.SceneTitles : searchCriteria.CleanSceneTitles; foreach (var queryTitle in queryTitles) { chain.Add(GetPagedRequests(MaxPages, Settings.Categories, "tvsearch", diff --git a/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs index 2c8267cd3..3cf917e72 100644 --- a/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Nyaa/NyaaRequestGenerator.cs @@ -50,7 +50,7 @@ namespace NzbDrone.Core.Indexers.Nyaa { var pageableRequests = new IndexerPageableRequestChain(); - foreach (var queryTitle in searchCriteria.QueryTitles) + foreach (var queryTitle in searchCriteria.CleanSceneTitles) { var searchTitle = PrepareQuery(queryTitle); diff --git a/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs index 19d1f46a8..07efbc80a 100644 --- a/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Omgwtfnzbs/OmgwtfnzbsRequestGenerator.cs @@ -29,7 +29,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs { var pageableRequests = new IndexerPageableRequestChain(); - foreach (var queryTitle in searchCriteria.QueryTitles) + foreach (var queryTitle in searchCriteria.CleanSceneTitles) { pageableRequests.Add(GetPagedRequests(string.Format("{0}+S{1:00}E{2:00}", queryTitle, @@ -44,7 +44,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs { var pageableRequests = new IndexerPageableRequestChain(); - foreach (var queryTitle in searchCriteria.QueryTitles) + foreach (var queryTitle in searchCriteria.CleanSceneTitles) { pageableRequests.Add(GetPagedRequests(string.Format("{0}+S{1:00}", queryTitle, @@ -58,7 +58,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs { var pageableRequests = new IndexerPageableRequestChain(); - foreach (var queryTitle in searchCriteria.QueryTitles) + foreach (var queryTitle in searchCriteria.CleanSceneTitles) { pageableRequests.Add(GetPagedRequests(string.Format("{0}+{1:yyyy MM dd}", queryTitle, @@ -72,7 +72,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs { var pageableRequests = new IndexerPageableRequestChain(); - foreach (var queryTitle in searchCriteria.QueryTitles) + foreach (var queryTitle in searchCriteria.CleanSceneTitles) { pageableRequests.Add(GetPagedRequests(string.Format("{0}+{1}", queryTitle,