diff --git a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs index 338413b0e..0007ecc9a 100644 --- a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs @@ -23,6 +23,8 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests private ParsedMovieInfo _wrongYearInfo; private ParsedMovieInfo _romanTitleInfo; private ParsedMovieInfo _alternativeTitleInfo; + private ParsedMovieInfo _umlautInfo; + private ParsedMovieInfo _umlautAltInfo; private MovieSearchCriteria _movieSearchCriteria; private List _episodes; private ParsedEpisodeInfo _parsedEpisodeInfo; @@ -37,10 +39,10 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests .Build(); _movie = Builder.CreateNew() - .With(m => m.Title = "Mission Impossible 3") - .With(m => m.CleanTitle = "missionimpossible3") - .With(m => m.Year = 2006) - .With(m => m.AlternativeTitles = new List { "Mission Impossible 3: Same same" }) + .With(m => m.Title = "Fack Ju Göthe 2") + .With(m => m.CleanTitle = "fackjugoethe2") + .With(m => m.Year = 2015) + .With(m => m.AlternativeTitles = new List { "Fack Ju Göthe 2: Same same" }) .Build(); _episodes = Builder.CreateListOfSize(1) @@ -77,10 +79,22 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests _romanTitleInfo = new ParsedMovieInfo { - MovieTitle = "Mission Impossible III", + MovieTitle = "Fack Ju Göthe II", Year = _movie.Year, }; + _umlautInfo = new ParsedMovieInfo + { + MovieTitle = "Fack Ju Goethe 2", + Year = _movie.Year + }; + + _umlautAltInfo = new ParsedMovieInfo + { + MovieTitle = "Fack Ju Goethe 2: Same same", + Year = _movie.Year + }; + _singleEpisodeSearchCriteria = new SingleEpisodeSearchCriteria { Series = _series, @@ -148,5 +162,12 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests Subject.Map(_romanTitleInfo, "", _movieSearchCriteria).Movie.Should().Be(_movieSearchCriteria.Movie); } + [Test] + public void should_match_umlauts() + { + Subject.Map(_umlautInfo, "", _movieSearchCriteria).Movie.Should().Be(_movieSearchCriteria.Movie); + Subject.Map(_umlautAltInfo, "", _movieSearchCriteria).Movie.Should().Be(_movieSearchCriteria.Movie); + } + } } diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 9e5589ef5..623128055 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -1275,6 +1275,7 @@ + diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs index c5ae631fd..b3165435f 100644 --- a/src/NzbDrone.Core/Parser/Parser.cs +++ b/src/NzbDrone.Core/Parser/Parser.cs @@ -310,6 +310,12 @@ namespace NzbDrone.Core.Parser private static readonly Regex RequestInfoRegex = new Regex(@"\[.+?\]", RegexOptions.Compiled); private static readonly string[] Numbers = new[] { "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine" }; + private static Dictionary _umlautMappings = new Dictionary + { + {"ö", "oe"}, + {"ä", "ae"}, + {"ü", "ue"}, + }; public static ParsedEpisodeInfo ParsePath(string path) { @@ -660,7 +666,7 @@ namespace NzbDrone.Core.Parser if (long.TryParse(title, out number)) return title; - return NormalizeRegex.Replace(title, string.Empty).ToLower().RemoveAccent(); + return ReplaceGermanUmlauts(NormalizeRegex.Replace(title, string.Empty).ToLower()).RemoveAccent(); } public static string NormalizeEpisodeTitle(string title) diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs index a9cf88e33..a98731256 100644 --- a/src/NzbDrone.Core/Parser/ParsingService.cs +++ b/src/NzbDrone.Core/Parser/ParsingService.cs @@ -36,6 +36,7 @@ namespace NzbDrone.Core.Parser private readonly IMovieService _movieService; private readonly Logger _logger; private static HashSet _arabicRomanNumeralMappings; + public ParsingService(IEpisodeService episodeService, ISeriesService seriesService, @@ -412,7 +413,7 @@ namespace NzbDrone.Core.Parser return false; } - private static bool TryGetMovieBySearchCriteria(ParsedMovieInfo parsedMovieInfo, SearchCriteriaBase searchCriteria, out Movie possibleMovie) + private bool TryGetMovieBySearchCriteria(ParsedMovieInfo parsedMovieInfo, SearchCriteriaBase searchCriteria, out Movie possibleMovie) { possibleMovie = null; List possibleTitles = new List(); @@ -424,6 +425,8 @@ namespace NzbDrone.Core.Parser possibleTitles.Add(altTitle.CleanSeriesTitle()); } + string cleanTitle = parsedMovieInfo.MovieTitle.CleanSeriesTitle(); + foreach (string title in possibleTitles) { if (title == parsedMovieInfo.MovieTitle.CleanSeriesTitle()) @@ -436,12 +439,14 @@ namespace NzbDrone.Core.Parser string arabicNumeral = numeralMapping.ArabicNumeralAsString; string romanNumeral = numeralMapping.RomanNumeralLowerCase; + _logger.Debug(cleanTitle); + if (title.Replace(arabicNumeral, romanNumeral) == parsedMovieInfo.MovieTitle.CleanSeriesTitle()) { possibleMovie = searchCriteria.Movie; } - if (title.Replace(romanNumeral, arabicNumeral) == parsedMovieInfo.MovieTitle.CleanSeriesTitle()) + if (title == parsedMovieInfo.MovieTitle.CleanSeriesTitle().Replace(arabicNumeral, romanNumeral)) { possibleMovie = searchCriteria.Movie; } diff --git a/src/NzbDrone.Core/Tv/MovieRepository.cs b/src/NzbDrone.Core/Tv/MovieRepository.cs index af256dedf..84447ee49 100644 --- a/src/NzbDrone.Core/Tv/MovieRepository.cs +++ b/src/NzbDrone.Core/Tv/MovieRepository.cs @@ -238,35 +238,25 @@ namespace NzbDrone.Core.Tv cleanTitleWithArabicNumbers = cleanTitleWithArabicNumbers.Replace(romanNumber, arabicNumber); } - Movie result = year.HasValue - ? Query.Where(s => s.CleanTitle == cleanTitle).FirstOrDefault(movie => movie.Year == year.Value) - : Query.Where(s => s.CleanTitle == cleanTitle).FirstOrDefault(); + Movie result = Query.Where(s => s.CleanTitle == cleanTitle).FirstWithYear(year); if (result == null) { - result = year.HasValue ? Query.Where(movie => movie.CleanTitle == cleanTitleWithArabicNumbers).FirstOrDefault(movie => movie.Year == year.Value) - : Query.Where(movie => movie.CleanTitle == cleanTitleWithArabicNumbers).FirstOrDefault(); ; + result = Query.Where(movie => movie.CleanTitle == cleanTitleWithArabicNumbers).FirstWithYear(year) ?? + Query.Where(movie => movie.CleanTitle == cleanTitleWithRomanNumbers).FirstWithYear(year); if (result == null) { - result = year.HasValue ? Query.Where(movie => movie.CleanTitle == cleanTitleWithRomanNumbers).FirstOrDefault(movie => movie.Year == year.Value) - : Query.Where(movie => movie.CleanTitle == cleanTitleWithRomanNumbers).FirstOrDefault(); - - if (result == null) - { - IEnumerable movies = All(); - Func titleCleaner = title => CoreParser.CleanSeriesTitle(title.ToLower()); - Func, string, bool> altTitleComparer = - (alternativeTitles, atitle) => - alternativeTitles.Any(altTitle => titleCleaner(altTitle) == atitle); - - result = year.HasValue ? movies.Where(m => altTitleComparer(m.AlternativeTitles, cleanTitle) || - altTitleComparer(m.AlternativeTitles, cleanTitleWithRomanNumbers) || - altTitleComparer(m.AlternativeTitles, cleanTitleWithArabicNumbers)).FirstOrDefault(movie => movie.Year == year) - : movies.Where(m => altTitleComparer(m.AlternativeTitles, cleanTitle) || - altTitleComparer(m.AlternativeTitles, cleanTitleWithRomanNumbers) || - altTitleComparer(m.AlternativeTitles, cleanTitleWithArabicNumbers)).FirstOrDefault(); - } + IEnumerable movies = All(); + Func titleCleaner = title => CoreParser.CleanSeriesTitle(title.ToLower()); + Func, string, bool> altTitleComparer = + (alternativeTitles, atitle) => + alternativeTitles.Any(altTitle => titleCleaner(altTitle) == atitle); + + result = movies.Where(m => altTitleComparer(m.AlternativeTitles, cleanTitle) || + altTitleComparer(m.AlternativeTitles, cleanTitleWithRomanNumbers) || + altTitleComparer(m.AlternativeTitles, cleanTitleWithArabicNumbers)).FirstWithYear(year); + } } return result; diff --git a/src/NzbDrone.Core/Tv/MovieService.cs b/src/NzbDrone.Core/Tv/MovieService.cs index 76b059cfe..0d6fca997 100644 --- a/src/NzbDrone.Core/Tv/MovieService.cs +++ b/src/NzbDrone.Core/Tv/MovieService.cs @@ -53,6 +53,7 @@ namespace NzbDrone.Core.Tv private readonly IBuildFileNames _fileNameBuilder; private readonly Logger _logger; + public MovieService(IMovieRepository movieRepository, IEventAggregator eventAggregator, ISceneMappingService sceneMappingService, diff --git a/src/NzbDrone.Core/Tv/QueryExtensions.cs b/src/NzbDrone.Core/Tv/QueryExtensions.cs new file mode 100644 index 000000000..36927f864 --- /dev/null +++ b/src/NzbDrone.Core/Tv/QueryExtensions.cs @@ -0,0 +1,30 @@ +using System; +using System.Linq; +using System.Collections.Generic; +using NzbDrone.Core.Datastore; +using NzbDrone.Core.Messaging.Events; +using NzbDrone.Core.Datastore.Extensions; +using Marr.Data.QGen; +using NzbDrone.Core.MediaFiles; +using NzbDrone.Core.Parser.RomanNumerals; +using NzbDrone.Core.Qualities; +using NzbDrone.Core.Tv; +using CoreParser = NzbDrone.Core.Parser.Parser; +namespace NzbDrone.Core +{ + public static class QueryExtensions + { + public static Movie FirstWithYear(this SortBuilder query, int? year) + { + return year.HasValue ? query.FirstOrDefault(movie => movie.Year == year) : query.FirstOrDefault(); + } + } + + public static class EnumerableExtensions + { + public static Movie FirstWithYear(this IEnumerable query, int? year) + { + return year.HasValue ? query.FirstOrDefault(movie => movie.Year == year) : query.FirstOrDefault(); + } + } +}