New: Movie search will look for movies that haven't been searched recently first

src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using NLog;
 using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Core.Datastore;
@@ -38,24 +39,13 @@ namespace NzbDrone.Core.IndexerSearch
 
         public void Execute(MoviesSearchCommand message)
         {
-            var downloadedCount = 0;
-            foreach (var movieId in message.MovieIds)
-            {
-                var movie = _movieService.GetMovie(movieId);
-                var userInvokedSearch = message.Trigger == CommandTrigger.Manual;
-
-                if (!movie.Monitored && !userInvokedSearch)
-                {
-                    _logger.Debug("Movie {0} is not monitored, skipping search", movie.Title);
-                    continue;
-                }
+            var userInvokedSearch = message.Trigger == CommandTrigger.Manual;
 
-                var decisions = _releaseSearchService.MovieSearch(movieId, userInvokedSearch, false).GetAwaiter().GetResult();
-                var processDecisions = _processDownloadDecisions.ProcessDecisions(decisions).GetAwaiter().GetResult();
-                downloadedCount += processDecisions.Grabbed.Count;
-            }
+            var movies = _movieService.GetMovies(message.MovieIds)
+                .Where(m => (m.Monitored && m.IsAvailable()) || userInvokedSearch)
+                .ToList();
 
-            _logger.ProgressInfo("Movie search completed. {0} reports downloaded.", downloadedCount);
+            SearchForBulkMovies(movies, userInvokedSearch).GetAwaiter().GetResult();
         }
 
         public void Execute(MissingMoviesSearchCommand message)
@@ -69,12 +59,13 @@ namespace NzbDrone.Core.IndexerSearch
             };
 
             pagingSpec.FilterExpressions.Add(v => v.Monitored == true);
+
             var movies = _movieService.MoviesWithoutFiles(pagingSpec).Records.ToList();
 
             var queue = _queueService.GetQueue().Where(q => q.Movie != null).Select(q => q.Movie.Id);
             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)
@@ -94,34 +85,34 @@ namespace NzbDrone.Core.IndexerSearch
             var queue = _queueService.GetQueue().Where(q => q.Movie != null).Select(q => q.Movie.Id);
             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;
 
-            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;
 
                 try
                 {
-                    decisions = _releaseSearchService.MovieSearch(movieId.Key, userInvokedSearch, false).GetAwaiter().GetResult();
+                    decisions = await _releaseSearchService.MovieSearch(movieId.Key, userInvokedSearch, false);
                 }
                 catch (Exception ex)
                 {
-                    var message = string.Format("Unable to search for missing movie {0}", movieId.Key);
-                    _logger.Error(ex, message);
+                    _logger.Error(ex, "Unable to search for movie: [{0}]", movieId.Key);
                     continue;
                 }
 
-                var processDecisions = _processDownloadDecisions.ProcessDecisions(decisions).GetAwaiter().GetResult();
+                var processDecisions = await _processDownloadDecisions.ProcessDecisions(decisions);
+
                 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);
         }
     }
 }

src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs

@@ -121,7 +121,7 @@ namespace NzbDrone.Core.IndexerSearch
                 _logger.Debug("Setting last search time to: {0}", lastSearchTime);
 
                 criteriaBase.Movie.LastSearchTime = lastSearchTime;
-                _movieService.UpdateMovie(criteriaBase.Movie);
+                _movieService.UpdateLastSearchTime(criteriaBase.Movie);
             }
 
             return _makeDownloadDecision.GetSearchDecision(reports, criteriaBase).ToList();

src/NzbDrone.Core/Movies/MovieService.cs

@@ -41,6 +41,7 @@ namespace NzbDrone.Core.Movies
         Dictionary<int, List<int>> AllMovieTags();
         Movie UpdateMovie(Movie movie);
         List<Movie> UpdateMovie(List<Movie> movie, bool useExistingRelativeFolder);
+        void UpdateLastSearchTime(Movie movie);
         List<int> GetRecommendedTmdbIds();
         bool MoviePathExists(string folder);
         void RemoveAddOptions(Movie movie);
@@ -272,6 +273,11 @@ namespace NzbDrone.Core.Movies
             return movie;
         }
 
+        public void UpdateLastSearchTime(Movie movie)
+        {
+            _movieRepository.SetFields(movie, e => e.LastSearchTime);
+        }
+
         public bool MoviePathExists(string folder)
         {
             return _movieRepository.MoviePathExists(folder);