mirror of
https://github.com/Radarr/Radarr.git
synced 2024-10-05 15:47:20 +02:00
New: Movie search will look for movies that haven't been searched recently first
This commit is contained in:
parent
7f11659d95
commit
eab470c67f
@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Common.Instrumentation.Extensions;
|
using NzbDrone.Common.Instrumentation.Extensions;
|
||||||
using NzbDrone.Core.Datastore;
|
using NzbDrone.Core.Datastore;
|
||||||
@ -38,24 +39,13 @@ public MovieSearchService(IMovieService movieService,
|
|||||||
|
|
||||||
public void Execute(MoviesSearchCommand message)
|
public void Execute(MoviesSearchCommand message)
|
||||||
{
|
{
|
||||||
var downloadedCount = 0;
|
var userInvokedSearch = message.Trigger == CommandTrigger.Manual;
|
||||||
foreach (var movieId in message.MovieIds)
|
|
||||||
{
|
|
||||||
var movie = _movieService.GetMovie(movieId);
|
|
||||||
var userInvokedSearch = message.Trigger == CommandTrigger.Manual;
|
|
||||||
|
|
||||||
if (!movie.Monitored && !userInvokedSearch)
|
var movies = _movieService.GetMovies(message.MovieIds)
|
||||||
{
|
.Where(m => (m.Monitored && m.IsAvailable()) || userInvokedSearch)
|
||||||
_logger.Debug("Movie {0} is not monitored, skipping search", movie.Title);
|
.ToList();
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
var decisions = _releaseSearchService.MovieSearch(movieId, userInvokedSearch, false).GetAwaiter().GetResult();
|
SearchForBulkMovies(movies, userInvokedSearch).GetAwaiter().GetResult();
|
||||||
var processDecisions = _processDownloadDecisions.ProcessDecisions(decisions).GetAwaiter().GetResult();
|
|
||||||
downloadedCount += processDecisions.Grabbed.Count;
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.ProgressInfo("Movie search completed. {0} reports downloaded.", downloadedCount);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Execute(MissingMoviesSearchCommand message)
|
public void Execute(MissingMoviesSearchCommand message)
|
||||||
@ -69,12 +59,13 @@ public void Execute(MissingMoviesSearchCommand message)
|
|||||||
};
|
};
|
||||||
|
|
||||||
pagingSpec.FilterExpressions.Add(v => v.Monitored == true);
|
pagingSpec.FilterExpressions.Add(v => v.Monitored == true);
|
||||||
|
|
||||||
var movies = _movieService.MoviesWithoutFiles(pagingSpec).Records.ToList();
|
var movies = _movieService.MoviesWithoutFiles(pagingSpec).Records.ToList();
|
||||||
|
|
||||||
var queue = _queueService.GetQueue().Where(q => q.Movie != null).Select(q => q.Movie.Id);
|
var queue = _queueService.GetQueue().Where(q => q.Movie != null).Select(q => q.Movie.Id);
|
||||||
var missing = movies.Where(e => !queue.Contains(e.Id)).ToList();
|
var missing = movies.Where(e => !queue.Contains(e.Id)).ToList();
|
||||||
|
|
||||||
SearchForMissingMovies(missing, message.Trigger == CommandTrigger.Manual);
|
SearchForBulkMovies(missing, message.Trigger == CommandTrigger.Manual).GetAwaiter().GetResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Execute(CutoffUnmetMoviesSearchCommand message)
|
public void Execute(CutoffUnmetMoviesSearchCommand message)
|
||||||
@ -94,34 +85,34 @@ public void Execute(CutoffUnmetMoviesSearchCommand message)
|
|||||||
var queue = _queueService.GetQueue().Where(q => q.Movie != null).Select(q => q.Movie.Id);
|
var queue = _queueService.GetQueue().Where(q => q.Movie != null).Select(q => q.Movie.Id);
|
||||||
var missing = movies.Where(e => !queue.Contains(e.Id)).ToList();
|
var missing = movies.Where(e => !queue.Contains(e.Id)).ToList();
|
||||||
|
|
||||||
SearchForMissingMovies(missing, message.Trigger == CommandTrigger.Manual);
|
SearchForBulkMovies(missing, message.Trigger == CommandTrigger.Manual).GetAwaiter().GetResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SearchForMissingMovies(List<Movie> movies, bool userInvokedSearch)
|
private async Task SearchForBulkMovies(List<Movie> movies, bool userInvokedSearch)
|
||||||
{
|
{
|
||||||
_logger.ProgressInfo("Performing missing search for {0} movies", movies.Count);
|
_logger.ProgressInfo("Performing search for {0} movies", movies.Count);
|
||||||
var downloadedCount = 0;
|
var downloadedCount = 0;
|
||||||
|
|
||||||
foreach (var movieId in movies.GroupBy(e => e.Id))
|
foreach (var movieId in movies.GroupBy(e => e.Id).OrderBy(g => g.Min(m => m.LastSearchTime ?? DateTime.MinValue)))
|
||||||
{
|
{
|
||||||
List<DownloadDecision> decisions;
|
List<DownloadDecision> decisions;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
decisions = _releaseSearchService.MovieSearch(movieId.Key, userInvokedSearch, false).GetAwaiter().GetResult();
|
decisions = await _releaseSearchService.MovieSearch(movieId.Key, userInvokedSearch, false);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
var message = string.Format("Unable to search for missing movie {0}", movieId.Key);
|
_logger.Error(ex, "Unable to search for movie: [{0}]", movieId.Key);
|
||||||
_logger.Error(ex, message);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var processDecisions = _processDownloadDecisions.ProcessDecisions(decisions).GetAwaiter().GetResult();
|
var processDecisions = await _processDownloadDecisions.ProcessDecisions(decisions);
|
||||||
|
|
||||||
downloadedCount += processDecisions.Grabbed.Count;
|
downloadedCount += processDecisions.Grabbed.Count;
|
||||||
}
|
}
|
||||||
|
|
||||||
_logger.ProgressInfo("Completed missing search for {0} movies. {1} reports downloaded.", movies.Count, downloadedCount);
|
_logger.ProgressInfo("Completed search for {0} movies. {1} reports downloaded.", movies.Count, downloadedCount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -121,7 +121,7 @@ private async Task<List<DownloadDecision>> Dispatch(Func<IIndexer, Task<IList<Re
|
|||||||
_logger.Debug("Setting last search time to: {0}", lastSearchTime);
|
_logger.Debug("Setting last search time to: {0}", lastSearchTime);
|
||||||
|
|
||||||
criteriaBase.Movie.LastSearchTime = lastSearchTime;
|
criteriaBase.Movie.LastSearchTime = lastSearchTime;
|
||||||
_movieService.UpdateMovie(criteriaBase.Movie);
|
_movieService.UpdateLastSearchTime(criteriaBase.Movie);
|
||||||
}
|
}
|
||||||
|
|
||||||
return _makeDownloadDecision.GetSearchDecision(reports, criteriaBase).ToList();
|
return _makeDownloadDecision.GetSearchDecision(reports, criteriaBase).ToList();
|
||||||
|
@ -41,6 +41,7 @@ public interface IMovieService
|
|||||||
Dictionary<int, List<int>> AllMovieTags();
|
Dictionary<int, List<int>> AllMovieTags();
|
||||||
Movie UpdateMovie(Movie movie);
|
Movie UpdateMovie(Movie movie);
|
||||||
List<Movie> UpdateMovie(List<Movie> movie, bool useExistingRelativeFolder);
|
List<Movie> UpdateMovie(List<Movie> movie, bool useExistingRelativeFolder);
|
||||||
|
void UpdateLastSearchTime(Movie movie);
|
||||||
List<int> GetRecommendedTmdbIds();
|
List<int> GetRecommendedTmdbIds();
|
||||||
bool MoviePathExists(string folder);
|
bool MoviePathExists(string folder);
|
||||||
void RemoveAddOptions(Movie movie);
|
void RemoveAddOptions(Movie movie);
|
||||||
@ -272,6 +273,11 @@ public List<Movie> UpdateMovie(List<Movie> movie, bool useExistingRelativeFolder
|
|||||||
return movie;
|
return movie;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void UpdateLastSearchTime(Movie movie)
|
||||||
|
{
|
||||||
|
_movieRepository.SetFields(movie, e => e.LastSearchTime);
|
||||||
|
}
|
||||||
|
|
||||||
public bool MoviePathExists(string folder)
|
public bool MoviePathExists(string folder)
|
||||||
{
|
{
|
||||||
return _movieRepository.MoviePathExists(folder);
|
return _movieRepository.MoviePathExists(folder);
|
||||||
|
Loading…
Reference in New Issue
Block a user