Revert "Revert "Revert "Use async api calls for Refresh and NetImportSync"""

This reverts commit 0080e6b685.

src/NzbDrone.Core.Test/MovieTests/RefreshMovieServiceFixture.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
@@ -33,15 +32,15 @@ namespace NzbDrone.Core.Test.MovieTests
                   .Returns(_movie);
 
             Mocker.GetMock<IProvideMovieInfo>()
-                  .Setup(s => s.GetMovieInfoAsync(It.IsAny<int>()))
-                .ThrowsAsync(new MovieNotFoundException(1));
+                  .Setup(s => s.GetMovieInfo(It.IsAny<int>()))
+                  .Callback<int>((i) => { throw new MovieNotFoundException(i); });
         }
 
         private void GivenNewMovieInfo(Movie movie)
         {
             Mocker.GetMock<IProvideMovieInfo>()
-                .Setup(s => s.GetMovieInfoAsync(_movie.TmdbId))
-                .ReturnsAsync(new Tuple<Movie, List<Credit>>(movie, new List<Credit>()));
+                  .Setup(s => s.GetMovieInfo(_movie.TmdbId))
+                  .Returns(new Tuple<Movie, List<Credit>>(movie, new List<Credit>()));
         }
 
         [Test]

src/NzbDrone.Core.Test/NetImport/NetImportSearchServiceFixture.cs

@@ -68,8 +68,8 @@ namespace NzbDrone.Core.Test.NetImport
                   .Returns(false);
 
             Mocker.GetMock<ISearchForNewMovie>()
-                  .Setup(v => v.MapMovieToTmdbMovieAsync(It.IsAny<Movie>()))
-                  .ReturnsAsync((Movie movie) => movie);
+                  .Setup(v => v.MapMovieToTmdbMovie(It.IsAny<Movie>()))
+                  .Returns((Movie movie) => movie);
 
             Mocker.GetMock<IMovieService>()
                   .Setup(v => v.MovieExists(It.IsAny<Movie>()))

src/NzbDrone.Core/Movies/RefreshMovieService.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation.Extensions;
@@ -53,7 +52,7 @@ namespace NzbDrone.Core.Movies
             _logger = logger;
         }
 
-        private void RefreshMovieInfo(Movie movie, Task<Tuple<Movie, List<Credit>>> dataTask)
+        private void RefreshMovieInfo(Movie movie)
         {
             _logger.ProgressInfo("Updating Info for {0}", movie.Title);
 
@@ -62,7 +61,7 @@ namespace NzbDrone.Core.Movies
 
             try
             {
-                var tuple = dataTask.GetAwaiter().GetResult();
+                var tuple = _movieInfo.GetMovieInfo(movie.TmdbId);
                 movieInfo = tuple.Item1;
                 credits = tuple.Item2;
             }
@@ -173,11 +172,10 @@ namespace NzbDrone.Core.Movies
             if (message.MovieId.HasValue)
             {
                 var movie = _movieService.GetMovie(message.MovieId.Value);
-                var movieData = _movieInfo.GetMovieInfoAsync(movie.TmdbId);
 
                 try
                 {
-                    RefreshMovieInfo(movie, movieData);
+                    RefreshMovieInfo(movie);
                     RescanMovie(movie, isNew, trigger);
                 }
                 catch (MovieNotFoundException)
@@ -202,32 +200,13 @@ namespace NzbDrone.Core.Movies
                     updatedTMDBMovies = _movieInfo.GetChangedMovies(message.LastStartTime.Value);
                 }
 
-                var toRefresh = allMovie
-                    .Where(movie => (updatedTMDBMovies.Count == 0 && _checkIfMovieShouldBeRefreshed.ShouldRefresh(movie)) ||
-                           updatedTMDBMovies.Contains(movie.TmdbId) ||
-                           message.Trigger == CommandTrigger.Manual)
-                    .ToDictionary(x => _movieInfo.GetMovieInfoAsync(x.TmdbId), x => x);
-
-                var tasks = toRefresh.Keys.ToList();
-
-                var skipped = allMovie.Except(toRefresh.Values);
-
-                foreach (var movie in skipped)
+                foreach (var movie in allMovie)
                 {
-                    _logger.Info("Skipping refresh of movie: {0}", movie.Title);
-                    RescanMovie(movie, false, trigger);
-                }
-
-                while (tasks.Count > 0)
+                    if ((updatedTMDBMovies.Count == 0 && _checkIfMovieShouldBeRefreshed.ShouldRefresh(movie)) || updatedTMDBMovies.Contains(movie.TmdbId) || message.Trigger == CommandTrigger.Manual)
                     {
-                    var finishedTask = Task.WhenAny(tasks).GetAwaiter().GetResult();
-                    tasks.Remove(finishedTask);
-
-                    var movie = toRefresh[finishedTask];
-
                         try
                         {
-                        RefreshMovieInfo(movie, finishedTask);
+                            RefreshMovieInfo(movie);
                         }
                         catch (MovieNotFoundException)
                         {
@@ -241,6 +220,12 @@ namespace NzbDrone.Core.Movies
 
                         RescanMovie(movie, false, trigger);
                     }
+                    else
+                    {
+                        _logger.Info("Skipping refresh of movie: {0}", movie.Title);
+                        RescanMovie(movie, false, trigger);
+                    }
+                }
             }
         }
     }

src/NzbDrone.Core/NetImport/NetImportSearchService.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
@@ -122,17 +121,12 @@ namespace NzbDrone.Core.NetImport
                 _logger.Info($"Found {listedMovies.Count()} movies on your auto enabled lists not in your library");
             }
 
-            var tasks = listedMovies.Select(x => _movieSearch.MapMovieToTmdbMovieAsync(x)).ToList();
-
             var importExclusions = new List<string>();
             var moviesToAdd = new List<Movie>();
 
-            while (tasks.Count > 0)
+            foreach (var movie in listedMovies)
             {
-                var finishedTask = Task.WhenAny(tasks).GetAwaiter().GetResult();
-                tasks.Remove(finishedTask);
-
-                var mapped = finishedTask.GetAwaiter().GetResult();
+                var mapped = _movieSearch.MapMovieToTmdbMovie(movie);
 
                 if (mapped != null && mapped.TmdbId > 0)
                 {