From 2fe11ca1a9670b2d1e8d21faabf51b93554ee006 Mon Sep 17 00:00:00 2001 From: Qstick Date: Fri, 25 Nov 2022 20:18:28 -0600 Subject: [PATCH] Rename NzbSearchService to ReleaseSearchService Co-Authored-By: Mark McDowall --- .../IndexerSearchTests/ArtistSearchServiceFixture.cs | 4 ++-- src/NzbDrone.Core/IndexerSearch/AuthorSearchService.cs | 8 ++++---- src/NzbDrone.Core/IndexerSearch/BookSearchService.cs | 10 +++++----- .../{NzbSearchService.cs => ReleaseSearchService.cs} | 6 +++--- src/Readarr.Api.V1/Indexers/ReleaseController.cs | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) rename src/NzbDrone.Core/IndexerSearch/{NzbSearchService.cs => ReleaseSearchService.cs} (97%) diff --git a/src/NzbDrone.Core.Test/IndexerSearchTests/ArtistSearchServiceFixture.cs b/src/NzbDrone.Core.Test/IndexerSearchTests/ArtistSearchServiceFixture.cs index 14a8ea802..73f01a6af 100644 --- a/src/NzbDrone.Core.Test/IndexerSearchTests/ArtistSearchServiceFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerSearchTests/ArtistSearchServiceFixture.cs @@ -25,7 +25,7 @@ public void Setup() .Setup(s => s.GetAuthor(It.IsAny())) .Returns(_author); - Mocker.GetMock() + Mocker.GetMock() .Setup(s => s.AuthorSearch(_author.Id, false, true, false)) .Returns(new List()); @@ -45,7 +45,7 @@ public void should_only_include_monitored_books() Subject.Execute(new AuthorSearchCommand { AuthorId = _author.Id, Trigger = CommandTrigger.Manual }); - Mocker.GetMock() + Mocker.GetMock() .Verify(v => v.AuthorSearch(_author.Id, false, true, false), Times.Exactly(_author.Books.Value.Count(s => s.Monitored))); } diff --git a/src/NzbDrone.Core/IndexerSearch/AuthorSearchService.cs b/src/NzbDrone.Core/IndexerSearch/AuthorSearchService.cs index d75f9d0ce..376239d2b 100644 --- a/src/NzbDrone.Core/IndexerSearch/AuthorSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/AuthorSearchService.cs @@ -7,22 +7,22 @@ namespace NzbDrone.Core.IndexerSearch { public class AuthorSearchService : IExecute { - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly Logger _logger; - public AuthorSearchService(ISearchForNzb nzbSearchService, + public AuthorSearchService(ISearchForReleases releaseSearchService, IProcessDownloadDecisions processDownloadDecisions, Logger logger) { - _nzbSearchService = nzbSearchService; + _releaseSearchService = releaseSearchService; _processDownloadDecisions = processDownloadDecisions; _logger = logger; } public void Execute(AuthorSearchCommand message) { - var decisions = _nzbSearchService.AuthorSearch(message.AuthorId, false, message.Trigger == CommandTrigger.Manual, false); + var decisions = _releaseSearchService.AuthorSearch(message.AuthorId, false, message.Trigger == CommandTrigger.Manual, false); var processed = _processDownloadDecisions.ProcessDecisions(decisions); _logger.ProgressInfo("Author search completed. {0} reports downloaded.", processed.Grabbed.Count); diff --git a/src/NzbDrone.Core/IndexerSearch/BookSearchService.cs b/src/NzbDrone.Core/IndexerSearch/BookSearchService.cs index 6dcd8029e..c30a801d7 100644 --- a/src/NzbDrone.Core/IndexerSearch/BookSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/BookSearchService.cs @@ -17,21 +17,21 @@ internal class BookSearchService : IExecute, IExecute, IExecute { - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IBookService _bookService; private readonly IBookCutoffService _bookCutoffService; private readonly IQueueService _queueService; private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly Logger _logger; - public BookSearchService(ISearchForNzb nzbSearchService, + public BookSearchService(ISearchForReleases releaseSearchService, IBookService bookService, IBookCutoffService bookCutoffService, IQueueService queueService, IProcessDownloadDecisions processDownloadDecisions, Logger logger) { - _nzbSearchService = nzbSearchService; + _releaseSearchService = releaseSearchService; _bookService = bookService; _bookCutoffService = bookCutoffService; _queueService = queueService; @@ -47,7 +47,7 @@ private void SearchForMissingBooks(List books, bool userInvokedSearch) foreach (var book in books) { List decisions; - decisions = _nzbSearchService.BookSearch(book.Id, false, userInvokedSearch, false); + decisions = _releaseSearchService.BookSearch(book.Id, false, userInvokedSearch, false); var processed = _processDownloadDecisions.ProcessDecisions(decisions); downloadedCount += processed.Grabbed.Count; @@ -61,7 +61,7 @@ public void Execute(BookSearchCommand message) foreach (var bookId in message.BookIds) { var decisions = - _nzbSearchService.BookSearch(bookId, false, message.Trigger == CommandTrigger.Manual, false); + _releaseSearchService.BookSearch(bookId, false, message.Trigger == CommandTrigger.Manual, false); var processed = _processDownloadDecisions.ProcessDecisions(decisions); _logger.ProgressInfo("Book 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 6087730ca..f851ed0ff 100644 --- a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs @@ -14,13 +14,13 @@ namespace NzbDrone.Core.IndexerSearch { - public interface ISearchForNzb + public interface ISearchForReleases { List BookSearch(int bookId, bool missingOnly, bool userInvokedSearch, bool interactiveSearch); List AuthorSearch(int authorId, bool missingOnly, bool userInvokedSearch, bool interactiveSearch); } - public class NzbSearchService : ISearchForNzb + public class ReleaseSearchService : ISearchForReleases { private readonly IIndexerFactory _indexerFactory; private readonly IBookService _bookService; @@ -28,7 +28,7 @@ public class NzbSearchService : ISearchForNzb private readonly IMakeDownloadDecision _makeDownloadDecision; private readonly Logger _logger; - public NzbSearchService(IIndexerFactory indexerFactory, + public ReleaseSearchService(IIndexerFactory indexerFactory, IBookService bookService, IAuthorService authorService, IMakeDownloadDecision makeDownloadDecision, diff --git a/src/Readarr.Api.V1/Indexers/ReleaseController.cs b/src/Readarr.Api.V1/Indexers/ReleaseController.cs index 0af2e70a6..4e6b9a56d 100644 --- a/src/Readarr.Api.V1/Indexers/ReleaseController.cs +++ b/src/Readarr.Api.V1/Indexers/ReleaseController.cs @@ -24,7 +24,7 @@ namespace Readarr.Api.V1.Indexers public class ReleaseController : ReleaseControllerBase { private readonly IFetchAndParseRss _rssFetcherAndParser; - private readonly ISearchForNzb _nzbSearchService; + private readonly ISearchForReleases _releaseSearchService; private readonly IMakeDownloadDecision _downloadDecisionMaker; private readonly IPrioritizeDownloadDecision _prioritizeDownloadDecision; private readonly IDownloadService _downloadService; @@ -36,7 +36,7 @@ public class ReleaseController : ReleaseControllerBase private readonly ICached _remoteBookCache; public ReleaseController(IFetchAndParseRss rssFetcherAndParser, - ISearchForNzb nzbSearchService, + ISearchForReleases releaseSearchService, IMakeDownloadDecision downloadDecisionMaker, IPrioritizeDownloadDecision prioritizeDownloadDecision, IDownloadService downloadService, @@ -47,7 +47,7 @@ public ReleaseController(IFetchAndParseRss rssFetcherAndParser, Logger logger) { _rssFetcherAndParser = rssFetcherAndParser; - _nzbSearchService = nzbSearchService; + _releaseSearchService = releaseSearchService; _downloadDecisionMaker = downloadDecisionMaker; _prioritizeDownloadDecision = prioritizeDownloadDecision; _downloadService = downloadService; @@ -155,7 +155,7 @@ private List GetBookReleases(int bookId) { try { - var decisions = _nzbSearchService.BookSearch(bookId, true, true, true); + var decisions = _releaseSearchService.BookSearch(bookId, true, true, true); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions); return MapDecisions(prioritizedDecisions); @@ -171,7 +171,7 @@ private List GetAuthorReleases(int authorId) { try { - var decisions = _nzbSearchService.AuthorSearch(authorId, false, true, true); + var decisions = _releaseSearchService.AuthorSearch(authorId, false, true, true); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions); return MapDecisions(prioritizedDecisions);