github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 04:59:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename NzbSearchService to ReleaseSearchService

Browse source 
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
Qstick 2022-09-26 14:25:46 -05:00
commit e6fb6b5033
5 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Lidarr.Api.V1/Indexers/ReleaseController.cs
View file

@ -26,7 +26,7 @@ namespace Lidarr.Api.V1.Indexers
private readonly IAlbumService _albumService; private readonly IAlbumService _albumService;
private readonly IArtistService _artistService; private readonly IArtistService _artistService;
private readonly IFetchAndParseRss _rssFetcherAndParser; private readonly IFetchAndParseRss _rssFetcherAndParser;
private readonly ISearchForNzb _nzbSearchService; private readonly ISearchForReleases _releaseSearchService;
private readonly IMakeDownloadDecision _downloadDecisionMaker; private readonly IMakeDownloadDecision _downloadDecisionMaker;
private readonly IPrioritizeDownloadDecision _prioritizeDownloadDecision; private readonly IPrioritizeDownloadDecision _prioritizeDownloadDecision;
private readonly IParsingService _parsingService; private readonly IParsingService _parsingService;
@ -38,7 +38,7 @@ namespace Lidarr.Api.V1.Indexers
public ReleaseController(IAlbumService albumService, public ReleaseController(IAlbumService albumService,
IArtistService artistService, IArtistService artistService,
IFetchAndParseRss rssFetcherAndParser, IFetchAndParseRss rssFetcherAndParser,
ISearchForNzb nzbSearchService, ISearchForReleases nzbSearchService,
IMakeDownloadDecision downloadDecisionMaker, IMakeDownloadDecision downloadDecisionMaker,
IPrioritizeDownloadDecision prioritizeDownloadDecision, IPrioritizeDownloadDecision prioritizeDownloadDecision,
IParsingService parsingService, IParsingService parsingService,
@ -51,7 +51,7 @@ namespace Lidarr.Api.V1.Indexers
_albumService = albumService; _albumService = albumService;
_artistService = artistService; _artistService = artistService;
_rssFetcherAndParser = rssFetcherAndParser; _rssFetcherAndParser = rssFetcherAndParser;
_nzbSearchService = nzbSearchService; _releaseSearchService = nzbSearchService;
_downloadDecisionMaker = downloadDecisionMaker; _downloadDecisionMaker = downloadDecisionMaker;
_prioritizeDownloadDecision = prioritizeDownloadDecision; _prioritizeDownloadDecision = prioritizeDownloadDecision;
_parsingService = parsingService; _parsingService = parsingService;
@ -157,7 +157,7 @@ namespace Lidarr.Api.V1.Indexers
{ {
try try
{ {
var decisions = _nzbSearchService.AlbumSearch(albumId, true, true, true); var decisions = _releaseSearchService.AlbumSearch(albumId, true, true, true);
var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions);
return MapDecisions(prioritizedDecisions); return MapDecisions(prioritizedDecisions);
@ -173,7 +173,7 @@ namespace Lidarr.Api.V1.Indexers
{ {
try try
{ {
var decisions = _nzbSearchService.ArtistSearch(artistId, false, true, true); var decisions = _releaseSearchService.ArtistSearch(artistId, false, true, true);
var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions);
return MapDecisions(prioritizedDecisions); return MapDecisions(prioritizedDecisions);

4
src/NzbDrone.Core.Test/IndexerSearchTests/ArtistSearchServiceFixture.cs
View file

@ -25,7 +25,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
.Setup(s => s.GetArtist(It.IsAny<int>())) .Setup(s => s.GetArtist(It.IsAny<int>()))
.Returns(_artist); .Returns(_artist);
Mocker.GetMock<ISearchForNzb>() Mocker.GetMock<ISearchForReleases>()
.Setup(s => s.ArtistSearch(_artist.Id, false, true, false)) .Setup(s => s.ArtistSearch(_artist.Id, false, true, false))
.Returns(new List<DownloadDecision>()); .Returns(new List<DownloadDecision>());
@ -45,7 +45,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
Subject.Execute(new ArtistSearchCommand { ArtistId = _artist.Id, Trigger = CommandTrigger.Manual }); Subject.Execute(new ArtistSearchCommand { ArtistId = _artist.Id, Trigger = CommandTrigger.Manual });
Mocker.GetMock<ISearchForNzb>() Mocker.GetMock<ISearchForReleases>()
.Verify(v => v.ArtistSearch(_artist.Id, false, true, false), .Verify(v => v.ArtistSearch(_artist.Id, false, true, false),
Times.Exactly(_artist.Albums.Value.Count(s => s.Monitored))); Times.Exactly(_artist.Albums.Value.Count(s => s.Monitored)));
} }

10
src/NzbDrone.Core/IndexerSearch/AlbumSearchService.cs
View file

@ -17,21 +17,21 @@ namespace NzbDrone.Core.IndexerSearch
IExecute<MissingAlbumSearchCommand>, IExecute<MissingAlbumSearchCommand>,
IExecute<CutoffUnmetAlbumSearchCommand> IExecute<CutoffUnmetAlbumSearchCommand>
{ {
private readonly ISearchForNzb _nzbSearchService; private readonly ISearchForReleases _releaseSearchService;
private readonly IAlbumService _albumService; private readonly IAlbumService _albumService;
private readonly IAlbumCutoffService _albumCutoffService; private readonly IAlbumCutoffService _albumCutoffService;
private readonly IQueueService _queueService; private readonly IQueueService _queueService;
private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly IProcessDownloadDecisions _processDownloadDecisions;
private readonly Logger _logger; private readonly Logger _logger;
public AlbumSearchService(ISearchForNzb nzbSearchService, public AlbumSearchService(ISearchForReleases nzbSearchService,
IAlbumService albumService, IAlbumService albumService,
IAlbumCutoffService albumCutoffService, IAlbumCutoffService albumCutoffService,
IQueueService queueService, IQueueService queueService,
IProcessDownloadDecisions processDownloadDecisions, IProcessDownloadDecisions processDownloadDecisions,
Logger logger) Logger logger)
{ {
_nzbSearchService = nzbSearchService; _releaseSearchService = nzbSearchService;
_albumService = albumService; _albumService = albumService;
_albumCutoffService = albumCutoffService; _albumCutoffService = albumCutoffService;
_queueService = queueService; _queueService = queueService;
@ -47,7 +47,7 @@ namespace NzbDrone.Core.IndexerSearch
foreach (var album in albums) foreach (var album in albums)
{ {
List<DownloadDecision> decisions; List<DownloadDecision> decisions;
decisions = _nzbSearchService.AlbumSearch(album.Id, false, userInvokedSearch, false); decisions = _releaseSearchService.AlbumSearch(album.Id, false, userInvokedSearch, false);
var processed = _processDownloadDecisions.ProcessDecisions(decisions); var processed = _processDownloadDecisions.ProcessDecisions(decisions);
downloadedCount += processed.Grabbed.Count; downloadedCount += processed.Grabbed.Count;
@ -61,7 +61,7 @@ namespace NzbDrone.Core.IndexerSearch
foreach (var albumId in message.AlbumIds) foreach (var albumId in message.AlbumIds)
{ {
var decisions = 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); var processed = _processDownloadDecisions.ProcessDecisions(decisions);
_logger.ProgressInfo("Album search completed. {0} reports downloaded.", processed.Grabbed.Count); _logger.ProgressInfo("Album search completed. {0} reports downloaded.", processed.Grabbed.Count);

8
src/NzbDrone.Core/IndexerSearch/ArtistSearchService.cs
View file

@ -7,22 +7,22 @@ namespace NzbDrone.Core.IndexerSearch
{ {
public class ArtistSearchService : IExecute<ArtistSearchCommand> public class ArtistSearchService : IExecute<ArtistSearchCommand>
{ {
private readonly ISearchForNzb _nzbSearchService; private readonly ISearchForReleases _releaseSearchService;
private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly IProcessDownloadDecisions _processDownloadDecisions;
private readonly Logger _logger; private readonly Logger _logger;
public ArtistSearchService(ISearchForNzb nzbSearchService, public ArtistSearchService(ISearchForReleases nzbSearchService,
IProcessDownloadDecisions processDownloadDecisions, IProcessDownloadDecisions processDownloadDecisions,
Logger logger) Logger logger)
{ {
_nzbSearchService = nzbSearchService; _releaseSearchService = nzbSearchService;
_processDownloadDecisions = processDownloadDecisions; _processDownloadDecisions = processDownloadDecisions;
_logger = logger; _logger = logger;
} }
public void Execute(ArtistSearchCommand message) 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); var processed = _processDownloadDecisions.ProcessDecisions(decisions);
_logger.ProgressInfo("Artist search completed. {0} reports downloaded.", processed.Grabbed.Count); _logger.ProgressInfo("Artist search completed. {0} reports downloaded.", processed.Grabbed.Count);

6
src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs → src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs
View file

@ -14,13 +14,13 @@ using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.IndexerSearch namespace NzbDrone.Core.IndexerSearch
{ {
public interface ISearchForNzb public interface ISearchForReleases
{ {
List<DownloadDecision> AlbumSearch(int albumId, bool missingOnly, bool userInvokedSearch, bool interactiveSearch); List<DownloadDecision> AlbumSearch(int albumId, bool missingOnly, bool userInvokedSearch, bool interactiveSearch);
List<DownloadDecision> ArtistSearch(int artistId, bool missingOnly, bool userInvokedSearch, bool interactiveSearch); List<DownloadDecision> ArtistSearch(int artistId, bool missingOnly, bool userInvokedSearch, bool interactiveSearch);
} }
public class NzbSearchService : ISearchForNzb public class ReleaseSearchService : ISearchForReleases
{ {
private readonly IIndexerFactory _indexerFactory; private readonly IIndexerFactory _indexerFactory;
private readonly IAlbumService _albumService; private readonly IAlbumService _albumService;
@ -28,7 +28,7 @@ namespace NzbDrone.Core.IndexerSearch
private readonly IMakeDownloadDecision _makeDownloadDecision; private readonly IMakeDownloadDecision _makeDownloadDecision;
private readonly Logger _logger; private readonly Logger _logger;
public NzbSearchService(IIndexerFactory indexerFactory, public ReleaseSearchService(IIndexerFactory indexerFactory,
IAlbumService albumService, IAlbumService albumService,
IArtistService artistService, IArtistService artistService,
IMakeDownloadDecision makeDownloadDecision, IMakeDownloadDecision makeDownloadDecision,