diff --git a/src/NzbDrone.Core/Download/CompletedDownloadService.cs b/src/NzbDrone.Core/Download/CompletedDownloadService.cs index 4e2bebe590..a70bdca209 100644 --- a/src/NzbDrone.Core/Download/CompletedDownloadService.cs +++ b/src/NzbDrone.Core/Download/CompletedDownloadService.cs @@ -94,7 +94,6 @@ public void Process(TrackedDownload trackedDownload, bool ignoreWarnings = false return; } - var series = _parsingService.GetSeries(trackedDownload.DownloadItem.Title); if (series == null) @@ -156,7 +155,7 @@ private void Import(TrackedDownload trackedDownload) 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 536ea093af..ed8859cde3 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs @@ -40,12 +40,6 @@ public Decision IsSatisfiedBy(LocalEpisode localEpisode) 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 27f20889f8..9df110a88f 100644 --- a/src/NzbDrone.Core/Parser/ParsingService.cs +++ b/src/NzbDrone.Core/Parser/ParsingService.cs @@ -192,6 +192,11 @@ public Movie GetMovie(string title) 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 8267de29b8..42bcddf484 100644 --- a/src/NzbDrone.Core/Tv/MovieRepository.cs +++ b/src/NzbDrone.Core/Tv/MovieRepository.cs @@ -63,11 +63,11 @@ public Movie FindByTitle(string cleanTitle) 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 @@ public Movie FindByTitle(string cleanTitle) 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; }