From 52fb29ee189e7da807729683840097c58ef8ebc2 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Tue, 10 Jan 2017 16:23:07 +0100 Subject: [PATCH] Fixes a few things with importing: Sample check is done even when file is already in movie folder. Fixed importing of movies with "DC". --- src/NzbDrone.Core/Download/CompletedDownloadService.cs | 3 +-- .../EpisodeImport/Specifications/NotSampleSpecification.cs | 6 ------ src/NzbDrone.Core/Parser/ParsingService.cs | 5 +++++ src/NzbDrone.Core/Tv/MovieRepository.cs | 6 +++--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/NzbDrone.Core/Download/CompletedDownloadService.cs b/src/NzbDrone.Core/Download/CompletedDownloadService.cs index 4e2bebe59..a70bdca20 100644 --- a/src/NzbDrone.Core/Download/CompletedDownloadService.cs +++ b/src/NzbDrone.Core/Download/CompletedDownloadService.cs @@ -94,7 +94,6 @@ namespace NzbDrone.Core.Download return; } - var series = _parsingService.GetSeries(trackedDownload.DownloadItem.Title); if (series == null) @@ -156,7 +155,7 @@ namespace NzbDrone.Core.Download trackedDownload.Warn(statusMessages); } } - else + else if (trackedDownload.RemoteEpisode.Series != null) { var importResults = _downloadedEpisodesImportService.ProcessPath(outputPath, ImportMode.Auto, trackedDownload.RemoteEpisode.Series, trackedDownload.DownloadItem); diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs index 536ea093a..ed8859cde 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs @@ -40,12 +40,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications public Decision IsSatisfiedBy(LocalMovie localEpisode) { - if (localEpisode.ExistingFile) - { - _logger.Debug("Existing file, skipping sample check"); - return Decision.Accept(); - } - var sample = _detectSample.IsSample(localEpisode.Movie, localEpisode.Quality, localEpisode.Path, diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs index 27f20889f..9df110a88 100644 --- a/src/NzbDrone.Core/Parser/ParsingService.cs +++ b/src/NzbDrone.Core/Parser/ParsingService.cs @@ -192,6 +192,11 @@ namespace NzbDrone.Core.Parser parsedEpisodeInfo.MovieTitleInfo.Year); } + if (series == null) + { + series = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle.Replace("DC", "").Trim()); + } + return series; } diff --git a/src/NzbDrone.Core/Tv/MovieRepository.cs b/src/NzbDrone.Core/Tv/MovieRepository.cs index 8267de29b..42bcddf48 100644 --- a/src/NzbDrone.Core/Tv/MovieRepository.cs +++ b/src/NzbDrone.Core/Tv/MovieRepository.cs @@ -63,11 +63,11 @@ namespace NzbDrone.Core.Tv cleanNum = cleanNum.Replace(roman, num); } - var result = Query.Where(s => s.CleanTitle == cleanTitle).SingleOrDefault(); + var result = Query.Where(s => s.CleanTitle == cleanTitle).FirstOrDefault(); if (result == null) { - result = Query.Where(s => s.CleanTitle == cleanNum).OrWhere(s => s.CleanTitle == cleanRoman).SingleOrDefault(); + result = Query.Where(s => s.CleanTitle == cleanNum).OrWhere(s => s.CleanTitle == cleanRoman).FirstOrDefault(); if (result == null) { @@ -75,7 +75,7 @@ namespace NzbDrone.Core.Tv result = movies.Where(m => m.AlternativeTitles.Any(t => Parser.Parser.CleanSeriesTitle(t.ToLower()) == cleanTitle || Parser.Parser.CleanSeriesTitle(t.ToLower()) == cleanRoman || - Parser.Parser.CleanSeriesTitle(t.ToLower()) == cleanNum)).SingleOrDefault(); + Parser.Parser.CleanSeriesTitle(t.ToLower()) == cleanNum)).FirstOrDefault(); return result; }