github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-22 22:43:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixes a few things with importing: Sample check is done even when file is already in movie folder. Fixed importing of movies with "DC".

Browse source
This commit is contained in:
Leonardo Galli 2017-01-10 16:23:07 +01:00
commit 52fb29ee18
4 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/NzbDrone.Core/Download/CompletedDownloadService.cs
View file

@ -94,7 +94,6 @@ namespace NzbDrone.Core.Download
return; return;
} }
var series = _parsingService.GetSeries(trackedDownload.DownloadItem.Title); var series = _parsingService.GetSeries(trackedDownload.DownloadItem.Title);
if (series == null) if (series == null)
@ -156,7 +155,7 @@ namespace NzbDrone.Core.Download
trackedDownload.Warn(statusMessages); trackedDownload.Warn(statusMessages);
} }
} }
else else if (trackedDownload.RemoteEpisode.Series != null)
{ {
var importResults = _downloadedEpisodesImportService.ProcessPath(outputPath, ImportMode.Auto, trackedDownload.RemoteEpisode.Series, trackedDownload.DownloadItem); var importResults = _downloadedEpisodesImportService.ProcessPath(outputPath, ImportMode.Auto, trackedDownload.RemoteEpisode.Series, trackedDownload.DownloadItem);

6
src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs
View file

@ -40,12 +40,6 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
public Decision IsSatisfiedBy(LocalMovie 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, var sample = _detectSample.IsSample(localEpisode.Movie,
localEpisode.Quality, localEpisode.Quality,
localEpisode.Path, localEpisode.Path,

5
src/NzbDrone.Core/Parser/ParsingService.cs
View file

@ -192,6 +192,11 @@ namespace NzbDrone.Core.Parser
parsedEpisodeInfo.MovieTitleInfo.Year); parsedEpisodeInfo.MovieTitleInfo.Year);
} }
if (series == null)
{
series = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle.Replace("DC", "").Trim());
}
return series; return series;
} }

6
src/NzbDrone.Core/Tv/MovieRepository.cs
View file

@ -63,11 +63,11 @@ namespace NzbDrone.Core.Tv
cleanNum = cleanNum.Replace(roman, num); 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) 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) 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 || 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()) == cleanRoman ||
Parser.Parser.CleanSeriesTitle(t.ToLower()) == cleanNum)).SingleOrDefault(); Parser.Parser.CleanSeriesTitle(t.ToLower()) == cleanNum)).FirstOrDefault();
return result; return result;
} }