diff --git a/src/NzbDrone.Api/Indexers/ReleaseModule.cs b/src/NzbDrone.Api/Indexers/ReleaseModule.cs index ded9f6ac7..2c9805421 100644 --- a/src/NzbDrone.Api/Indexers/ReleaseModule.cs +++ b/src/NzbDrone.Api/Indexers/ReleaseModule.cs @@ -18,7 +18,7 @@ namespace NzbDrone.Api.Indexers public class ReleaseModule : ReleaseModuleBase { private readonly IFetchAndParseRss _rssFetcherAndParser; - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IMakeDownloadDecision _downloadDecisionMaker; private readonly IPrioritizeDownloadDecision _prioritizeDownloadDecision; private readonly IDownloadService _downloadService; @@ -27,7 +27,7 @@ namespace NzbDrone.Api.Indexers private readonly ICached _remoteEpisodeCache; public ReleaseModule(IFetchAndParseRss rssFetcherAndParser, - ISearchForNzb nzbSearchService, + ISearchForReleases releaseSearchService, IMakeDownloadDecision downloadDecisionMaker, IPrioritizeDownloadDecision prioritizeDownloadDecision, IDownloadService downloadService, @@ -35,7 +35,7 @@ namespace NzbDrone.Api.Indexers Logger logger) { _rssFetcherAndParser = rssFetcherAndParser; - _nzbSearchService = nzbSearchService; + _releaseSearchService = releaseSearchService; _downloadDecisionMaker = downloadDecisionMaker; _prioritizeDownloadDecision = prioritizeDownloadDecision; _downloadService = downloadService; @@ -88,7 +88,7 @@ namespace NzbDrone.Api.Indexers { try { - var decisions = _nzbSearchService.EpisodeSearch(episodeId, true, true); + var decisions = _releaseSearchService.EpisodeSearch(episodeId, true, true); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions); return MapDecisions(prioritizedDecisions); diff --git a/src/NzbDrone.Core.Test/IndexerSearchTests/NzbSearchServiceFixture.cs b/src/NzbDrone.Core.Test/IndexerSearchTests/ReleaseSearchServiceFixture.cs similarity index 99% rename from src/NzbDrone.Core.Test/IndexerSearchTests/NzbSearchServiceFixture.cs rename to src/NzbDrone.Core.Test/IndexerSearchTests/ReleaseSearchServiceFixture.cs index 44482d1c1..b64b0e612 100644 --- a/src/NzbDrone.Core.Test/IndexerSearchTests/NzbSearchServiceFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerSearchTests/ReleaseSearchServiceFixture.cs @@ -16,7 +16,7 @@ using NzbDrone.Core.Tv; namespace NzbDrone.Core.Test.IndexerSearchTests { - public class NzbSearchServiceFixture : CoreTest + public class ReleaseSearchServiceFixture : CoreTest { private Mock _mockIndexer; private Series _xemSeries; diff --git a/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs b/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs index 72b70f2e6..9ea676d3f 100644 --- a/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs @@ -18,21 +18,21 @@ namespace NzbDrone.Core.IndexerSearch IExecute, IExecute { - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly IEpisodeService _episodeService; private readonly IEpisodeCutoffService _episodeCutoffService; private readonly IQueueService _queueService; private readonly Logger _logger; - public EpisodeSearchService(ISearchForNzb nzbSearchService, + public EpisodeSearchService(ISearchForReleases releaseSearchService, IProcessDownloadDecisions processDownloadDecisions, IEpisodeService episodeService, IEpisodeCutoffService episodeCutoffService, IQueueService queueService, Logger logger) { - _nzbSearchService = nzbSearchService; + _releaseSearchService = releaseSearchService; _processDownloadDecisions = processDownloadDecisions; _episodeService = episodeService; _episodeCutoffService = episodeCutoffService; @@ -55,7 +55,7 @@ namespace NzbDrone.Core.IndexerSearch { try { - decisions = _nzbSearchService.SeasonSearch(series.Key, season.Key, season.ToList(), monitoredOnly, userInvokedSearch, false); + decisions = _releaseSearchService.SeasonSearch(series.Key, season.Key, season.ToList(), monitoredOnly, userInvokedSearch, false); } catch (Exception ex) { @@ -68,7 +68,7 @@ namespace NzbDrone.Core.IndexerSearch { try { - decisions = _nzbSearchService.EpisodeSearch(season.First(), userInvokedSearch, false); + decisions = _releaseSearchService.EpisodeSearch(season.First(), userInvokedSearch, false); } catch (Exception ex) { @@ -95,7 +95,7 @@ namespace NzbDrone.Core.IndexerSearch { foreach (var episodeId in message.EpisodeIds) { - var decisions = _nzbSearchService.EpisodeSearch(episodeId, message.Trigger == CommandTrigger.Manual, false); + var decisions = _releaseSearchService.EpisodeSearch(episodeId, message.Trigger == CommandTrigger.Manual, false); var processed = _processDownloadDecisions.ProcessDecisions(decisions); _logger.ProgressInfo("Episode search completed. {0} reports downloaded.", processed.Grabbed.Count); diff --git a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs similarity index 98% rename from src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs rename to src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs index 0a2c790cd..6a07c7e39 100644 --- a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs @@ -18,7 +18,7 @@ using NzbDrone.Core.Parser; namespace NzbDrone.Core.IndexerSearch { - public interface ISearchForNzb + public interface ISearchForReleases { List EpisodeSearch(int episodeId, bool userInvokedSearch, bool interactiveSearch); List EpisodeSearch(Episode episode, bool userInvokedSearch, bool interactiveSearch); @@ -26,7 +26,7 @@ namespace NzbDrone.Core.IndexerSearch List SeasonSearch(int seriesId, int seasonNumber, List episodes, bool monitoredOnly, bool userInvokedSearch, bool interactiveSearch); } - public class NzbSearchService : ISearchForNzb + public class ReleaseSearchService : ISearchForReleases { private readonly IIndexerFactory _indexerFactory; private readonly ISceneMappingService _sceneMapping; @@ -35,7 +35,7 @@ namespace NzbDrone.Core.IndexerSearch private readonly IMakeDownloadDecision _makeDownloadDecision; private readonly Logger _logger; - public NzbSearchService(IIndexerFactory indexerFactory, + public ReleaseSearchService(IIndexerFactory indexerFactory, ISceneMappingService sceneMapping, ISeriesService seriesService, IEpisodeService episodeService, @@ -373,7 +373,7 @@ namespace NzbDrone.Core.IndexerSearch var searchSpec = Get(series, episodes, monitoredOnly, userInvokedSearch, interactiveSearch); // build list of queries for each episode in the form: " " searchSpec.EpisodeQueryTitles = episodes.Where(e => !string.IsNullOrWhiteSpace(e.Title)) - .SelectMany(e => searchSpec.QueryTitles.Select(title => title + " " + SearchCriteriaBase.GetQueryTitle(e.Title))) + .SelectMany(e => searchSpec.CleanSceneTitles.Select(title => title + " " + SearchCriteriaBase.GetCleanSceneTitle(e.Title))) .ToArray(); downloadDecisions.AddRange(Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec)); diff --git a/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs b/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs index 0453e329a..bfd4d2b1c 100644 --- a/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs @@ -7,22 +7,22 @@ namespace NzbDrone.Core.IndexerSearch { public class SeasonSearchService : IExecute { - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly Logger _logger; - public SeasonSearchService(ISearchForNzb nzbSearchService, + public SeasonSearchService(ISearchForReleases releaseSearchService, IProcessDownloadDecisions processDownloadDecisions, Logger logger) { - _nzbSearchService = nzbSearchService; + _releaseSearchService = releaseSearchService; _processDownloadDecisions = processDownloadDecisions; _logger = logger; } public void Execute(SeasonSearchCommand message) { - var decisions = _nzbSearchService.SeasonSearch(message.SeriesId, message.SeasonNumber, false, true, message.Trigger == CommandTrigger.Manual, false); + var decisions = _releaseSearchService.SeasonSearch(message.SeriesId, message.SeasonNumber, false, true, message.Trigger == CommandTrigger.Manual, false); var processed = _processDownloadDecisions.ProcessDecisions(decisions); _logger.ProgressInfo("Season search completed. {0} reports downloaded.", processed.Grabbed.Count); diff --git a/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs b/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs index e92393db4..b198e96fa 100644 --- a/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs @@ -10,17 +10,17 @@ namespace NzbDrone.Core.IndexerSearch public class SeriesSearchService : IExecute { private readonly ISeriesService _seriesService; - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly Logger _logger; public SeriesSearchService(ISeriesService seriesService, - ISearchForNzb nzbSearchService, + ISearchForReleases releaseSearchService, IProcessDownloadDecisions processDownloadDecisions, Logger logger) { _seriesService = seriesService; - _nzbSearchService = nzbSearchService; + _releaseSearchService = releaseSearchService; _processDownloadDecisions = processDownloadDecisions; _logger = logger; } @@ -39,7 +39,7 @@ namespace NzbDrone.Core.IndexerSearch continue; } - var decisions = _nzbSearchService.SeasonSearch(message.SeriesId, season.SeasonNumber, false, true, message.Trigger == CommandTrigger.Manual, false); + var decisions = _releaseSearchService.SeasonSearch(message.SeriesId, season.SeasonNumber, false, true, message.Trigger == CommandTrigger.Manual, false); downloadedCount += _processDownloadDecisions.ProcessDecisions(decisions).Grabbed.Count; } diff --git a/src/Sonarr.Api.V3/Indexers/ReleaseModule.cs b/src/Sonarr.Api.V3/Indexers/ReleaseModule.cs index 74d9c6822..6d4b90ec3 100644 --- a/src/Sonarr.Api.V3/Indexers/ReleaseModule.cs +++ b/src/Sonarr.Api.V3/Indexers/ReleaseModule.cs @@ -23,7 +23,7 @@ namespace Sonarr.Api.V3.Indexers public class ReleaseModule : ReleaseModuleBase { private readonly IFetchAndParseRss _rssFetcherAndParser; - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IMakeDownloadDecision _downloadDecisionMaker; private readonly IPrioritizeDownloadDecision _prioritizeDownloadDecision; private readonly IDownloadService _downloadService; @@ -35,7 +35,7 @@ namespace Sonarr.Api.V3.Indexers private readonly ICached _remoteEpisodeCache; public ReleaseModule(IFetchAndParseRss rssFetcherAndParser, - ISearchForNzb nzbSearchService, + ISearchForReleases releaseSearchService, IMakeDownloadDecision downloadDecisionMaker, IPrioritizeDownloadDecision prioritizeDownloadDecision, IDownloadService downloadService, @@ -49,7 +49,7 @@ namespace Sonarr.Api.V3.Indexers base(languageProfileService, qualityProfileService) { _rssFetcherAndParser = rssFetcherAndParser; - _nzbSearchService = nzbSearchService; + _releaseSearchService = releaseSearchService; _downloadDecisionMaker = downloadDecisionMaker; _prioritizeDownloadDecision = prioritizeDownloadDecision; _downloadService = downloadService; @@ -156,7 +156,7 @@ namespace Sonarr.Api.V3.Indexers { try { - var decisions = _nzbSearchService.EpisodeSearch(episodeId, true, true); + var decisions = _releaseSearchService.EpisodeSearch(episodeId, true, true); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions); return MapDecisions(prioritizedDecisions); @@ -176,7 +176,7 @@ namespace Sonarr.Api.V3.Indexers { try { - var decisions = _nzbSearchService.SeasonSearch(seriesId, seasonNumber, false, false, true, true); + var decisions = _releaseSearchService.SeasonSearch(seriesId, seasonNumber, false, false, true, true); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions); return MapDecisions(prioritizedDecisions);