diff --git a/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs index 4b430e1713..769ac925aa 100644 --- a/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs @@ -46,10 +46,16 @@ public class LanguageParserFixture : CoreTest [TestCase("Castle.2009.S01E14.HDTV.XviD.HUNDUB-LOL", Language.Hungarian)] [TestCase("Castle.2009.S01E14.HDTV.XviD.ENG.HUN-LOL", Language.Hungarian)] [TestCase("Castle.2009.S01E14.HDTV.XviD.HUN-LOL", Language.Hungarian)] + [TestCase("The Danish Girl 2015", Language.English)] public void should_parse_language(string postTitle, Language language) { - var result = LanguageParser.ParseLanguage(postTitle); - result.Should().Be(language); + var result = Parser.Parser.ParseMovieTitle(postTitle); + if (result == null) + { + Parser.Parser.ParseTitle(postTitle).Language.Should().Be(language); + return; + } + result.Language.Should().Be(language); } [TestCase("2 Broke Girls - S01E01 - Pilot.en.sub", Language.English)] diff --git a/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs index 41a14325db..fbc3449458 100644 --- a/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs @@ -81,5 +81,11 @@ public void should_parse_movie_year(string postTitle, int year) { Parser.Parser.ParseMovieTitle(postTitle).Year.Should().Be(year); } + + [TestCase("The Danish Girl 2015")] + public void should_not_parse_language_in_movie_title(string postTitle) + { + Parser.Parser.ParseMovieTitle(postTitle).Language.Should().Be(Language.English); + } } } diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs index 75e9bfeba9..b866eb7904 100644 --- a/src/NzbDrone.Core/Parser/Parser.cs +++ b/src/NzbDrone.Core/Parser/Parser.cs @@ -406,7 +406,7 @@ public static ParsedMovieInfo ParseMovieTitle(string title, bool isDir = false) if (result != null) { - result.Language = LanguageParser.ParseLanguage(title); + result.Language = LanguageParser.ParseLanguage(simpleTitle.Replace(result.MovieTitle, "A Movie")); Logger.Debug("Language parsed: {0}", result.Language); result.Quality = QualityParser.ParseQuality(title);