From e6fb6b5033632fd93e2df8e202f4cc9fcc510dd1 Mon Sep 17 00:00:00 2001 From: Qstick Date: Mon, 26 Sep 2022 14:25:46 -0500 Subject: [PATCH] Rename NzbSearchService to ReleaseSearchService Co-Authored-By: Mark McDowall --- src/Lidarr.Api.V1/Indexers/ReleaseController.cs | 10 +++++----- .../IndexerSearchTests/ArtistSearchServiceFixture.cs | 4 ++-- src/NzbDrone.Core/IndexerSearch/AlbumSearchService.cs | 10 +++++----- src/NzbDrone.Core/IndexerSearch/ArtistSearchService.cs | 8 ++++---- .../{NzbSearchService.cs => ReleaseSearchService.cs} | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) rename src/NzbDrone.Core/IndexerSearch/{NzbSearchService.cs => ReleaseSearchService.cs} (97%) diff --git a/src/Lidarr.Api.V1/Indexers/ReleaseController.cs b/src/Lidarr.Api.V1/Indexers/ReleaseController.cs index fd0ca6831..0a6428b08 100644 --- a/src/Lidarr.Api.V1/Indexers/ReleaseController.cs +++ b/src/Lidarr.Api.V1/Indexers/ReleaseController.cs @@ -26,7 +26,7 @@ namespace Lidarr.Api.V1.Indexers private readonly IAlbumService _albumService; private readonly IArtistService _artistService; private readonly IFetchAndParseRss _rssFetcherAndParser; - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IMakeDownloadDecision _downloadDecisionMaker; private readonly IPrioritizeDownloadDecision _prioritizeDownloadDecision; private readonly IParsingService _parsingService; @@ -38,7 +38,7 @@ namespace Lidarr.Api.V1.Indexers public ReleaseController(IAlbumService albumService, IArtistService artistService, IFetchAndParseRss rssFetcherAndParser, - ISearchForNzb nzbSearchService, + ISearchForReleases nzbSearchService, IMakeDownloadDecision downloadDecisionMaker, IPrioritizeDownloadDecision prioritizeDownloadDecision, IParsingService parsingService, @@ -51,7 +51,7 @@ namespace Lidarr.Api.V1.Indexers _albumService = albumService; _artistService = artistService; _rssFetcherAndParser = rssFetcherAndParser; - _nzbSearchService = nzbSearchService; + _releaseSearchService = nzbSearchService; _downloadDecisionMaker = downloadDecisionMaker; _prioritizeDownloadDecision = prioritizeDownloadDecision; _parsingService = parsingService; @@ -157,7 +157,7 @@ namespace Lidarr.Api.V1.Indexers { try { - var decisions = _nzbSearchService.AlbumSearch(albumId, true, true, true); + var decisions = _releaseSearchService.AlbumSearch(albumId, true, true, true); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions); return MapDecisions(prioritizedDecisions); @@ -173,7 +173,7 @@ namespace Lidarr.Api.V1.Indexers { try { - var decisions = _nzbSearchService.ArtistSearch(artistId, false, true, true); + var decisions = _releaseSearchService.ArtistSearch(artistId, false, true, true); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions); return MapDecisions(prioritizedDecisions); diff --git a/src/NzbDrone.Core.Test/IndexerSearchTests/ArtistSearchServiceFixture.cs b/src/NzbDrone.Core.Test/IndexerSearchTests/ArtistSearchServiceFixture.cs index bcad5015a..edbb71f42 100644 --- a/src/NzbDrone.Core.Test/IndexerSearchTests/ArtistSearchServiceFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerSearchTests/ArtistSearchServiceFixture.cs @@ -25,7 +25,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests .Setup(s => s.GetArtist(It.IsAny())) .Returns(_artist); - Mocker.GetMock() + Mocker.GetMock() .Setup(s => s.ArtistSearch(_artist.Id, false, true, false)) .Returns(new List()); @@ -45,7 +45,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests Subject.Execute(new ArtistSearchCommand { ArtistId = _artist.Id, Trigger = CommandTrigger.Manual }); - Mocker.GetMock() + Mocker.GetMock() .Verify(v => v.ArtistSearch(_artist.Id, false, true, false), Times.Exactly(_artist.Albums.Value.Count(s => s.Monitored))); } diff --git a/src/NzbDrone.Core/IndexerSearch/AlbumSearchService.cs b/src/NzbDrone.Core/IndexerSearch/AlbumSearchService.cs index 34ee40e29..498feb5b0 100644 --- a/src/NzbDrone.Core/IndexerSearch/AlbumSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/AlbumSearchService.cs @@ -17,21 +17,21 @@ namespace NzbDrone.Core.IndexerSearch IExecute, IExecute { - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IAlbumService _albumService; private readonly IAlbumCutoffService _albumCutoffService; private readonly IQueueService _queueService; private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly Logger _logger; - public AlbumSearchService(ISearchForNzb nzbSearchService, + public AlbumSearchService(ISearchForReleases nzbSearchService, IAlbumService albumService, IAlbumCutoffService albumCutoffService, IQueueService queueService, IProcessDownloadDecisions processDownloadDecisions, Logger logger) { - _nzbSearchService = nzbSearchService; + _releaseSearchService = nzbSearchService; _albumService = albumService; _albumCutoffService = albumCutoffService; _queueService = queueService; @@ -47,7 +47,7 @@ namespace NzbDrone.Core.IndexerSearch foreach (var album in albums) { List decisions; - decisions = _nzbSearchService.AlbumSearch(album.Id, false, userInvokedSearch, false); + decisions = _releaseSearchService.AlbumSearch(album.Id, false, userInvokedSearch, false); var processed = _processDownloadDecisions.ProcessDecisions(decisions); downloadedCount += processed.Grabbed.Count; @@ -61,7 +61,7 @@ namespace NzbDrone.Core.IndexerSearch foreach (var albumId in message.AlbumIds) { var decisions = - _nzbSearchService.AlbumSearch(albumId, false, message.Trigger == CommandTrigger.Manual, false); + _releaseSearchService.AlbumSearch(albumId, false, message.Trigger == CommandTrigger.Manual, false); var processed = _processDownloadDecisions.ProcessDecisions(decisions); _logger.ProgressInfo("Album search completed. {0} reports downloaded.", processed.Grabbed.Count); diff --git a/src/NzbDrone.Core/IndexerSearch/ArtistSearchService.cs b/src/NzbDrone.Core/IndexerSearch/ArtistSearchService.cs index 2e3cc5ccb..c4cb6a5ec 100644 --- a/src/NzbDrone.Core/IndexerSearch/ArtistSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/ArtistSearchService.cs @@ -7,22 +7,22 @@ namespace NzbDrone.Core.IndexerSearch { public class ArtistSearchService : IExecute { - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly Logger _logger; - public ArtistSearchService(ISearchForNzb nzbSearchService, + public ArtistSearchService(ISearchForReleases nzbSearchService, IProcessDownloadDecisions processDownloadDecisions, Logger logger) { - _nzbSearchService = nzbSearchService; + _releaseSearchService = nzbSearchService; _processDownloadDecisions = processDownloadDecisions; _logger = logger; } public void Execute(ArtistSearchCommand message) { - var decisions = _nzbSearchService.ArtistSearch(message.ArtistId, false, message.Trigger == CommandTrigger.Manual, false); + var decisions = _releaseSearchService.ArtistSearch(message.ArtistId, false, message.Trigger == CommandTrigger.Manual, false); var processed = _processDownloadDecisions.ProcessDecisions(decisions); _logger.ProgressInfo("Artist 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 97% rename from src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs rename to src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs index a3c3644af..7b52bad32 100644 --- a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs @@ -14,13 +14,13 @@ using NzbDrone.Core.Parser.Model; namespace NzbDrone.Core.IndexerSearch { - public interface ISearchForNzb + public interface ISearchForReleases { List AlbumSearch(int albumId, bool missingOnly, bool userInvokedSearch, bool interactiveSearch); List ArtistSearch(int artistId, bool missingOnly, bool userInvokedSearch, bool interactiveSearch); } - public class NzbSearchService : ISearchForNzb + public class ReleaseSearchService : ISearchForReleases { private readonly IIndexerFactory _indexerFactory; private readonly IAlbumService _albumService; @@ -28,7 +28,7 @@ namespace NzbDrone.Core.IndexerSearch private readonly IMakeDownloadDecision _makeDownloadDecision; private readonly Logger _logger; - public NzbSearchService(IIndexerFactory indexerFactory, + public ReleaseSearchService(IIndexerFactory indexerFactory, IAlbumService albumService, IArtistService artistService, IMakeDownloadDecision makeDownloadDecision,