diff --git a/src/NzbDrone.Api/Indexers/ReleaseModule.cs b/src/NzbDrone.Api/Indexers/ReleaseModule.cs index bea267bc0..b00290830 100644 --- a/src/NzbDrone.Api/Indexers/ReleaseModule.cs +++ b/src/NzbDrone.Api/Indexers/ReleaseModule.cs @@ -88,7 +88,7 @@ private List GetMovieReleases(int movieId) { try { - var decisions = _nzbSearchService.MovieSearch(movieId, true); + var decisions = _nzbSearchService.MovieSearch(movieId, true, true); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisionsForMovies(decisions); return MapDecisions(prioritizedDecisions); diff --git a/src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs b/src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs index 42c5d47c8..7936f3531 100644 --- a/src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs @@ -49,7 +49,7 @@ public void Execute(MoviesSearchCommand message) continue; } - var decisions = _nzbSearchService.MovieSearch(movieId, false);//_nzbSearchService.SeasonSearch(message.MovieId, season.SeasonNumber, false, message.Trigger == CommandTrigger.Manual); + var decisions = _nzbSearchService.MovieSearch(movieId, false, false);//_nzbSearchService.SeasonSearch(message.MovieId, season.SeasonNumber, false, message.Trigger == CommandTrigger.Manual); downloadedCount += _processDownloadDecisions.ProcessDecisions(decisions).Grabbed.Count; } @@ -109,7 +109,7 @@ private void SearchForMissingMovies(List movies, bool userInvokedSearch) try { - decisions = _nzbSearchService.MovieSearch(movieId.Key, userInvokedSearch); + decisions = _nzbSearchService.MovieSearch(movieId.Key, userInvokedSearch, false); } catch (Exception ex) { diff --git a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs b/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs index f9358f5c0..a308b6c60 100644 --- a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs @@ -16,8 +16,8 @@ namespace NzbDrone.Core.IndexerSearch { public interface ISearchForNzb { - List MovieSearch(int movieId, bool userInvokedSearch); - List MovieSearch(Movie movie, bool userInvokedSearch); + List MovieSearch(int movieId, bool userInvokedSearch, bool interactiveSearch); + List MovieSearch(Movie movie, bool userInvokedSearch, bool interactiveSearch); } public class NzbSearchService : ISearchForNzb @@ -38,28 +38,28 @@ public NzbSearchService(IIndexerFactory indexerFactory, _logger = logger; } - public List MovieSearch(int movieId, bool userInvokedSearch) + public List MovieSearch(int movieId, bool userInvokedSearch, bool interactiveSearch) { var movie = _movieService.GetMovie(movieId); - return MovieSearch(movie, userInvokedSearch); + return MovieSearch(movie, userInvokedSearch, interactiveSearch); } - public List MovieSearch(Movie movie, bool userInvokedSearch) + public List MovieSearch(Movie movie, bool userInvokedSearch, bool interactiveSearch) { - var searchSpec = Get(movie, userInvokedSearch); + var searchSpec = Get(movie, userInvokedSearch, interactiveSearch); return Dispatch(indexer => indexer.Fetch(searchSpec), searchSpec); } - private TSpec Get(Movie movie, bool userInvokedSearch) where TSpec : SearchCriteriaBase, new() + private TSpec Get(Movie movie, bool userInvokedSearch, bool interactiveSearch) where TSpec : SearchCriteriaBase, new() { var spec = new TSpec() { Movie = movie, - - UserInvokedSearch = userInvokedSearch - }; + UserInvokedSearch = userInvokedSearch, + InteractiveSearch = interactiveSearch + }; return spec; } diff --git a/src/Radarr.Api.V2/Indexers/ReleaseModule.cs b/src/Radarr.Api.V2/Indexers/ReleaseModule.cs index 6d85599b3..9b003fb94 100644 --- a/src/Radarr.Api.V2/Indexers/ReleaseModule.cs +++ b/src/Radarr.Api.V2/Indexers/ReleaseModule.cs @@ -90,7 +90,7 @@ private List GetMovieReleases(int episodeId) { try { - var decisions = _nzbSearchService.MovieSearch(episodeId, true); + var decisions = _nzbSearchService.MovieSearch(episodeId, true, true); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisionsForMovies(decisions); return MapDecisions(prioritizedDecisions);