Fixed: Fetch blacklist by Movie instead of all

Fixes #5066
This commit is contained in:
Qstick
2020-09-27 23:08:20 -04:00
parent a1e69c3c2b
commit aef8a8fd04
9 changed files with 132 additions and 21 deletions

View File

@@ -9,7 +9,7 @@ namespace NzbDrone.Core.Blacklisting
{
List<Blacklist> BlacklistedByTitle(int movieId, string sourceTitle);
List<Blacklist> BlacklistedByTorrentInfoHash(int movieId, string torrentInfoHash);
List<Blacklist> BlacklistedByMovies(List<int> movieIds);
List<Blacklist> BlacklistedByMovie(int movieId);
void DeleteForMovies(List<int> movieIds);
}
@@ -30,9 +30,9 @@ namespace NzbDrone.Core.Blacklisting
return Query(x => x.MovieId == movieId && x.TorrentInfoHash.Contains(torrentInfoHash));
}
public List<Blacklist> BlacklistedByMovies(List<int> movieIds)
public List<Blacklist> BlacklistedByMovie(int movieId)
{
return Query(x => movieIds.Contains(x.MovieId));
return Query(x => x.MovieId == movieId);
}
public void DeleteForMovies(List<int> movieIds)

View File

@@ -16,6 +16,7 @@ namespace NzbDrone.Core.Blacklisting
{
bool Blacklisted(int movieId, ReleaseInfo release);
PagingSpec<Blacklist> Paged(PagingSpec<Blacklist> pagingSpec);
List<Blacklist> GetByMovieId(int movieId);
void Delete(int id);
}
@@ -65,6 +66,11 @@ namespace NzbDrone.Core.Blacklisting
return _blacklistRepository.GetPaged(pagingSpec);
}
public List<Blacklist> GetByMovieId(int movieId)
{
return _blacklistRepository.BlacklistedByMovie(movieId);
}
public void Delete(int id)
{
_blacklistRepository.Delete(id);

View File

@@ -107,18 +107,19 @@ namespace NzbDrone.Core.CustomFormats
public List<CustomFormat> ParseCustomFormat(Blacklist blacklist)
{
var movie = _movieService.GetMovie(blacklist.MovieId);
var parsed = _parsingService.ParseMovieInfo(blacklist.SourceTitle, null);
var info = new ParsedMovieInfo
{
MovieTitle = blacklist.Movie.Title,
MovieTitle = movie.Title,
SimpleReleaseTitle = parsed?.SimpleReleaseTitle ?? blacklist.SourceTitle.SimplifyReleaseTitle(),
Quality = blacklist.Quality,
Languages = blacklist.Languages,
ReleaseGroup = parsed?.ReleaseGroup,
Edition = parsed?.Edition,
Year = blacklist.Movie.Year,
ImdbId = blacklist.Movie.ImdbId,
Year = movie.Year,
ImdbId = movie.ImdbId,
ExtraInfo = new Dictionary<string, object>
{
{ "IndexerFlags", blacklist.IndexerFlags },