tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-19 21:46:50 -04:00
Code Issues Projects Releases Wiki Activity

store titleSlug in tags for exclusions and always use TMDBID

Browse Source
This commit is contained in:
geogolem
2017-03-05 02:02:24 -05:00
parent a3c0f4cb3f
commit 3dd14c72c8
5 changed files with 72 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/NetImport/NetImportSearchService.cs
+14 -23
View File
@@ -25,13 +25,11 @@ namespace NzbDrone.Core.NetImport
private readonly ISearchForNewMovie _movieSearch;
private readonly IRootFolderService _rootFolder;
private readonly IConfigService _configService;
private readonly IProvideMovieInfo _movieInfo;
public NetImportSearchService(INetImportFactory netImportFactory, IMovieService movieService,
ISearchForNewMovie movieSearch, IRootFolderService rootFolder, IConfigService configService, IProvideMovieInfo movieInfo, Logger logger)
ISearchForNewMovie movieSearch, IRootFolderService rootFolder, IConfigService configService, Logger logger)
{
_movieInfo = movieInfo;
_netImportFactory = netImportFactory;
_movieService = movieService;
_movieSearch = movieSearch;
@@ -144,24 +142,15 @@ namespace NzbDrone.Core.NetImport
foreach (var movie in movies)
{
bool shouldAdd = true;
var mapped = _movieSearch.MapMovieToTmdbMovie(movie);
if (mapped != null)
if (importExclusions != null)
{
if (importExclusions != null)
foreach (var exclusion in importExclusions)
{
foreach (var exclusion in importExclusions)
//var excludedTmdbId = exclusion.Substring(exclusion.LastIndexOf('-')+1);
int excludedTmdbId;
if (Int32.TryParse(exclusion.Substring(exclusion.LastIndexOf('-') + 1), out excludedTmdbId))
{
int tmdbId;
if (exclusion.StartsWith("tt"))
{
var result = _movieInfo.GetMovieInfo(exclusion);
tmdbId = result.TmdbId;
}
else
{
tmdbId = Int32.Parse(exclusion);
}
if (tmdbId == movie.TmdbId)
if (excludedTmdbId == movie.TmdbId)
{
_logger.Info("Movie: {0} was found but will not be added because {1} was found on your exclusion list", movie, exclusion);
shouldAdd = false;
@@ -169,10 +158,12 @@ namespace NzbDrone.Core.NetImport
}
}
}
if (shouldAdd)
{
_movieService.AddMovie(mapped);
}
}
var mapped = _movieSearch.MapMovieToTmdbMovie(movie);
if ((mapped != null) && shouldAdd)
{
_movieService.AddMovie(mapped);
}
}
}