mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Don't die when adding existing exclusions

This commit is contained in:
Bogdan 2023-10-15 22:10:27 +03:00
parent 3a9b276c43
commit 9ef031bd9e
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/NzbDrone.Core/ImportLists/ImportExclusions/ImportExclusionsRepository.cs
View File

@ -1,4 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Dapper;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Messaging.Events;
@ -8,6 +10,7 @@ namespace NzbDrone.Core.ImportLists.ImportExclusions
{
bool IsMovieExcluded(int tmdbid);
ImportExclusion GetByTmdbid(int tmdbid);
List<int> AllExcludedTmdbIds();
}
public class ImportExclusionsRepository : BasicRepository<ImportExclusion>, IImportExclusionsRepository
@ -26,5 +29,12 @@ namespace NzbDrone.Core.ImportLists.ImportExclusions
{
return Query(x => x.TmdbId == tmdbid).First();
}
public List<int> AllExcludedTmdbIds()
{
using var conn = _database.OpenConnection();
return conn.Query<int>("SELECT \"TmdbId\" FROM \"ImportExclusions\"").ToList();
}
}
}

16
src/NzbDrone.Core/ImportLists/ImportExclusions/ImportExclusionsService.cs
View File

@ -41,7 +41,7 @@ namespace NzbDrone.Core.ImportLists.ImportExclusions
public List<ImportExclusion> AddExclusions(List<ImportExclusion> exclusions)
{
_exclusionRepository.InsertMany(exclusions);
_exclusionRepository.InsertMany(DeDupeExclusions(exclusions));
return exclusions;
}
@ -76,8 +76,20 @@ namespace NzbDrone.Core.ImportLists.ImportExclusions
if (message.AddExclusion)
{
_logger.Debug("Adding {0} Deleted Movies to Import Exclusions", message.Movies.Count);
_exclusionRepository.InsertMany(message.Movies.Select(m => new ImportExclusion { TmdbId = m.TmdbId, MovieTitle = m.Title, MovieYear = m.Year }).ToList());
var exclusions = message.Movies.Select(m => new ImportExclusion { TmdbId = m.TmdbId, MovieTitle = m.Title, MovieYear = m.Year }).ToList();
_exclusionRepository.InsertMany(DeDupeExclusions(exclusions));
}
}
private List<ImportExclusion> DeDupeExclusions(List<ImportExclusion> exclusions)
{
var existingExclusions = _exclusionRepository.AllExcludedTmdbIds();
return exclusions
.DistinctBy(x => x.TmdbId)
.Where(x => !existingExclusions.Contains(x.TmdbId))
.ToList();
}
}
}