Movies with Umlauts are now correctly matched and have correct CleanTitles.

An update library is recommended. Fixes #1338

src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/MapFixture.cs

@@ -23,6 +23,8 @@ public class MapFixture : TestBase<ParsingService>
 		private ParsedMovieInfo _wrongYearInfo;
 		private ParsedMovieInfo _romanTitleInfo;
 		private ParsedMovieInfo _alternativeTitleInfo;
+        private ParsedMovieInfo _umlautInfo;
+        private ParsedMovieInfo _umlautAltInfo;
 		private MovieSearchCriteria _movieSearchCriteria;
         private List<Episode> _episodes;
         private ParsedEpisodeInfo _parsedEpisodeInfo;
@@ -37,10 +39,10 @@ public void Setup()
                 .Build();
 
 			_movie = Builder<Movie>.CreateNew()
-								   .With(m => m.Title = "Mission Impossible 3")
-								   .With(m => m.CleanTitle = "missionimpossible3")
-			                       .With(m => m.Year = 2006)
-			                       .With(m => m.AlternativeTitles = new List<string> { "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<string> { "Fack Ju Göthe 2: Same same" })
 								   .Build();
 
             _episodes = Builder<Episode>.CreateListOfSize(1)
@@ -77,10 +79,22 @@ public void Setup()
 
 			_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 @@ public void should_match_roman_title()
 			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);
+        }
+
     }
 }

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -1275,6 +1275,7 @@
     <Compile Include="Datastore\Migration\131_make_parsed_episode_info_nullable.cs" />
     <Compile Include="Housekeeping\Housekeepers\FixWronglyMatchedMovieFiles.cs" />
     <Compile Include="Datastore\Migration\135_add_haspredbentry_to_movies.cs" />
+    <Compile Include="Tv\QueryExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">

src/NzbDrone.Core/Parser/Parser.cs

@@ -310,6 +310,12 @@ public static class 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<String, String> _umlautMappings = new Dictionary<string, string>
+        {
+            {"ö", "oe"},
+            {"ä", "ae"},
+            {"ü", "ue"},
+        };
 
         public static ParsedEpisodeInfo ParsePath(string path)
         {
@@ -660,7 +666,7 @@ public static string CleanSeriesTitle(this string title)
             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)

src/NzbDrone.Core/Parser/ParsingService.cs

@@ -36,6 +36,7 @@ public class ParsingService : IParsingService
         private readonly IMovieService _movieService;
         private readonly Logger _logger;
         private static HashSet<ArabicRomanNumeral> _arabicRomanNumeralMappings;
+ 
 
         public ParsingService(IEpisodeService episodeService,
                               ISeriesService seriesService,
@@ -412,7 +413,7 @@ private bool TryGetMovieByTitleAndOrYear(ParsedMovieInfo parsedMovieInfo, out Mo
             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<string> possibleTitles = new List<string>();
@@ -424,6 +425,8 @@ private static bool TryGetMovieBySearchCriteria(ParsedMovieInfo parsedMovieInfo,
                 possibleTitles.Add(altTitle.CleanSeriesTitle());
             }
 
+            string cleanTitle = parsedMovieInfo.MovieTitle.CleanSeriesTitle();
+
             foreach (string title in possibleTitles)
             {
                 if (title == parsedMovieInfo.MovieTitle.CleanSeriesTitle())
@@ -436,12 +439,14 @@ private static bool TryGetMovieBySearchCriteria(ParsedMovieInfo parsedMovieInfo,
                     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;
                     }

src/NzbDrone.Core/Tv/MovieRepository.cs

@@ -238,35 +238,25 @@ private Movie FindByTitle(string cleanTitle, int? year)
                 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();
+                    IEnumerable<Movie> movies = All();
+                    Func<string, string> titleCleaner = title => CoreParser.CleanSeriesTitle(title.ToLower());
+                    Func<IEnumerable<string>, string, bool> altTitleComparer =
+                        (alternativeTitles, atitle) =>
+                        alternativeTitles.Any(altTitle => titleCleaner(altTitle) == atitle);
 
-                    if (result == null)
-                    {
-                        IEnumerable<Movie> movies = All();
-                        Func<string, string> titleCleaner = title => CoreParser.CleanSeriesTitle(title.ToLower());
-                        Func<IEnumerable<string>, 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);
 
-                        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();
-                    }
                 }
             }
             return result;

src/NzbDrone.Core/Tv/MovieService.cs

@@ -53,6 +53,7 @@ public class MovieService : IMovieService, IHandle<MovieFileAddedEvent>,
         private readonly IBuildFileNames _fileNameBuilder;
         private readonly Logger _logger;
 
+
         public MovieService(IMovieRepository movieRepository,
                              IEventAggregator eventAggregator,
                              ISceneMappingService sceneMappingService,

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<Movie> query, int? year)
+        {
+            return year.HasValue ? query.FirstOrDefault(movie => movie.Year == year) : query.FirstOrDefault();
+        }
+    }
+
+    public static class EnumerableExtensions
+    {
+        public static Movie FirstWithYear(this IEnumerable<Movie> query, int? year)
+        {
+            return year.HasValue ? query.FirstOrDefault(movie => movie.Year == year) : query.FirstOrDefault();
+        }
+    }
+}