Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: List Import no longer fails due to duplicates 

Closes #4100
This commit is contained in:
bakerboy448 2020-11-25 18:51:22 -06:00 committed by GitHub
parent a9384e26d8
commit 19ff7bdc30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/NzbDrone.Core/Tv/AddSeriesService.cs
View File

@ -55,8 +55,10 @@ namespace NzbDrone.Core.Tv
public List<Series> AddSeries(List<Series> newSeries, bool ignoreErrors = false) public List<Series> AddSeries(List<Series> newSeries, bool ignoreErrors = false)
{ {
var added = DateTime.UtcNow; var added = DateTime.UtcNow;
var seriesToAdd = new List<Series>(); var seriesToAdd = new List<Series>();
var existingSeries = _seriesService.GetAllSeries();
foreach (var s in newSeries) foreach (var s in newSeries)
{ {
@ -67,6 +69,22 @@ namespace NzbDrone.Core.Tv
var series = AddSkyhookData(s); var series = AddSkyhookData(s);
series = SetPropertiesAndValidate(series); series = SetPropertiesAndValidate(series);
series.Added = added; series.Added = added;
if (existingSeries.Any(f => f.TvdbId == series.TvdbId))
{
_logger.Debug("TVDB ID {0} was not added due to validation failure: Series already exists in database", s.TvdbId);
continue;
}
if (seriesToAdd.Any(f => f.TvdbId == series.TvdbId))
{
_logger.Debug("TVDB ID {0} was not added due to validation failure: Series already exists on list", s.TvdbId);
continue;
}
var duplicateSlug = seriesToAdd.FirstOrDefault(f => f.TitleSlug == series.TitleSlug);
if (duplicateSlug != null)
{
_logger.Debug("TVDB ID {0} was not added due to validation failure: Duplicate Slug {1} used by series {2}", s.TvdbId, s.TitleSlug, duplicateSlug.TvdbId);
continue;
}
seriesToAdd.Add(series); seriesToAdd.Add(series);
} }
catch (ValidationException ex) catch (ValidationException ex)
@ -76,7 +94,7 @@ namespace NzbDrone.Core.Tv
throw; throw;
} }
_logger.Debug("tvdbid {0} was not added due to validation failures. {1}", s.TvdbId, ex.Message); _logger.Debug("TVDB ID {0} was not added due to validation failures. {1}", s.TvdbId, ex.Message);
} }
} }
@ -93,7 +111,7 @@ namespace NzbDrone.Core.Tv
} }
catch (SeriesNotFoundException) catch (SeriesNotFoundException)
{ {
_logger.Error("tvdbid {0} was not found, it may have been removed from TheTVDB. Path: {1}", newSeries.TvdbId, newSeries.Path); _logger.Error("TVDB ID {0} was not found, it may have been removed from TheTVDB. Path: {1}", newSeries.TvdbId, newSeries.Path);
throw new ValidationException(new List<ValidationFailure> throw new ValidationException(new List<ValidationFailure>
{ {