From 62173c5258f801ea3f0475d57bafd4a95683f4c8 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sat, 20 Jun 2020 01:28:58 -0400
Subject: [PATCH] Fixed: NetImport Tries to Add Existing Movies

Fixes #4170
---
 src/NzbDrone.Core/Movies/MovieService.cs      | 23 +++++----
 .../NetImport/NetImportSearchService.cs       | 48 +++++++++----------
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/NzbDrone.Core/Movies/MovieService.cs b/src/NzbDrone.Core/Movies/MovieService.cs
index f3df98bf1..7f0250afd 100644
--- a/src/NzbDrone.Core/Movies/MovieService.cs
+++ b/src/NzbDrone.Core/Movies/MovieService.cs
@@ -442,20 +442,23 @@ namespace NzbDrone.Core.Movies
                 }
             }
 
-            if (movie.Year > 1850)
+            if (movie.Title.IsNotNullOrWhiteSpace())
             {
-                result = _movieRepository.FindByTitle(movie.Title.CleanSeriesTitle(), movie.Year);
-                if (result != null)
+                if (movie.Year > 1850)
                 {
-                    return true;
+                    result = FindByTitle(movie.Title.CleanSeriesTitle(), movie.Year);
+                    if (result != null)
+                    {
+                        return true;
+                    }
                 }
-            }
-            else
-            {
-                result = _movieRepository.FindByTitle(movie.Title.CleanSeriesTitle());
-                if (result != null)
+                else
                 {
-                    return true;
+                    result = FindByTitle(movie.Title.CleanSeriesTitle());
+                    if (result != null)
+                    {
+                        return true;
+                    }
                 }
             }
 
diff --git a/src/NzbDrone.Core/NetImport/NetImportSearchService.cs b/src/NzbDrone.Core/NetImport/NetImportSearchService.cs
index 706a82d31..d6050a7f0 100644
--- a/src/NzbDrone.Core/NetImport/NetImportSearchService.cs
+++ b/src/NzbDrone.Core/NetImport/NetImportSearchService.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -136,40 +136,40 @@ namespace NzbDrone.Core.NetImport
 
 
             var importExclusions = new List<string>();
+            var moviesToAdd = new List<Movie>();
 
             //var downloadedCount = 0;
             foreach (var movie in listedMovies)
             {
                 var mapped = _movieSearch.MapMovieToTmdbMovie(movie);
-                if (mapped != null && !_exclusionService.IsMovieExcluded(mapped.TmdbId))
+                if (mapped != null && mapped.TmdbId > 0)
                 {
-                    //List<DownloadDecision> decisions;
-                    mapped.AddOptions = new AddMovieOptions {SearchForMovie = true};
-                    _movieService.AddMovie(mapped);
-
-                    //// Search for movie
-                    //try
-                    //{
-                    //    decisions = _nzbSearchService.MovieSearch(mapped.Id, false);
-                    //}
-                    //catch (Exception ex)
-                    //{
-                    //    _logger.Error(ex, $"Unable to search in list for movie {mapped.Id}");
-                    //    continue;
-                    //}
-
-                    //var processed = _processDownloadDecisions.ProcessDecisions(decisions);
-                    //downloadedCount += processed.Grabbed.Count;
-                }
-                else
-                {
-                    if (mapped != null)
+                    if (_exclusionService.IsMovieExcluded(mapped.TmdbId))
+                    {
+                        _logger.Debug($"{mapped.Title} ({mapped.TmdbId}) will not be added since it was found on the exclusions list");
+                    }
+                    else if (_movieService.MovieExists(mapped))
+                    {
+                        _logger.Trace($"{mapped.Title} ({mapped.TmdbId}) will not be added since it exists in Library");
+                    }
+                    else
                     {
-                        _logger.Info($"{mapped.Title} ({mapped.TitleSlug}) will not be added since it was found on the exclusions list");
+                        if (!moviesToAdd.Any(c => c.TmdbId == mapped.TmdbId))
+                        {
+                            mapped.AddOptions = new AddMovieOptions { SearchForMovie = true };
+                            moviesToAdd.Add(mapped);
+                        }
                     }
                 }
             }
 
+            if (moviesToAdd.Any())
+            {
+                _logger.Info($"Adding {moviesToAdd.Count()} movies from your auto enabled lists to library");
+            }
+
+            _movieService.AddMovies(moviesToAdd);
+
             //_logger.ProgressInfo("Movie search completed. {0} reports downloaded.", downloadedCount);
         }