Backup_Repos/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2026-01-19 05:53:51 +01:00
Code Issues Projects Releases Wiki Activity

Fixed: NetImport Tries to Add Existing Movies

Browse source 
Fixes #4170
This commit is contained in:
Qstick 2020-06-20 01:28:58 -04:00
parent e3bb4d9b59
commit 62173c5258
2 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/NzbDrone.Core/Movies/MovieService.cs
View file

@ -442,20 +442,23 @@ public bool MovieExists(Movie movie)
}
}
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;
}
}
}

48
src/NzbDrone.Core/NetImport/NetImportSearchService.cs
View file

@ -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 @@ public void Execute(NetImportSyncCommand message)
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.Info($"{mapped.Title} ({mapped.TitleSlug}) will not be added since it was found on the exclusions list");
_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
{
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);
}