mirror of
https://github.com/Readarr/Readarr
synced 2025-12-14 20:36:18 +01:00
Rename NzbSearchService to ReleaseSearchService
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
parent
c8ae6b0299
commit
2fe11ca1a9
5 changed files with 19 additions and 19 deletions
|
|
@ -25,7 +25,7 @@ public void Setup()
|
|||
.Setup(s => s.GetAuthor(It.IsAny<int>()))
|
||||
.Returns(_author);
|
||||
|
||||
Mocker.GetMock<ISearchForNzb>()
|
||||
Mocker.GetMock<ISearchForReleases>()
|
||||
.Setup(s => s.AuthorSearch(_author.Id, false, true, false))
|
||||
.Returns(new List<DownloadDecision>());
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ public void should_only_include_monitored_books()
|
|||
|
||||
Subject.Execute(new AuthorSearchCommand { AuthorId = _author.Id, Trigger = CommandTrigger.Manual });
|
||||
|
||||
Mocker.GetMock<ISearchForNzb>()
|
||||
Mocker.GetMock<ISearchForReleases>()
|
||||
.Verify(v => v.AuthorSearch(_author.Id, false, true, false),
|
||||
Times.Exactly(_author.Books.Value.Count(s => s.Monitored)));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,22 +7,22 @@ namespace NzbDrone.Core.IndexerSearch
|
|||
{
|
||||
public class AuthorSearchService : IExecute<AuthorSearchCommand>
|
||||
{
|
||||
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);
|
||||
|
|
|
|||
|
|
@ -17,21 +17,21 @@ internal class BookSearchService : IExecute<BookSearchCommand>,
|
|||
IExecute<MissingBookSearchCommand>,
|
||||
IExecute<CutoffUnmetBookSearchCommand>
|
||||
{
|
||||
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<Book> books, bool userInvokedSearch)
|
|||
foreach (var book in books)
|
||||
{
|
||||
List<DownloadDecision> 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);
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
namespace NzbDrone.Core.IndexerSearch
|
||||
{
|
||||
public interface ISearchForNzb
|
||||
public interface ISearchForReleases
|
||||
{
|
||||
List<DownloadDecision> BookSearch(int bookId, bool missingOnly, bool userInvokedSearch, bool interactiveSearch);
|
||||
List<DownloadDecision> 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,
|
||||
|
|
@ -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<RemoteBook> _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<ReleaseResource> 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<ReleaseResource> 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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue